summaryrefslogtreecommitdiffstats
path: root/opengl/tools
diff options
context:
space:
mode:
authorAndy McFadden <fadden@android.com>2013-03-01 16:25:32 -0800
committerAndy McFadden <fadden@android.com>2013-03-05 10:10:59 -0800
commit7284145d564fa8a422a8e564a38c730fb4a2962b (patch)
tree2718dc96c11b65724204c669c873645fb37556af /opengl/tools
parent306f18c5fb15ac05db09ece7241af02b9713a23d (diff)
downloadframeworks_native-7284145d564fa8a422a8e564a38c730fb4a2962b.zip
frameworks_native-7284145d564fa8a422a8e564a38c730fb4a2962b.tar.gz
frameworks_native-7284145d564fa8a422a8e564a38c730fb4a2962b.tar.bz2
Add eglPresentationTimeANDROID
Added EGL extension to set a timestamp on a surface. Also, fix JNI encoding of "long" in glgen. Bug 8191230 Change-Id: I38b7334bade3f8ff02bffe600bb74469ef22c164
Diffstat (limited to 'opengl/tools')
-rw-r--r--opengl/tools/glgen/specs/egl/EGL14.spec1
-rw-r--r--opengl/tools/glgen/src/JType.java1
-rw-r--r--opengl/tools/glgen/src/JniCodeEmitter.java2
3 files changed, 3 insertions, 1 deletions
diff --git a/opengl/tools/glgen/specs/egl/EGL14.spec b/opengl/tools/glgen/specs/egl/EGL14.spec
index 828e114..aef0bcb 100644
--- a/opengl/tools/glgen/specs/egl/EGL14.spec
+++ b/opengl/tools/glgen/specs/egl/EGL14.spec
@@ -31,3 +31,4 @@ EGLBoolean eglWaitGL ( void )
EGLBoolean eglWaitNative ( EGLint engine )
EGLBoolean eglSwapBuffers ( EGLDisplay dpy, EGLSurface surface )
EGLBoolean eglCopyBuffers ( EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target )
+EGLBoolean eglPresentationTimeANDROID ( EGLDisplay dpy, EGLSurface sur, EGLnsecsANDROID time )
diff --git a/opengl/tools/glgen/src/JType.java b/opengl/tools/glgen/src/JType.java
index 3f7cb73..994e609 100644
--- a/opengl/tools/glgen/src/JType.java
+++ b/opengl/tools/glgen/src/JType.java
@@ -56,6 +56,7 @@ public class JType {
typeMapping.put(new CType("EGLNativeWindowType"), new JType("int"));
typeMapping.put(new CType("EGLNativeDisplayType"), new JType("int"));
typeMapping.put(new CType("EGLClientBuffer"), new JType("int"));
+ typeMapping.put(new CType("EGLnsecsANDROID"), new JType("long"));
// EGL nonprimitive types
typeMapping.put(new CType("EGLConfig"), new JType("EGLConfig", true, false));
diff --git a/opengl/tools/glgen/src/JniCodeEmitter.java b/opengl/tools/glgen/src/JniCodeEmitter.java
index 01c5c48..ffe3767 100644
--- a/opengl/tools/glgen/src/JniCodeEmitter.java
+++ b/opengl/tools/glgen/src/JniCodeEmitter.java
@@ -54,7 +54,7 @@ public class JniCodeEmitter {
} else if (baseType.equals("short")) {
jniName += "S";
} else if (baseType.equals("long")) {
- jniName += "L";
+ jniName += "J";
} else if (baseType.equals("byte")) {
jniName += "B";
} else if (baseType.equals("String")) {