aboutsummaryrefslogtreecommitdiffstats
path: root/make/config/jogl
diff options
context:
space:
mode:
Diffstat (limited to 'make/config/jogl')
-rw-r--r--make/config/jogl/es3-headers.cfg2
-rw-r--r--make/config/jogl/gl-common-extensions.cfg5
-rw-r--r--make/config/jogl/gl-common.cfg69
-rw-r--r--make/config/jogl/gl-es1.cfg10
-rw-r--r--make/config/jogl/gl-es3-impl.cfg17
-rw-r--r--make/config/jogl/gl-gl4bc.cfg25
-rw-r--r--make/config/jogl/gl-if-es3.cfg2
-rw-r--r--make/config/jogl/gl-if-gl-ignores.cfg25
-rw-r--r--make/config/jogl/gl-if-gl2_es2-ignores.cfg20
-rw-r--r--make/config/jogl/gl-if-gl2_es3-ignores.cfg27
-rw-r--r--make/config/jogl/gl-if-gl2es3-subset.cfg2
-rw-r--r--make/config/jogl/gl-if-gl3-ignores.cfg3
-rw-r--r--make/config/jogl/gl-if-gl3_es3.cfg2
-rw-r--r--make/config/jogl/gl-if-gl4-ignores.cfg15
-rw-r--r--make/config/jogl/gl-if-gl4_es3.cfg2
-rw-r--r--make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java5
-rw-r--r--make/config/jogl/gl-impl-CustomJavaCode-gles1.java5
-rw-r--r--make/config/jogl/gl-impl-CustomJavaCode-gles3.java8
-rw-r--r--make/config/jogl/glu-CustomJavaCode-gl2.java2
19 files changed, 199 insertions, 47 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..b9d4b0fc4 100644
--- a/make/config/jogl/gl-common-extensions.cfg
+++ b/make/config/jogl/gl-common-extensions.cfg
@@ -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 f22730472..be4d9c44e 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
@@ -762,12 +762,22 @@ BufferObjectKind UnpackPixel glPixelMapuiv
BufferObjectKind UnpackPixel glPixelMapusv
BufferObjectKind UnpackPixel glPolygonStipple
BufferObjectKind UnpackPixel glSeparableFilter2D
+
BufferObjectKind UnpackPixel glTexImage1D
+BufferObjectKind UnpackPixel glTextureImage1DEXT
BufferObjectKind UnpackPixel glTexImage2D
+BufferObjectKind UnpackPixel glTextureImage2DEXT
BufferObjectKind UnpackPixel glTexImage3D
+BufferObjectKind UnpackPixel glTextureImage3DEXT
BufferObjectKind UnpackPixel glTexSubImage1D
+BufferObjectKind UnpackPixel glTextureSubImage1D
+BufferObjectKind UnpackPixel glTextureSubImage1DEXT
BufferObjectKind UnpackPixel glTexSubImage2D
+BufferObjectKind UnpackPixel glTextureSubImage2D
+BufferObjectKind UnpackPixel glTextureSubImage2DEXT
BufferObjectKind UnpackPixel glTexSubImage3D
+BufferObjectKind UnpackPixel glTextureSubImage3D
+BufferObjectKind UnpackPixel glTextureSubImage3DEXT
BufferObjectKind PackPixel glGetColorTable
BufferObjectKind PackPixel glGetCompressedTexImage
@@ -832,20 +842,49 @@ JavaPrologue glGetTexImage depth = tmp[0];
JavaPrologue glGetTexImage }
# Range check directives for various image-related routines
-RangeCheckBytes glColorTable 5 imageSizeInBytes({3}, {4}, {2} , 1 , 1 , false)
-RangeCheckBytes glColorTableEXT 5 imageSizeInBytes({3}, {4}, {2} , 1 , 1 , false)
-RangeCheckBytes glConvolutionFilter1D 5 imageSizeInBytes({3}, {4}, {2} , 1 , 1 , false)
-RangeCheckBytes glConvolutionFilter2D 6 imageSizeInBytes({4}, {5}, {2} , {3} , 1 , false)
-RangeCheckBytes glDrawPixels 4 imageSizeInBytes({2}, {3}, {0} , {1} , 1 , false)
-RangeCheckBytes glReadPixels 6 imageSizeInBytes({4}, {5}, {2} , {3} , 1 , true)
-RangeCheckBytes glTexImage1D 7 imageSizeInBytes({5}, {6}, {3} , 1 , 1 , false)
-RangeCheckBytes glTexImage2D 8 imageSizeInBytes({6}, {7}, {3} , {4} , 1 , false)
-RangeCheckBytes glTexImage3D 9 imageSizeInBytes({7}, {8}, {3} , {4} , {5} , false)
-RangeCheckBytes glTexSubImage1D 6 imageSizeInBytes({4}, {5}, {3} , 1 , 1 , false)
-RangeCheckBytes glTexSubImage2D 8 imageSizeInBytes({6}, {7}, {4} , {5} , 1 , false)
-RangeCheckBytes glTexSubImage3D 10 imageSizeInBytes({8}, {9}, {5} , {6} , {7} , false)
+# glTexImage1D( int target, int level, int internalFormat, int width, int border, int format, int type, Buffer pixels)
+# glTextureImage1DEXT(int texture, int target, int level, int internalformat, int width, int border, int format, int type, Buffer pixels)
+# glTexImage2D( int target, int level, int internalFormat, int width, int height, int border, int format, int type, Buffer pixels)
+# glTextureImage2DEXT(int texture, int target, int level, int internalformat, int width, int height, int border, int format, int type, Buffer pixels)
+# glTexImage3D( int target, int level, int internalformat, int width, int height, int depth, int border, int format, int type, Buffer pixels)
+# glTextureImage3DEXT(int texture, int target, int level, int internalformat, int width, int height, int depth, int border, int format, int type, Buffer pixels)
+#
+# glTexSubImage1D( int target, int level, int xoffset, int width, int format, int type, Buffer pixels)
+# glTextureSubImage1D( int texture, int level, int xoffset, int width, int format, int type, Buffer pixels)
+# glTextureSubImage1DEXT(int texture, int target, int level, int xoffset, int width, int format, int type, Buffer pixels)
+# glTexSubImage2D( int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, Buffer pixels)
+# glTextureSubImage2D( int texture, int level, int xoffset, int yoffset, int width, int height, int format, int type, Buffer pixels)
+# glTextureSubImage2DEXT(int texture, int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, Buffer pixels)
+# glTexSubImage3D( int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, Buffer pixels)
+# glTextureSubImage3D( int texture, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, Buffer pixels)
+# glTextureSubImage3DEXT(int texture, int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, Buffer pixels)
+#
+# imageSizeInBytes(int format, int type, int width, int height, int depth, boolean pack)
+#
+RangeCheckBytes glColorTable 5 imageSizeInBytes({3}, {4}, {2}, 1 , 1 , false)
+RangeCheckBytes glColorTableEXT 5 imageSizeInBytes({3}, {4}, {2}, 1 , 1 , false)
+RangeCheckBytes glConvolutionFilter1D 5 imageSizeInBytes({3}, {4}, {2}, 1 , 1 , false)
+RangeCheckBytes glConvolutionFilter2D 6 imageSizeInBytes({4}, {5}, {2}, {3}, 1 , false)
+RangeCheckBytes glDrawPixels 4 imageSizeInBytes({2}, {3}, {0}, {1}, 1 , false)
+RangeCheckBytes glReadPixels 6 imageSizeInBytes({4}, {5}, {2}, {3}, 1 , true)
+RangeCheckBytes glTexImage1D 7 imageSizeInBytes({5}, {6}, {3}, 1 , 1 , false)
+RangeCheckBytes glTextureImage1DEXT 8 imageSizeInBytes({6}, {7}, {4}, 1 , 1 , false)
+RangeCheckBytes glTexImage2D 8 imageSizeInBytes({6}, {7}, {3}, {4}, 1 , false)
+RangeCheckBytes glTextureImage2DEXT 9 imageSizeInBytes({7}, {8}, {4}, {5}, 1 , false)
+RangeCheckBytes glTexImage3D 9 imageSizeInBytes({7}, {8}, {3}, {4}, {5}, false)
+RangeCheckBytes glTextureImage3DEXT 10 imageSizeInBytes({8}, {9}, {4}, {5}, {6}, false)
+RangeCheckBytes glTexSubImage1D 6 imageSizeInBytes({4}, {5}, {3}, 1 , 1 , false)
+RangeCheckBytes glTextureSubImage1D 6 imageSizeInBytes({4}, {5}, {3}, 1 , 1 , false)
+RangeCheckBytes glTextureSubImage1DEXT 7 imageSizeInBytes({5}, {6}, {4}, 1 , 1 , false)
+RangeCheckBytes glTexSubImage2D 8 imageSizeInBytes({6}, {7}, {4}, {5}, 1 , false)
+RangeCheckBytes glTextureSubImage2D 8 imageSizeInBytes({6}, {7}, {4}, {5}, 1 , false)
+RangeCheckBytes glTextureSubImage2DEXT 9 imageSizeInBytes({7}, {8}, {5}, {6}, 1 , false)
+RangeCheckBytes glTexSubImage3D 10 imageSizeInBytes({8}, {9}, {5}, {6}, {7}, false)
+RangeCheckBytes glTextureSubImage3D 10 imageSizeInBytes({8}, {9}, {5}, {6}, {7}, false)
+RangeCheckBytes glTextureSubImage3DEXT 11 imageSizeInBytes({9}, {10}, {6}, {7}, {8}, false)
+
# This may produce wrong answers for 1D textures
-RangeCheckBytes glGetTexImage 4 imageSizeInBytes({2}, {3}, width , height , depth, true)
+RangeCheckBytes glGetTexImage 4 imageSizeInBytes({2}, {3}, width, height, depth, true)
# Note we don't support glTexImage4DSGIS / glTexSubImage4DSGIS
# FIXME: add the following unpack operations:
# glBitmap, glPolygonStipple
@@ -979,7 +1018,7 @@ ClassJavadoc GLES2 * as well as most of it's extensions defined at the time of
ClassJavadoc GLES2 */
ClassJavadoc GLES3 /**
-ClassJavadoc GLES3 * <p>This interface contains all OpenGL ES [ 3.0 .. 3.1 ] methods,
+ClassJavadoc GLES3 * <p>This interface contains all OpenGL ES [ 3.0 .. 3.2 ] methods,
ClassJavadoc GLES3 * as well as most of it's extensions defined at the time of this specification.</p>
ClassJavadoc GLES3 */
diff --git a/make/config/jogl/gl-es1.cfg b/make/config/jogl/gl-es1.cfg
index 6ce59770e..ad565d883 100644
--- a/make/config/jogl/gl-es1.cfg
+++ b/make/config/jogl/gl-es1.cfg
@@ -26,9 +26,10 @@ JavaClass GLES1
Extends GLES1 GL2ES1
ImplPackage jogamp.opengl.es1
ImplJavaClass GLES1Impl
-Implements GLES1Impl GLBase
-Implements GLES1Impl GL
-Implements GLES1Impl GL2ES1
+#Implements GLES1Impl GLBase
+#Implements GLES1Impl GL
+#Implements GLES1Impl GL2ES1
+#Implements GLES1Impl GLES1 implicit
HierarchicalNativeOutput false
Include gl-common.cfg
Include gl-common-extensions.cfg
@@ -39,6 +40,9 @@ ProcAddressTableClassName GLES1ProcAddressTable
GetProcAddressTableExpr _pat
# GetProcAddressTableExpr ((GLES1ProcAddressTable)_context.getGLProcAddressTable())
+# Manual implement glDebugMessageCallback* using the proc address resolver
+ForceProcAddressGen glDebugMessageCallbackKHR
+
# Force all of the methods to be emitted using dynamic linking so we
# don't need to link against any emulation library on the desktop or
# depend on the presence of an import library for a particular device
diff --git a/make/config/jogl/gl-es3-impl.cfg b/make/config/jogl/gl-es3-impl.cfg
index 01ef034f6..98ed74c03 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
@@ -22,13 +22,13 @@ ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java
Style ImplOnly
ImplPackage jogamp.opengl.es3
ImplJavaClass GLES3Impl
-Implements GLES3Impl GLBase
-Implements GLES3Impl GL
-Implements GLES3Impl GL2ES2
+#Implements GLES3Impl GLBase
+#Implements GLES3Impl GL
+#Implements GLES3Impl GL2ES2
Implements GLES3Impl GLES2
-Implements GLES3Impl GL2ES3
-Implements GLES3Impl GL3ES3
-Implements GLES3Impl GL4ES3
+#Implements GLES3Impl GL2ES3
+#Implements GLES3Impl GL3ES3
+#Implements GLES3Impl GL4ES3
Implements GLES3Impl GLES3
HierarchicalNativeOutput false
Include gl-common.cfg
@@ -44,6 +44,9 @@ ProcAddressTableClassName GLES3ProcAddressTable
GetProcAddressTableExpr _pat
# GetProcAddressTableExpr ((GLES3ProcAddressTable)_context.getGLProcAddressTable())
+# Manual implement glDebugMessageCallback* using the proc address resolver
+ForceProcAddressGen glDebugMessageCallbackKHR
+
# Force all of the methods to be emitted using dynamic linking so we
# don't need to link against any emulation library on the desktop or
# depend on the presence of an import library for a particular device
diff --git a/make/config/jogl/gl-gl4bc.cfg b/make/config/jogl/gl-gl4bc.cfg
index e3e706688..2f35c8c76 100644
--- a/make/config/jogl/gl-gl4bc.cfg
+++ b/make/config/jogl/gl-gl4bc.cfg
@@ -45,18 +45,19 @@ Extends GL4bc GL3bc
Extends GL4bc GL4
ImplPackage jogamp.opengl.gl4
ImplJavaClass GL4bcImpl
-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
-Implements GL4bcImpl GL3bc
+#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
+#Implements GL4bcImpl GL3bc
Implements GL4bcImpl GL4
+#Implements GL4bcImpl GL4bc implicit
Include gl-common.cfg
Include gl-common-extensions.cfg
@@ -180,7 +181,7 @@ MethodJavadoc glMapNamedBufferRangeEXT * </p>
DelegateImplementation glUnmapNamedBuffer glUnmapNamedBufferDelegate
DelegateImplementation glUnmapNamedEXTBuffer glUnmapNamedEXTBufferDelegate
-# Manuall implement glDebugMessageCallback* using the proc address resolver
+# Manual implement glDebugMessageCallback* using the proc address resolver
ForceProcAddressGen glDebugMessageCallback
ForceProcAddressGen glDebugMessageCallbackAMD
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-ignores.cfg b/make/config/jogl/gl-if-gl3-ignores.cfg
index 7838ef082..549d684ba 100644
--- a/make/config/jogl/gl-if-gl3-ignores.cfg
+++ b/make/config/jogl/gl-if-gl3-ignores.cfg
@@ -57,4 +57,5 @@ IgnoreExtension GL_KHR_robust_buffer_access_behavior
IgnoreExtension GL_KHR_robustness
# Ignore extensions requiring GL 3.3
IgnoreExtension GL_ARB_explicit_uniform_location
-
+IgnoreExtension GL_ARB_texture_filter_minmax
+IgnoreExtension GL_ARB_shader_image_load_store
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-ignores.cfg b/make/config/jogl/gl-if-gl4-ignores.cfg
index 2f00cc6c1..7de570557 100644
--- a/make/config/jogl/gl-if-gl4-ignores.cfg
+++ b/make/config/jogl/gl-if-gl4-ignores.cfg
@@ -25,6 +25,11 @@ IgnoreExtension GL_ARB_shader_precision
IgnoreExtension GL_ARB_shader_storage_buffer_object
IgnoreExtension GL_ARB_bindless_texture
IgnoreExtension GL_ARB_derivative_control
+IgnoreExtension GL_ARB_gpu_shader_int64
+IgnoreExtension GL_ARB_shader_ballot
+IgnoreExtension GL_ARB_shader_clock
+# Ignore extensions requiring GL 4.1
+IgnoreExtension GL_ARB_shader_viewport_layer_array
# Ignore extensions written against GL 4.2
IgnoreExtension GL_ARB_vertex_attrib_binding
IgnoreExtension GL_ARB_program_interface_query
@@ -37,9 +42,19 @@ IgnoreExtension GL_ARB_indirect_parameters
IgnoreExtension GL_ARB_texture_view
IgnoreExtension GL_EXT_texture_view
IgnoreExtension GL_OES_texture_view
+IgnoreExtension GL_ARB_shader_atomic_counter_ops
+IgnoreExtension GL_ARB_fragment_shader_interlock
# Ignore extensions requiring GL 4.3
IgnoreExtension GL_ARB_shader_texture_image_samples
# Ignore extensions requiring GL 4.4
IgnoreExtension GL_ARB_ES3_1_compatibility
# Ignore extensions requiring GL 4.5
+# Ignore extensions written against GL 4.5
+IgnoreExtension GL_ARB_parallel_shader_compile
+IgnoreExtension GL_ARB_ES3_2_compatibility
+IgnoreExtension GL_ARB_sparse_texture2
+IgnoreExtension GL_ARB_sparse_texture_clamp
+IgnoreExtension GL_ARB_sample_locations
+IgnoreExtension GL_ARB_fragment_shader_interlock
+IgnoreExtension GL_ARB_post_depth_coverage
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
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
index f46f08a94..0db1b4a6e 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
@@ -123,6 +123,11 @@ public final boolean isGLES31Compatible() {
}
@Override
+public final boolean isGLES32Compatible() {
+ return _context.isGLES32Compatible();
+}
+
+@Override
public final boolean isGL2GL3() {
return _context.isGL2GL3();
}
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
index 5300a1e3b..c9dafc419 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
@@ -119,6 +119,11 @@ public final boolean isGLES31Compatible() {
}
@Override
+public final boolean isGLES32Compatible() {
+ return false;
+}
+
+@Override
public final boolean isGL2GL3() {
return false;
}
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles3.java b/make/config/jogl/gl-impl-CustomJavaCode-gles3.java
index 1e9082330..16a6b9c08 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles3.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles3.java
@@ -120,6 +120,11 @@ public final boolean isGLES31Compatible() {
}
@Override
+public final boolean isGLES32Compatible() {
+ return _context.isGLES32Compatible();
+}
+
+@Override
public final boolean isGL2GL3() {
return false;
}
@@ -171,6 +176,9 @@ public final GLES2 getGLES2() throws GLException {
@Override
public final GLES3 getGLES3() throws GLException {
+ if(!_isES3) {
+ throw new GLException("Not a GLES3 implementation");
+ }
return this;
}
diff --git a/make/config/jogl/glu-CustomJavaCode-gl2.java b/make/config/jogl/glu-CustomJavaCode-gl2.java
index d7ba58de4..2ade45c0e 100644
--- a/make/config/jogl/glu-CustomJavaCode-gl2.java
+++ b/make/config/jogl/glu-CustomJavaCode-gl2.java
@@ -538,7 +538,7 @@ private static final GLUgl2ProcAddressTable getGLUProcAddressTable() {
if (curContext == null) {
throw new GLException("No OpenGL context current on this thread");
}
- GLDynamicLookupHelper glLookupHelper = ((GLDrawableImpl) curContext.getGLDrawable()).getGLDynamicLookupHelper();
+ GLDynamicLookupHelper glLookupHelper = ((GLContextImpl) curContext).getGLDynamicLookupHelper();
glLookupHelper.loadGLULibrary();
GLUgl2ProcAddressTable tmp = new GLUgl2ProcAddressTable(new GLProcAddressResolver());
tmp.reset(glLookupHelper);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-19 01:05:27 +0000