11 files changed, 83 insertions, 12 deletions
diff --git a/make/config/jogl/es3-headers.cfg b/make/config/jogl/es3-headers.cfg
index 41f6d5a6b..d9d5ea77e 100644
--- a/make/config/jogl/es3-headers.cfg
+++ b/make/config/jogl/es3-headers.cfg
@@ -3,7 +3,7 @@ CustomCCode #include <GLES2/gl2platform.h>
 CustomCCode // Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in
 CustomCCode // "gl2ext.h" and "gl3ext.h" are parsed.
 CustomCCode #define GL_GLEXT_PROTOTYPES
-CustomCCode #include <GLES3/gl31.h>
+CustomCCode #include <GLES3/gl3x.h>
 CustomCCode #include <GLES3/gl3ext.h>
 CustomCCode /** Shared between ES2 and ES3 .. */
 CustomCCode #include <GLES2/gl2ext.h>
diff --git a/make/config/jogl/gl-common-extensions.cfg b/make/config/jogl/gl-common-extensions.cfg
index f3bd08fe7..8d6709311 100644
--- a/make/config/jogl/gl-common-extensions.cfg
+++ b/make/config/jogl/gl-common-extensions.cfg
@@ -7,11 +7,11 @@ DropUniqVendorExtensions 3DFX
 # DropUniqVendorExtensions ATI
 DropUniqVendorExtensions HP
 DropUniqVendorExtensions IBM
-DropUniqVendorExtensions INGR
+# DropUniqVendorExtensions INGR <- FIXME: Re-enable for 2.4.0
 DropUniqVendorExtensions MESA
 DropUniqVendorExtensions MESAX
 # DropUniqVendorExtensions NV
-DropUniqVendorExtensions PGI
+# DropUniqVendorExtensions PGI  <- FIXME: Re-enable for 2.4.0
 DropUniqVendorExtensions SGI
 DropUniqVendorExtensions SGIS
 DropUniqVendorExtensions SGIX
@@ -63,7 +63,7 @@ IgnoreExtension GLX_NV_vertex_array_range
 IgnoreExtension GL_NV_vertex_array_range
 IgnoreExtension GL_NV_vertex_array_range2
 
-IgnoreExtension GL_KHR_blend_equation_advanced
+#IgnoreExtension GL_KHR_blend_equation_advanced
 
 IgnoreExtension GL_OES_fixed_point
 IgnoreExtension GL_OES_compressed_paletted_texture
@@ -106,6 +106,9 @@ RenameExtensionIntoCore GL_ANGLE_framebuffer_multisample
 RenameExtensionIntoCore GL_NV_fbo_color_attachments
 RenameExtensionIntoCore GL_NV_draw_buffers
 
+# ES 3.2 compatibility
+RenameExtensionIntoCore GL_ARB_ES3_2_compatibility
+RenameExtensionIntoCore GL_KHR_blend_equation_advanced
 
 # GL_EXT_texture_storage == GL_ARB_texture_storage
 # If subsuming, the DSA related part, i.e. 'glTextureStorage[123]DEXT' collides w/ OpenGL 4.5,
diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg
index 54934002b..2396f86a1 100644
--- a/make/config/jogl/gl-common.cfg
+++ b/make/config/jogl/gl-common.cfg
@@ -29,7 +29,7 @@ GLDocHeader GLES/glext.h
 GLDocHeader GLES2/gl2.h
 GLDocHeader GLES2/gl2ext-supplement.h
 GLDocHeader GLES2/gl2ext.h
-GLDocHeader GLES3/gl31.h
+GLDocHeader GLES3/gl3x.h
 GLDocHeader GLES3/gl3ext.h
 
 # Imports needed by all glue code
diff --git a/make/config/jogl/gl-es3-impl.cfg b/make/config/jogl/gl-es3-impl.cfg
index c6b9b45f1..a3664b814 100644
--- a/make/config/jogl/gl-es3-impl.cfg
+++ b/make/config/jogl/gl-es3-impl.cfg
@@ -5,7 +5,7 @@ NativeOutputDir gensrc/native/jogl/es3
 # Inform the glue code generator of the association between #defines
 # and functions and the extensions in which they are defined
 # _for_ code generation. This shall match the parsed header files!
-GLSemHeader GLES3/gl31.h
+GLSemHeader GLES3/gl3x.h
 GLSemHeader GLES3/gl3ext.h
 GLSemHeader GLES2/gl2ext-supplement.h
 GLSemHeader GLES2/gl2ext.h
diff --git a/make/config/jogl/gl-if-es3.cfg b/make/config/jogl/gl-if-es3.cfg
index 573a79f85..14cfce55c 100644
--- a/make/config/jogl/gl-if-es3.cfg
+++ b/make/config/jogl/gl-if-es3.cfg
@@ -4,7 +4,7 @@ JavaOutputDir gensrc/classes
 # Inform the glue code generator of the association between #defines
 # and functions and the extensions in which they are defined
 # _for_ code generation. This shall match the parsed header files!
-GLSemHeader GLES3/gl31.h
+GLSemHeader GLES3/gl3x.h
 GLSemHeader GLES2/gl2ext-supplement.h
 GLSemHeader GLES3/gl3ext.h
 GLSemHeader GLES2/gl2ext.h
diff --git a/make/config/jogl/gl-if-gl-ignores.cfg b/make/config/jogl/gl-if-gl-ignores.cfg
index d6d71e09f..ad7677e9a 100644
--- a/make/config/jogl/gl-if-gl-ignores.cfg
+++ b/make/config/jogl/gl-if-gl-ignores.cfg
@@ -10,9 +10,10 @@ DropUniqVendorExtensions APPLE
 DropUniqVendorExtensions ATI
 DropUniqVendorExtensions FJ
 DropUniqVendorExtensions HP
-DropUniqVendorExtensions IMG
 DropUniqVendorExtensions IBM
+DropUniqVendorExtensions IMG
 DropUniqVendorExtensions INGR
+DropUniqVendorExtensions INTEL
 DropUniqVendorExtensions MESA
 DropUniqVendorExtensions MESAX
 DropUniqVendorExtensions NV
@@ -94,7 +95,6 @@ IgnoreExtension GL_EXT_texture_cube_map_array
 IgnoreExtension GL_EXT_texture_norm16
 IgnoreExtension GL_EXT_texture_sRGB_decode
 IgnoreExtension GL_EXT_texture_view
-IgnoreExtension GL_INTEL_performance_query
 IgnoreExtension GL_KHR_blend_equation_advanced
 IgnoreExtension GL_KHR_blend_equation_advanced_coherent
 IgnoreExtension GL_KHR_context_flush_control
@@ -137,6 +137,27 @@ IgnoreExtension GL_OES_texture_stencil8
 IgnoreExtension GL_OES_texture_storage_multisample_2d_array
 IgnoreExtension GL_OES_texture_view
 
+#
+# Ignored new extensions added in gl2ext.h 2015-10-06
+# see jogl/make/scripts/diff-gl2ext.sh
+# FIXME: Refine for 2.4.0
+#
+IgnoreExtension GL_KHR_no_error
+IgnoreExtension GL_EXT_YUV_target
+IgnoreExtension GL_EXT_blend_func_extended
+IgnoreExtension GL_EXT_buffer_storage
+IgnoreExtension GL_EXT_color_buffer_float
+IgnoreExtension GL_EXT_float_blend
+IgnoreExtension GL_EXT_multisampled_compatibility
+IgnoreExtension GL_EXT_post_depth_coverage
+IgnoreExtension GL_EXT_raster_multisample
+IgnoreExtension GL_EXT_sparse_texture
+IgnoreExtension GL_EXT_texture_filter_minmax
+IgnoreExtension GL_EXT_texture_sRGB_R8
+IgnoreExtension GL_EXT_texture_sRGB_RG8
+IgnoreExtension GL_OVR_multiview
+IgnoreExtension GL_OVR_multiview2
+
 # includes GL_STATE_RESTORE, which hasn't the QCOM suffix
 IgnoreExtension GL_QCOM_extended_get
 Ignore GL_STATE_RESTORE
diff --git a/make/config/jogl/gl-if-gl2_es2-ignores.cfg b/make/config/jogl/gl-if-gl2_es2-ignores.cfg
index e34ff1fe2..fe9938175 100644
--- a/make/config/jogl/gl-if-gl2_es2-ignores.cfg
+++ b/make/config/jogl/gl-if-gl2_es2-ignores.cfg
@@ -117,6 +117,26 @@ IgnoreExtension GL_OES_texture_cube_map_array
 IgnoreExtension GL_OES_texture_stencil8
 IgnoreExtension GL_OES_texture_storage_multisample_2d_array
 
+#
+# Ignored new extensions added in gl2ext.h 2015-10-06
+# see jogl/make/scripts/diff-gl2ext.sh
+# FIXME: Refine for 2.4.0
+#
+IgnoreExtension GL_KHR_no_error
+IgnoreExtension GL_EXT_YUV_target
+IgnoreExtension GL_EXT_blend_func_extended
+IgnoreExtension GL_EXT_buffer_storage
+IgnoreExtension GL_EXT_color_buffer_float
+IgnoreExtension GL_EXT_float_blend
+IgnoreExtension GL_EXT_multisampled_compatibility
+IgnoreExtension GL_EXT_post_depth_coverage
+IgnoreExtension GL_EXT_raster_multisample
+IgnoreExtension GL_EXT_sparse_texture
+IgnoreExtension GL_EXT_texture_filter_minmax
+IgnoreExtension GL_EXT_texture_sRGB_R8
+IgnoreExtension GL_EXT_texture_sRGB_RG8
+IgnoreExtension GL_OVR_multiview
+IgnoreExtension GL_OVR_multiview2
 
 # includes GL_STATE_RESTORE, which hasn't the QCOM suffix
 IgnoreExtension GL_QCOM_extended_get
diff --git a/make/config/jogl/gl-if-gl2_es3-ignores.cfg b/make/config/jogl/gl-if-gl2_es3-ignores.cfg
index e3e843771..bd9a30cf1 100644
--- a/make/config/jogl/gl-if-gl2_es3-ignores.cfg
+++ b/make/config/jogl/gl-if-gl2_es3-ignores.cfg
@@ -118,6 +118,33 @@ IgnoreExtension GL_OES_texture_stencil8
 IgnoreExtension GL_OES_texture_storage_multisample_2d_array
 IgnoreExtension GL_OES_texture_view
 
+#
+# Ignored new extensions added in gl2ext.h 2015-10-06
+# see jogl/make/scripts/diff-gl2ext.sh
+# FIXME: Refine for 2.4.0
+#
+IgnoreExtension GL_KHR_no_error
+IgnoreExtension GL_EXT_YUV_target
+IgnoreExtension GL_EXT_blend_func_extended
+IgnoreExtension GL_EXT_buffer_storage
+IgnoreExtension GL_EXT_color_buffer_float
+IgnoreExtension GL_EXT_float_blend
+IgnoreExtension GL_EXT_multisampled_compatibility
+IgnoreExtension GL_EXT_post_depth_coverage
+IgnoreExtension GL_EXT_raster_multisample
+IgnoreExtension GL_EXT_sparse_texture
+IgnoreExtension GL_EXT_texture_filter_minmax
+IgnoreExtension GL_EXT_texture_sRGB_R8
+IgnoreExtension GL_EXT_texture_sRGB_RG8
+IgnoreExtension GL_OVR_multiview
+IgnoreExtension GL_OVR_multiview2
+
+#
+# as added in GLES2/gl2ext.h
+#
+IgnoreExtension GL_EXT_blend_func_extended
+IgnoreExtension GL_EXT_gpu_shader4
+
 # includes GL_STATE_RESTORE, which hasn't the QCOM suffix
 IgnoreExtension GL_QCOM_extended_get
 Ignore GL_STATE_RESTORE
diff --git a/make/config/jogl/gl-if-gl2es3-subset.cfg b/make/config/jogl/gl-if-gl2es3-subset.cfg
index f7c46e859..9f91102a0 100644
--- a/make/config/jogl/gl-if-gl2es3-subset.cfg
+++ b/make/config/jogl/gl-if-gl2es3-subset.cfg
@@ -4,7 +4,7 @@ JavaOutputDir ../../build-temp/gluegen-set
 # Inform the glue code generator of the association between #defines
 # and functions and the extensions in which they are defined
 # _for_ code generation. This shall match the parsed header files!
-GLSemHeader GLES3/gl31.h
+GLSemHeader GLES3/gl3x.h
 GLSemHeader GLES3/gl3ext.h
 GLSemHeader GLES2/gl2ext-supplement.h
 GLSemHeader GLES2/gl2ext.h
diff --git a/make/config/jogl/gl-if-gl3_es3.cfg b/make/config/jogl/gl-if-gl3_es3.cfg
index 86823a3f4..2f593abb0 100644
--- a/make/config/jogl/gl-if-gl3_es3.cfg
+++ b/make/config/jogl/gl-if-gl3_es3.cfg
@@ -5,7 +5,7 @@ NativeOutputDir gensrc/native/jogl
 # Inform the glue code generator of the association between #defines
 # and functions and the extensions in which they are defined
 # _for_ code generation. This shall match the parsed header files!
-GLSemHeader GLES3/gl31.h
+GLSemHeader GLES3/gl3x.h
 GLSemHeader GLES3/gl3ext.h
 GLSemHeader GLES2/gl2ext-supplement.h
 GLSemHeader GLES2/gl2ext.h
diff --git a/make/config/jogl/gl-if-gl4_es3.cfg b/make/config/jogl/gl-if-gl4_es3.cfg
index 776e82921..65e383135 100644
--- a/make/config/jogl/gl-if-gl4_es3.cfg
+++ b/make/config/jogl/gl-if-gl4_es3.cfg
@@ -5,7 +5,7 @@ NativeOutputDir gensrc/native/jogl
 # Inform the glue code generator of the association between #defines
 # and functions and the extensions in which they are defined
 # _for_ code generation. This shall match the parsed header files!
-GLSemHeader GLES3/gl31.h
+GLSemHeader GLES3/gl3x.h
 GLSemHeader GLES3/gl3ext.h
 GLSemHeader GLES2/gl2ext-supplement.h
 GLSemHeader GLES2/gl2ext.h