Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 811d3734 authored by Jesse Hall's avatar Jesse Hall Committed by Android (Google) Code Review
Browse files

Merge "Add android.opengl.GLES30, hidden for now" into jb-mr2-dev

parents c6f2d17a d830e74f

core/jni/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ LOCAL_SRC_FILES:= \ 
	android_opengl_GLES11.cpp \

	android_opengl_GLES11Ext.cpp \

	android_opengl_GLES20.cpp \

	android_opengl_GLES30.cpp \

	android_database_CursorWindow.cpp \

	android_database_SQLiteCommon.cpp \

	android_database_SQLiteConnection.cpp \

core/jni/android_opengl_GLES30.cpp

0 → 100644
+5217 −0

File added.

Preview size limit exceeded, changes collapsed.

opengl/java/android/opengl/GLES20.java

+6 −3
Original line number Diff line number Diff line
@@ -296,6 +296,9 @@ public class GLES20 { 
    public static final int GL_RGB5_A1                                 = 0x8057;

    public static final int GL_RGB565                                  = 0x8D62;

    public static final int GL_DEPTH_COMPONENT16                       = 0x81A5;

    // GL_STENCIL_INDEX does not appear in gl2.h or gl2ext.h, and there is no

    // token with value 0x1901.

    //

    public static final int GL_STENCIL_INDEX                           = 0x1901;

    public static final int GL_STENCIL_INDEX8                          = 0x8D48;

    public static final int GL_RENDERBUFFER_WIDTH                      = 0x8D42;

opengl/java/android/opengl/GLES30.java

0 → 100644
+1795 −0

File added.

Preview size limit exceeded, changes collapsed.