Merge remote-tracking branch 'upstream/master'

1 files changed, 27 insertions, 9 deletions

diff --git a/make/config/jogl/gl-gl4bc.cfg b/make/config/jogl/gl-gl4bc.cfg
index ce6883106..d1bd85641 100644
--- a/make/config/jogl/gl-gl4bc.cfg
+++ b/make/config/jogl/gl-gl4bc.cfg
@@ -5,6 +5,9 @@ NativeOutputDir gensrc/native/jogl/gl4
 ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
 ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java
 ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3ES3.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL4ES3.java
 ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2GL3.java
 ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2.java
 ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3.java
@@ -22,6 +25,9 @@ JavaClass GL4bc
 #Extends GL4bc GL
 #Extends GL4bc GL2ES1
 #Extends GL4bc GL2ES2
+#Extends GL4bc GL2ES3
+#Extends GL4bc GL3ES3
+#Extends GL4bc GL4ES3
 #Extends GL4bc GL2GL3
 #Extends GL4bc GL2
 #Extends GL4bc GL3
@@ -33,6 +39,9 @@ Implements GL4bcImpl GLBase
 Implements GL4bcImpl GL
 Implements GL4bcImpl GL2ES1
 Implements GL4bcImpl GL2ES2
+Implements GL4bcImpl GL2ES3
+Implements GL4bcImpl GL3ES3
+Implements GL4bcImpl GL4ES3
 Implements GL4bcImpl GL2GL3
 Implements GL4bcImpl GL2
 Implements GL4bcImpl GL3
@@ -43,7 +52,8 @@ Include gl-common.cfg
 Include gl-common-extensions.cfg
 Include gl-desktop.cfg
 Include gl3-desktop.cfg
-Include gl2_es2-common.cfg
+Include gl3-common.cfg
+Include gl2_es2-CustomJavaCode.cfg
 
 # Manually implement glMapNamedBufferEXT as the size of the returned buffer
 # can only be computed by calling another routine
@@ -52,7 +62,7 @@ ForceProcAddressGen glMapNamedBufferEXT
 JavaEpilogue glNamedBufferDataEXT bufferSizeTracker.setDirectStateBufferSize({0}, this, {1});
 
 # Manuall implement glDebugMessageCallback* using the proc address resolver
-ForceProcAddressGen glDebugMessageCallbackARB
+ForceProcAddressGen glDebugMessageCallback
 ForceProcAddressGen glDebugMessageCallbackAMD
 
 # Force all of the methods to be emitted using dynamic linking so we
@@ -81,18 +91,22 @@ JavaPrologue glPixelStorei glStateTracker.setInt(pname, param);
 
 JavaPrologue glGetIntegerv if ( glStateTracker.getInt(pname, params, params_offset) ) { return; }
 
-CustomJavaCode GL4bcImpl public void glFrustumf(float left, float right, float bottom, float top, float zNear, float zFar) {
-CustomJavaCode GL4bcImpl   glFrustum((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); }
+JavaPrologue glFrustumf if ( !_context.hasFP32CompatAPI() ) {
+JavaPrologue glFrustumf   glFrustum((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar);
+JavaPrologue glFrustumf   return;
+JavaPrologue glFrustumf }
 
-CustomJavaCode GL4bcImpl public void glOrthof(float left, float right, float bottom, float top, float zNear, float zFar) {
-CustomJavaCode GL4bcImpl   glOrtho((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); }
+JavaPrologue glOrthof if ( !_context.hasFP32CompatAPI() ) {
+JavaPrologue glOrthof   glOrtho((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar);
+JavaPrologue glOrthof   return;
+JavaPrologue glOrthof }
 
-JavaPrologue glDepthRangef if ( !_context.isGLES2Compatible() ) {
+JavaPrologue glDepthRangef if ( !_context.isGLES2Compatible() && !_context.hasFP32CompatAPI() ) {
 JavaPrologue glDepthRangef   glDepthRange( (double)zNear, (double)zFar );  
 JavaPrologue glDepthRangef   return;
 JavaPrologue glDepthRangef }
 
-JavaPrologue glClearDepthf if ( !_context.isGLES2Compatible() ) {
+JavaPrologue glClearDepthf if ( !_context.isGLES2Compatible() && !_context.hasFP32CompatAPI() ) {
 JavaPrologue glClearDepthf   glClearDepth( (double)depth );  
 JavaPrologue glClearDepthf   return;
 JavaPrologue glClearDepthf }
@@ -102,12 +116,16 @@ Include gl3ext-headers.cfg
 
 IncludeAs CustomJavaCode GL4bcImpl gl-impl-CustomJavaCode-common.java
 IncludeAs CustomJavaCode GL4bcImpl gl-impl-CustomJavaCode-gl4bc.java
-IncludeAs CustomJavaCode GL4bcImpl gl-impl-CustomJavaCode-desktop.java
 IncludeAs CustomJavaCode GL4bcImpl gl-impl-CustomJavaCode-gl2_es2.java
 IncludeAs CustomCCode gl-impl-CustomCCode-gl4bc.c
 
 Import javax.media.opengl.GLES1
 Import javax.media.opengl.GLES2
+Import javax.media.opengl.GL2ES1
+Import javax.media.opengl.GL2ES2
+Import javax.media.opengl.GL2ES3
+Import javax.media.opengl.GL3ES3
+Import javax.media.opengl.GL4ES3
 Import javax.media.opengl.GL2GL3
 Import javax.media.opengl.GL2
 Import javax.media.opengl.GL3