Merge "Update to EGL 1.5" (42bce334) · Commits · e / os / android_frameworks_base

api/current.txt

+65 −0

Original line number	Diff line number	Diff line
		@@ -29722,6 +29722,65 @@ package android.opengl {
		field public static final int EGL_WINDOW_BIT = 4; // 0x4
		}

		public class EGL15 {
		ctor public EGL15();
		method public static int eglClientWaitSync(android.opengl.EGLDisplay, android.opengl.EGLSync, int, long);
		method public static android.opengl.EGLSurface eglCreatePlatformPixmapSurface(android.opengl.EGLDisplay, android.opengl.EGLConfig, java.nio.Buffer, long[], int);
		method public static android.opengl.EGLSurface eglCreatePlatformWindowSurface(android.opengl.EGLDisplay, android.opengl.EGLConfig, java.nio.Buffer, long[], int);
		method public static android.opengl.EGLSync eglCreateSync(android.opengl.EGLDisplay, int, long[], int);
		method public static boolean eglDestroySync(android.opengl.EGLDisplay, android.opengl.EGLSync);
		method public static android.opengl.EGLDisplay eglGetPlatformDisplay(int, long, long[], int);
		method public static boolean eglGetSyncAttrib(android.opengl.EGLDisplay, android.opengl.EGLSync, int, long[], int);
		method public static boolean eglWaitSync(android.opengl.EGLDisplay, android.opengl.EGLSync, int);
		field public static final int EGL_CL_EVENT_HANDLE = 12444; // 0x309c
		field public static final int EGL_CONDITION_SATISFIED = 12534; // 0x30f6
		field public static final int EGL_CONTEXT_MAJOR_VERSION = 12440; // 0x3098
		field public static final int EGL_CONTEXT_MINOR_VERSION = 12539; // 0x30fb
		field public static final int EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT = 2; // 0x2
		field public static final int EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT = 1; // 0x1
		field public static final int EGL_CONTEXT_OPENGL_DEBUG = 12720; // 0x31b0
		field public static final int EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE = 12721; // 0x31b1
		field public static final int EGL_CONTEXT_OPENGL_PROFILE_MASK = 12541; // 0x30fd
		field public static final int EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY = 12733; // 0x31bd
		field public static final int EGL_CONTEXT_OPENGL_ROBUST_ACCESS = 12722; // 0x31b2
		field public static final long EGL_FOREVER = -1L; // 0xffffffffffffffffL
		field public static final int EGL_GL_COLORSPACE = 12445; // 0x309d
		field public static final int EGL_GL_COLORSPACE_LINEAR = 12426; // 0x308a
		field public static final int EGL_GL_COLORSPACE_SRGB = 12425; // 0x3089
		field public static final int EGL_GL_RENDERBUFFER = 12473; // 0x30b9
		field public static final int EGL_GL_TEXTURE_2D = 12465; // 0x30b1
		field public static final int EGL_GL_TEXTURE_3D = 12466; // 0x30b2
		field public static final int EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X = 12468; // 0x30b4
		field public static final int EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y = 12470; // 0x30b6
		field public static final int EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z = 12472; // 0x30b8
		field public static final int EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X = 12467; // 0x30b3
		field public static final int EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y = 12469; // 0x30b5
		field public static final int EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z = 12471; // 0x30b7
		field public static final int EGL_GL_TEXTURE_LEVEL = 12476; // 0x30bc
		field public static final int EGL_GL_TEXTURE_ZOFFSET = 12477; // 0x30bd
		field public static final int EGL_IMAGE_PRESERVED = 12498; // 0x30d2
		field public static final int EGL_LOSE_CONTEXT_ON_RESET = 12735; // 0x31bf
		field public static final android.opengl.EGLContext EGL_NO_CONTEXT;
		field public static final android.opengl.EGLDisplay EGL_NO_DISPLAY;
		field public static final android.opengl.EGLImage EGL_NO_IMAGE;
		field public static final int EGL_NO_RESET_NOTIFICATION = 12734; // 0x31be
		field public static final android.opengl.EGLSurface EGL_NO_SURFACE;
		field public static final android.opengl.EGLSync EGL_NO_SYNC;
		field public static final int EGL_OPENGL_ES3_BIT = 64; // 0x40
		field public static final int EGL_PLATFORM_ANDROID_KHR = 12609; // 0x3141
		field public static final int EGL_SIGNALED = 12530; // 0x30f2
		field public static final int EGL_SYNC_CL_EVENT = 12542; // 0x30fe
		field public static final int EGL_SYNC_CL_EVENT_COMPLETE = 12543; // 0x30ff
		field public static final int EGL_SYNC_CONDITION = 12536; // 0x30f8
		field public static final int EGL_SYNC_FENCE = 12537; // 0x30f9
		field public static final int EGL_SYNC_FLUSH_COMMANDS_BIT = 1; // 0x1
		field public static final int EGL_SYNC_PRIOR_COMMANDS_COMPLETE = 12528; // 0x30f0
		field public static final int EGL_SYNC_STATUS = 12529; // 0x30f1
		field public static final int EGL_SYNC_TYPE = 12535; // 0x30f7
		field public static final int EGL_TIMEOUT_EXPIRED = 12533; // 0x30f5
		field public static final int EGL_UNSIGNALED = 12531; // 0x30f3
		}

		public class EGLConfig extends android.opengl.EGLObjectHandle {
		}

		@@ -29741,6 +29800,9 @@ package android.opengl {
		field public static final int EGL_RECORDABLE_ANDROID = 12610; // 0x3142
		}

		public class EGLImage extends android.opengl.EGLObjectHandle {
		}

		public abstract class EGLObjectHandle {
		ctor protected deprecated EGLObjectHandle(int);
		ctor protected EGLObjectHandle(long);
		@@ -29751,6 +29813,9 @@ package android.opengl {
		public class EGLSurface extends android.opengl.EGLObjectHandle {
		}

		public class EGLSync extends android.opengl.EGLObjectHandle {
		}

		public class ETC1 {
		ctor public ETC1();
		method public static void decodeBlock(java.nio.Buffer, java.nio.Buffer);

config/preloaded-classes

+1 −0

Original line number	Diff line number	Diff line
		@@ -2354,6 +2354,7 @@ android.nfc.NfcAdapter$1
		android.nfc.NfcAdapter$CreateNdefMessageCallback
		android.nfc.NfcManager
		android.opengl.EGL14
		android.opengl.EGL15
		android.opengl.EGLConfig
		android.opengl.EGLContext
		android.opengl.EGLDisplay

core/jni/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ cc_library_shared {
		"android_app_NativeActivity.cpp",
		"android_app_admin_SecurityLog.cpp",
		"android_opengl_EGL14.cpp",
		"android_opengl_EGL15.cpp",
		"android_opengl_EGLExt.cpp",
		"android_opengl_GLES10.cpp",
		"android_opengl_GLES10Ext.cpp",

core/jni/AndroidRuntime.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ extern int register_android_graphics_YuvImage(JNIEnv* env);
		extern int register_com_google_android_gles_jni_EGLImpl(JNIEnv* env);
		extern int register_com_google_android_gles_jni_GLImpl(JNIEnv* env);
		extern int register_android_opengl_jni_EGL14(JNIEnv* env);
		extern int register_android_opengl_jni_EGL15(JNIEnv* env);
		extern int register_android_opengl_jni_EGLExt(JNIEnv* env);
		extern int register_android_opengl_jni_GLES10(JNIEnv* env);
		extern int register_android_opengl_jni_GLES10Ext(JNIEnv* env);
		@@ -1367,6 +1368,7 @@ static const RegJNIRec gRegJNI[] = {
		REG_JNI(register_com_google_android_gles_jni_EGLImpl),
		REG_JNI(register_com_google_android_gles_jni_GLImpl),
		REG_JNI(register_android_opengl_jni_EGL14),
		REG_JNI(register_android_opengl_jni_EGL15),
		REG_JNI(register_android_opengl_jni_EGLExt),
		REG_JNI(register_android_opengl_jni_GLES10),
		REG_JNI(register_android_opengl_jni_GLES10Ext),

core/jni/android_opengl_EGL15.cpp

0 → 100644

+557 −0

File added.

Preview size limit exceeded, changes collapsed.