Merge "Add android.opengl.EGLExt class for EGL extensions" into jb-mr2-dev (02b7128f) · Commits · e / os / android_frameworks_base

api/current.txt

+9 −1

Original line number	Diff line number	Diff line
		@@ -14560,7 +14560,6 @@ package android.opengl {
		method public static int eglGetError();
		method public static boolean eglInitialize(android.opengl.EGLDisplay, int[], int, int[], int);
		method public static boolean eglMakeCurrent(android.opengl.EGLDisplay, android.opengl.EGLSurface, android.opengl.EGLSurface, android.opengl.EGLContext);
		method public static boolean eglPresentationTimeANDROID(android.opengl.EGLDisplay, android.opengl.EGLSurface, long);
		method public static int eglQueryAPI();
		method public static boolean eglQueryContext(android.opengl.EGLDisplay, android.opengl.EGLContext, int, int[], int);
		method public static java.lang.String eglQueryString(android.opengl.EGLDisplay, int);
		@@ -14699,6 +14698,15 @@ package android.opengl {
		public class EGLDisplay extends android.opengl.EGLObjectHandle {
		}

		public class EGLExt {
		ctor public EGLExt();
		method public static boolean eglPresentationTimeANDROID(android.opengl.EGLDisplay, android.opengl.EGLSurface, long);
		field public static final int EGL_CONTEXT_FLAGS_KHR = 12540; // 0x30fc
		field public static final int EGL_CONTEXT_MAJOR_VERSION_KHR = 12440; // 0x3098
		field public static final int EGL_CONTEXT_MINOR_VERSION_KHR = 12539; // 0x30fb
		field public static final int EGL_OPENGL_ES3_BIT_KHR = 64; // 0x40
		}

		public abstract class EGLObjectHandle {
		ctor protected EGLObjectHandle(int);
		method public int getHandle();

core/jni/android_opengl_EGL14.cpp

+0 −17

Original line number	Diff line number	Diff line
		@@ -1202,22 +1202,6 @@ android_eglCopyBuffers
		return (EGLBoolean) 0;
		}

		/* EGLBoolean eglPresentationTimeANDROID ( EGLDisplay dpy, EGLSurface sur, EGLnsecsANDROID time ) */
		static jboolean
		android_eglPresentationTimeANDROID
		(JNIEnv *_env, jobject _this, jobject dpy, jobject sur, jlong time) {
		EGLBoolean _returnValue = (EGLBoolean) 0;
		EGLDisplay dpy_native = (EGLDisplay) fromEGLHandle(_env, egldisplayGetHandleID, dpy);
		EGLSurface sur_native = (EGLSurface) fromEGLHandle(_env, eglsurfaceGetHandleID, sur);

		_returnValue = eglPresentationTimeANDROID(
		(EGLDisplay)dpy_native,
		(EGLSurface)sur_native,
		(EGLnsecsANDROID)time
		);
		return _returnValue;
		}

		static const char *classPathName = "android/opengl/EGL14";

		static JNINativeMethod methods[] = {
		@@ -1256,7 +1240,6 @@ static JNINativeMethod methods[] = {
		{"eglWaitNative", "(I)Z", (void *) android_eglWaitNative },
		{"eglSwapBuffers", "(Landroid/opengl/EGLDisplay;Landroid/opengl/EGLSurface;)Z", (void *) android_eglSwapBuffers },
		{"eglCopyBuffers", "(Landroid/opengl/EGLDisplay;Landroid/opengl/EGLSurface;I)Z", (void *) android_eglCopyBuffers },
		{"eglPresentationTimeANDROID", "(Landroid/opengl/EGLDisplay;Landroid/opengl/EGLSurface;J)Z", (void *) android_eglPresentationTimeANDROID },
		};

		int register_android_opengl_jni_EGL14(JNIEnv *_env)

core/jni/android_opengl_EGLExt.cpp

0 → 100644

+162 −0

Original line number	Diff line number	Diff line
		/*
		** Copyright 2013, The Android Open Source Project
		**
		** Licensed under the Apache License, Version 2.0 (the "License");
		** you may not use this file except in compliance with the License.
		** You may obtain a copy of the License at
		**
		** http://www.apache.org/licenses/LICENSE-2.0
		**
		** Unless required by applicable law or agreed to in writing, software
		** distributed under the License is distributed on an "AS IS" BASIS,
		** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		** See the License for the specific language governing permissions and
		** limitations under the License.
		*/

		// This source file is automatically generated

		#include "jni.h"
		#include "JNIHelp.h"
		#include <android_runtime/AndroidRuntime.h>
		#include <android_runtime/android_view_Surface.h>
		#include <android_runtime/android_graphics_SurfaceTexture.h>
		#include <utils/misc.h>

		#include <assert.h>
		#include <EGL/egl.h>
		#include <EGL/eglext.h>

		#include <gui/Surface.h>
		#include <gui/GLConsumer.h>
		#include <gui/Surface.h>

		#include <ui/ANativeObjectBase.h>

		static int initialized = 0;

		static jclass egldisplayClass;
		static jclass eglcontextClass;
		static jclass eglsurfaceClass;
		static jclass eglconfigClass;

		static jmethodID egldisplayGetHandleID;
		static jmethodID eglcontextGetHandleID;
		static jmethodID eglsurfaceGetHandleID;
		static jmethodID eglconfigGetHandleID;

		static jmethodID egldisplayConstructor;
		static jmethodID eglcontextConstructor;
		static jmethodID eglsurfaceConstructor;
		static jmethodID eglconfigConstructor;

		static jobject eglNoContextObject;
		static jobject eglNoDisplayObject;
		static jobject eglNoSurfaceObject;



		/* Cache method IDs each time the class is loaded. */

		static void
		nativeClassInit(JNIEnv *_env, jclass glImplClass)
		{
		jclass egldisplayClassLocal = _env->FindClass("android/opengl/EGLDisplay");
		egldisplayClass = (jclass) _env->NewGlobalRef(egldisplayClassLocal);
		jclass eglcontextClassLocal = _env->FindClass("android/opengl/EGLContext");
		eglcontextClass = (jclass) _env->NewGlobalRef(eglcontextClassLocal);
		jclass eglsurfaceClassLocal = _env->FindClass("android/opengl/EGLSurface");
		eglsurfaceClass = (jclass) _env->NewGlobalRef(eglsurfaceClassLocal);
		jclass eglconfigClassLocal = _env->FindClass("android/opengl/EGLConfig");
		eglconfigClass = (jclass) _env->NewGlobalRef(eglconfigClassLocal);

		egldisplayGetHandleID = _env->GetMethodID(egldisplayClass, "getHandle", "()I");
		eglcontextGetHandleID = _env->GetMethodID(eglcontextClass, "getHandle", "()I");
		eglsurfaceGetHandleID = _env->GetMethodID(eglsurfaceClass, "getHandle", "()I");
		eglconfigGetHandleID = _env->GetMethodID(eglconfigClass, "getHandle", "()I");


		egldisplayConstructor = _env->GetMethodID(egldisplayClass, "<init>", "(I)V");
		eglcontextConstructor = _env->GetMethodID(eglcontextClass, "<init>", "(I)V");
		eglsurfaceConstructor = _env->GetMethodID(eglsurfaceClass, "<init>", "(I)V");
		eglconfigConstructor = _env->GetMethodID(eglconfigClass, "<init>", "(I)V");

		jobject localeglNoContextObject = _env->NewObject(eglcontextClass, eglcontextConstructor, (jint)EGL_NO_CONTEXT);
		eglNoContextObject = _env->NewGlobalRef(localeglNoContextObject);
		jobject localeglNoDisplayObject = _env->NewObject(egldisplayClass, egldisplayConstructor, (jint)EGL_NO_DISPLAY);
		eglNoDisplayObject = _env->NewGlobalRef(localeglNoDisplayObject);
		jobject localeglNoSurfaceObject = _env->NewObject(eglsurfaceClass, eglsurfaceConstructor, (jint)EGL_NO_SURFACE);
		eglNoSurfaceObject = _env->NewGlobalRef(localeglNoSurfaceObject);


		jclass eglClass = _env->FindClass("android/opengl/EGL14");
		jfieldID noContextFieldID = _env->GetStaticFieldID(eglClass, "EGL_NO_CONTEXT", "Landroid/opengl/EGLContext;");
		_env->SetStaticObjectField(eglClass, noContextFieldID, eglNoContextObject);

		jfieldID noDisplayFieldID = _env->GetStaticFieldID(eglClass, "EGL_NO_DISPLAY", "Landroid/opengl/EGLDisplay;");
		_env->SetStaticObjectField(eglClass, noDisplayFieldID, eglNoDisplayObject);

		jfieldID noSurfaceFieldID = _env->GetStaticFieldID(eglClass, "EGL_NO_SURFACE", "Landroid/opengl/EGLSurface;");
		_env->SetStaticObjectField(eglClass, noSurfaceFieldID, eglNoSurfaceObject);
		}

		static void *
		fromEGLHandle(JNIEnv *_env, jmethodID mid, jobject obj) {
		if (obj == NULL){
		jniThrowException(_env, "java/lang/IllegalArgumentException",
		"Object is set to null.");
		}

		return (void*) (_env->CallIntMethod(obj, mid));
		}

		static jobject
		toEGLHandle(JNIEnv _env, jclass cls, jmethodID con, void handle) {
		if (cls == eglcontextClass &&
		(EGLContext)handle == EGL_NO_CONTEXT) {
		return eglNoContextObject;
		}

		if (cls == egldisplayClass &&
		(EGLDisplay)handle == EGL_NO_DISPLAY) {
		return eglNoDisplayObject;
		}

		if (cls == eglsurfaceClass &&
		(EGLSurface)handle == EGL_NO_SURFACE) {
		return eglNoSurfaceObject;
		}

		return _env->NewObject(cls, con, (jint)handle);
		}

		// --------------------------------------------------------------------------
		/* EGLBoolean eglPresentationTimeANDROID ( EGLDisplay dpy, EGLSurface sur, EGLnsecsANDROID time ) */
		static jboolean
		android_eglPresentationTimeANDROID
		(JNIEnv *_env, jobject _this, jobject dpy, jobject sur, jlong time) {
		EGLBoolean _returnValue = (EGLBoolean) 0;
		EGLDisplay dpy_native = (EGLDisplay) fromEGLHandle(_env, egldisplayGetHandleID, dpy);
		EGLSurface sur_native = (EGLSurface) fromEGLHandle(_env, eglsurfaceGetHandleID, sur);

		_returnValue = eglPresentationTimeANDROID(
		(EGLDisplay)dpy_native,
		(EGLSurface)sur_native,
		(EGLnsecsANDROID)time
		);
		return (jboolean)_returnValue;
		}

		static const char *classPathName = "android/opengl/EGLExt";

		static JNINativeMethod methods[] = {
		{"_nativeClassInit", "()V", (void*)nativeClassInit },
		{"eglPresentationTimeANDROID", "(Landroid/opengl/EGLDisplay;Landroid/opengl/EGLSurface;J)Z", (void *) android_eglPresentationTimeANDROID },
		};

		int register_android_opengl_jni_EGLExt(JNIEnv *_env)
		{
		int err;
		err = android::AndroidRuntime::registerNativeMethods(_env, classPathName, methods, NELEM(methods));
		return err;
		}

opengl/java/android/opengl/EGL14.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -445,12 +445,4 @@ public static final int EGL_CORE_NATIVE_ENGINE = 0x305B;
		int target
		);

		// C function EGLBoolean eglPresentationTimeANDROID ( EGLDisplay dpy, EGLSurface sur, EGLnsecsANDROID time )

		public static native boolean eglPresentationTimeANDROID(
		EGLDisplay dpy,
		EGLSurface sur,
		long time
		);

		}

opengl/java/android/opengl/EGLExt.java

0 → 100644

+46 −0

Original line number	Diff line number	Diff line
		/*
		**
		** Copyright 2013, The Android Open Source Project
		**
		** Licensed under the Apache License, Version 2.0 (the "License");
		** you may not use this file except in compliance with the License.
		** You may obtain a copy of the License at
		**
		** http://www.apache.org/licenses/LICENSE-2.0
		**
		** Unless required by applicable law or agreed to in writing, software
		** distributed under the License is distributed on an "AS IS" BASIS,
		** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		** See the License for the specific language governing permissions and
		** limitations under the License.
		*/

		// This source file is automatically generated

		package android.opengl;

		/**
		* EGL Extensions
		*/
		public class EGLExt {

		// EGL_KHR_create_context
		public static final int EGL_CONTEXT_MAJOR_VERSION_KHR = 0x3098;
		public static final int EGL_CONTEXT_MINOR_VERSION_KHR = 0x30FB;
		public static final int EGL_CONTEXT_FLAGS_KHR = 0x30FC;
		public static final int EGL_OPENGL_ES3_BIT_KHR = 0x0040;

		native private static void _nativeClassInit();
		static {
		_nativeClassInit();
		}

		// C function EGLBoolean eglPresentationTimeANDROID ( EGLDisplay dpy, EGLSurface sur, EGLnsecsANDROID time )

		public static native boolean eglPresentationTimeANDROID(
		EGLDisplay dpy,
		EGLSurface sur,
		long time
		);

		}