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

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

Merge "opengl: Add GLES31 and GLES31Ext classes"

parents 9302a733 7ab63acd

core/jni/Android.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,8 @@ LOCAL_SRC_FILES:= \ 
	android_opengl_GLES11Ext.cpp \

	android_opengl_GLES11Ext.cpp \

	android_opengl_GLES20.cpp \

	android_opengl_GLES20.cpp \

	android_opengl_GLES30.cpp \

	android_opengl_GLES30.cpp \

	android_opengl_GLES31.cpp \

	android_opengl_GLES31Ext.cpp \

	android_database_CursorWindow.cpp \

	android_database_CursorWindow.cpp \

	android_database_SQLiteCommon.cpp \

	android_database_SQLiteCommon.cpp \

	android_database_SQLiteConnection.cpp \

	android_database_SQLiteConnection.cpp \

core/jni/AndroidRuntime.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -74,6 +74,8 @@ extern int register_android_opengl_jni_GLES11(JNIEnv* env); 
extern int register_android_opengl_jni_GLES11Ext(JNIEnv* env);

extern int register_android_opengl_jni_GLES11Ext(JNIEnv* env);

extern int register_android_opengl_jni_GLES20(JNIEnv* env);

extern int register_android_opengl_jni_GLES20(JNIEnv* env);

extern int register_android_opengl_jni_GLES30(JNIEnv* env);

extern int register_android_opengl_jni_GLES30(JNIEnv* env);

extern int register_android_opengl_jni_GLES31(JNIEnv* env);

extern int register_android_opengl_jni_GLES31Ext(JNIEnv* env);





extern int register_android_hardware_Camera(JNIEnv *env);

extern int register_android_hardware_Camera(JNIEnv *env);

extern int register_android_hardware_camera2_CameraMetadata(JNIEnv *env);

extern int register_android_hardware_camera2_CameraMetadata(JNIEnv *env);
@@ -1228,6 +1230,8 @@ static const RegJNIRec gRegJNI[] = { 
    REG_JNI(register_android_opengl_jni_GLES11Ext),

    REG_JNI(register_android_opengl_jni_GLES11Ext),

    REG_JNI(register_android_opengl_jni_GLES20),

    REG_JNI(register_android_opengl_jni_GLES20),

    REG_JNI(register_android_opengl_jni_GLES30),

    REG_JNI(register_android_opengl_jni_GLES30),

    REG_JNI(register_android_opengl_jni_GLES31),

    REG_JNI(register_android_opengl_jni_GLES31Ext),





    REG_JNI(register_android_graphics_Bitmap),

    REG_JNI(register_android_graphics_Bitmap),

    REG_JNI(register_android_graphics_BitmapFactory),

    REG_JNI(register_android_graphics_BitmapFactory),

core/jni/android_opengl_GLES31.cpp

0 → 100644
+3168 −0

File added.

Preview size limit exceeded, changes collapsed.

core/jni/android_opengl_GLES31Ext.cpp

0 → 100644
+1385 −0

File added.

Preview size limit exceeded, changes collapsed.

opengl/java/android/opengl/GLES31.java

0 → 100644
+1100 −0

File added.

Preview size limit exceeded, changes collapsed.