Bug 1135 - Change all GlueGen config files, supporting EGL 1.5 , ES 3.1 and GL 4.5

1 files changed, 135 insertions, 47 deletions

diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg
index 9101d36c9..b881ce4d0 100644
--- a/make/config/jogl/gl-common.cfg
+++ b/make/config/jogl/gl-common.cfg
@@ -7,19 +7,30 @@ HierarchicalNativeOutput false
 RuntimeExceptionType GLException
 UnsupportedExceptionType GLException
 
+# Desktop GL and GLES* headers types slightly differ 
+# but still are compatible related to actual storage size. 
+RelaxedEqualSemanticsTest true
+
+# For easier debugging of GLSemHeader, i.e. less debug output
+#DropAllGLDocHeader true
+
 # Inform the glue code generator of the association between #defines
 # and functions and the extensions in which they are defined
-GLHeader GL/gl.h
-GLHeader GL/glext.h
-GLHeader GL/glcorearb.h
-GLHeader GL/glcorearbext.h
-GLHeader GLES/gl.h
-GLHeader GLES/glext.h
-GLHeader GLES2/gl2.h
-GLHeader GLES2/gl2ext.h
-GLHeader GLES3/gl3.h
-GLHeader GLES3/gl3ext.h
-GLHeader GL/glext-20130207.h
+# _for_ API documentation only!
+GLDocHeader GL/glext-supplement.h
+GLDocHeader GL/gl.h
+GLDocHeader GL/glext-20130207.h
+GLDocHeader GL/glext.h
+GLDocHeader GL/glcorearb.h
+GLDocHeader GL/glcorearbext.h
+GLDocHeader GLES/glext-supplement.h
+GLDocHeader GLES/gl.h
+GLDocHeader GLES/glext.h
+GLDocHeader GLES2/gl2ext-supplement.h
+GLDocHeader GLES2/gl2.h
+GLDocHeader GLES2/gl2ext.h
+GLDocHeader GLES3/gl31.h
+GLDocHeader GLES3/gl3ext.h
 
 # Imports needed by all glue code
 Import java.util.*
@@ -191,8 +202,8 @@ IgnoreExtension GL_EXT_texture_object
 # <<< OpenGL 1.1
 
 # >>> OpenGL 1.2
-# Ignore extensions subsumed in OpenGL 1.2 and 1.2.1 (from OpenGL 1.2.1 spec, Appendix D)
-IgnoreExtension GL_EXT_bgra
+# Ignore/Rename extensions subsumed in OpenGL 1.2 and 1.2.1 (from OpenGL 1.2.1 spec, Appendix D)
+RenameExtensionIntoCore GL_EXT_bgra
 IgnoreExtension GL_EXT_blend_color
 IgnoreExtension GL_EXT_blend_minmax
 IgnoreExtension GL_EXT_blend_subtract
@@ -215,12 +226,15 @@ IgnoreExtension GL_SGIS_texture_lod
 # <<< OpenGL 1.2
 
 # >>> OpenGL 1.3
-# Ignore extensions subsumed in OpenGL 1.3 (from OpenGL 1.3 spec, Appendix F)
+# Ignore/Rename extensions subsumed in OpenGL 1.3 (from OpenGL 1.3 spec, Appendix F)
 IgnoreExtension GL_ARB_multisample
+IgnoreExtension GL_EXT_multisample
 IgnoreExtension GL_ARB_multitexture
 IgnoreExtension GL_ARB_texture_compression
 IgnoreExtension GL_ARB_texture_cube_map
-IgnoreExtension GL_ARB_texture_border_clamp
+RenameExtensionIntoCore GL_ARB_texture_border_clamp
+RenameExtensionIntoCore GL_EXT_texture_border_clamp
+IgnoreExtension GL_SGIS_texture_border_clamp
 IgnoreExtension GL_ARB_texture_env_add
 IgnoreExtension GL_ARB_texture_env_combine
 IgnoreExtension GL_ARB_texture_env_dot3
@@ -229,13 +243,13 @@ IgnoreExtension GL_EXT_texture_cube_map
 IgnoreExtension GL_EXT_texture_env_add
 IgnoreExtension GL_EXT_texture_env_combine
 IgnoreExtension GL_EXT_texture_env_dot3
-IgnoreExtension GL_SGIS_texture_border_clamp
 # <<< OpenGL 1.3
 
 # >>> OpenGL 1.4
 # Ignore extensions subsumed in OpenGL 1.4 (from OpenGL 1.4 spec, Appendix G)
 IgnoreExtension GL_ARB_depth_texture
 IgnoreExtension GL_ARB_point_parameters
+IgnoreExtension GL_EXT_point_parameters
 IgnoreExtension GL_ARB_shadow
 IgnoreExtension GL_ARB_texture_env_crossbar
 IgnoreExtension GL_ARB_texture_mirrored_repeat
@@ -251,33 +265,33 @@ IgnoreExtension GL_SGIS_generate_mipmap
 # <<< OpenGL 1.4
 
 # >>> OpenGL 1.5
-# Ignore extensions subsumed in OpenGL 1.5 (from OpenGL 1.5 spec, Appendix H)
+# Ignore/Rename extensions subsumed in OpenGL 1.5 (from OpenGL 1.5 spec, Appendix H)
 IgnoreExtension GL_ARB_occlusion_query
-IgnoreExtension GL_ARB_vertex_buffer_object
+RenameExtensionIntoCore GL_ARB_vertex_buffer_object
 IgnoreExtension GL_EXT_shadow_funcs
 # <<< OpenGL 1.5
 
 # >>> OpenGL 2.0
-# Ignore extensions subsumed in OpenGL 2.0 (from OpenGL 2.0 spec, Appendix I)
-# NOTE that GL_ARB_shader_objects is NOT ignored here, because the
-# naming convention is too different for us to pick up the entry
-# points automatically (e.g. glCreateShaderObjectARB was exposed as
-# glCreateShader)
+# Ignore/Rename extensions subsumed in OpenGL 2.0 (from OpenGL 2.0 spec, Appendix I)
+# NOTE that GL_ARB_shader_objects is NOT renamed/subsumed here, 
+# because the naming convention is too different for us to pick up the entry
+# points automatically (e.g. glCreateShaderObjectARB was exposed as glCreateShader)
 # IgnoreExtension GL_ARB_shader_objects
 IgnoreExtension GL_ARB_vertex_shader
 IgnoreExtension GL_ARB_fragment_shader
 IgnoreExtension GL_ARB_texture_non_power_of_two
-IgnoreExtension GL_ARB_point_sprite
-IgnoreExtension GL_ARB_draw_buffers
+RenameExtensionIntoCore GL_ARB_point_sprite
+RenameExtensionIntoCore GL_ARB_draw_buffers
+RenameExtensionIntoCore GL_EXT_draw_buffers
 IgnoreExtension GL_EXT_blend_equation_separate
 # Don't ignore the following one since the entry point is different from anything in the core
 # IgnoreExtension GL_EXT_stencil_two_side
 # <<< OpenGL 2.0
 
 # >>> OpenGL 2.1
-# Ignore extensions subsumed in OpenGL 2.1 (from OpenGL 2.1 spec, Appendix J)
-IgnoreExtension GL_ARB_pixel_buffer_object
-IgnoreExtension GL_EXT_texture_sRGB
+# Ignore/Rename extensions subsumed in OpenGL 2.1 (from OpenGL 2.1 spec, Appendix J)
+RenameExtensionIntoCore GL_ARB_pixel_buffer_object
+RenameExtensionIntoCore GL_EXT_texture_sRGB
 # <<< OpenGL 2.1
 
 # >>> OpenGL 3.0
@@ -298,14 +312,12 @@ RenameExtensionIntoCore GL_EXT_texture_shared_exponent
 
 # gl.h uses GL_ARB_framebuffer_object
 RenameExtensionIntoCore GL_ARB_framebuffer_object
-IgnoreExtension GL_EXT_framebuffer_object
+RenameExtensionIntoCore GL_EXT_framebuffer_object
 
 RenameExtensionIntoCore GL_NV_half_float
 RenameExtensionIntoCore GL_ARB_half_float_pixel
 
-# naming collision w/ GL_EXT_multisampled_render_to_texture, but included anyways
-# RenameExtensionIntoCore GL_EXT_framebuffer_multisample 
-IgnoreExtension GL_EXT_framebuffer_multisample 
+RenameExtensionIntoCore GL_EXT_framebuffer_multisample 
 RenameExtensionIntoCore GL_EXT_framebuffer_blit
 
 #Big gap of promoted tokens and functions: GL_EXT_texture_integer
@@ -330,9 +342,10 @@ IgnoreExtension GL_APPLE_vertex_array_object
 
 # gl.h uses GL_ARB_framebuffer_sRGB
 RenameExtensionIntoCore GL_ARB_framebuffer_sRGB
-IgnoreExtension GL_EXT_framebuffer_sRGB
+RenameExtensionIntoCore GL_EXT_framebuffer_sRGB
 
 RenameExtensionIntoCore GL_ARB_map_buffer_range
+RenameExtensionIntoCore GL_EXT_map_buffer_range
 
 # <<< OpenGL 3.0
 
@@ -379,6 +392,8 @@ RenameExtensionIntoCore GL_ARB_texture_swizzle
 RenameExtensionIntoCore GL_ARB_timer_query
 RenameExtensionIntoCore GL_ARB_instanced_arrays
 RenameExtensionIntoCore GL_ARB_vertex_type_2_10_10_10_rev
+RenameExtensionIntoCore GL_ARB_instanced_arrays
+RenameExtensionIntoCore GL_EXT_instanced_arrays
 # <<< OpenGL 3.3
 
 # >>> OpenGL 4.0
@@ -411,24 +426,101 @@ RenameExtensionIntoCore GL_ARB_viewport_array
 
 # >>> OpenGL 4.2
 # Rename extension suffices (if exist) subsumed in OpenGL 4.2 (from OpenGL 4.2 spec, Appendix L.1)
+# Uncommented extensions use a 'EXT' suffix only to distinguish DSA usage!
+RenameExtensionIntoCore GL_ARB_base_instance
+RenameExtensionIntoCore GL_EXT_base_instance
+RenameExtensionIntoCore GL_ARB_shading_language_420pack
+RenameExtensionIntoCore GL_ARB_transform_feedback_instanced
+RenameExtensionIntoCore GL_ARB_compressed_texture_pixel_storage
+RenameExtensionIntoCore GL_ARB_conservative_depth
+RenameExtensionIntoCore GL_ARB_internalformat_query
+RenameExtensionIntoCore GL_ARB_map_buffer_alignment
+RenameExtensionIntoCore GL_ARB_shader_atomic_counters
+RenameExtensionIntoCore GL_ARB_shader_image_load_store
+RenameExtensionIntoCore GL_EXT_shader_image_load_store
+RenameExtensionIntoCore GL_ARB_shading_language_packing
+#RenameExtensionIntoCore GL_ARB_texture_storage
 # <<< OpenGL 4.2
 
 # >>> OpenGL 4.3
 # Rename extension suffices (if exist) subsumed in OpenGL 4.3 (from OpenGL 4.3 spec, Appendix ?.1)
+# Uncommented extensions use a 'EXT' suffix only to distinguish DSA usage!
+RenameExtensionIntoCore GL_ARB_arrays_of_arrays
+RenameExtensionIntoCore GL_ARB_fragment_layer_viewport
+RenameExtensionIntoCore GL_ARB_shader_image_size
+RenameExtensionIntoCore GL_ARB_ES3_compatibility
+RenameExtensionIntoCore GL_ARB_clear_buffer_object
+RenameExtensionIntoCore GL_ARB_compute_shader
+RenameExtensionIntoCore GL_ARB_copy_image
+RenameExtensionIntoCore GL_EXT_copy_image
 RenameExtensionIntoCore GL_ARB_debug_output
+RenameExtensionIntoCore GL_KHR_debug
+RenameExtensionIntoCore GL_ARB_explicit_uniform_location
+RenameExtensionIntoCore GL_ARB_framebuffer_no_attachments
+RenameExtensionIntoCore GL_ARB_internalformat_query2
+RenameExtensionIntoCore GL_ARB_invalidate_subdata
+RenameExtensionIntoCore GL_ARB_multi_draw_indirect
+RenameExtensionIntoCore GL_ARB_program_interface_query
+RenameExtensionIntoCore GL_ARB_robust_buffer_access_behavior
+RenameExtensionIntoCore GL_ARB_shader_storage_buffer_object
+RenameExtensionIntoCore GL_ARB_stencil_texturing
+#RenameExtensionIntoCore GL_ARB_texture_buffer_range
+RenameExtensionIntoCore GL_ARB_texture_query_levels
+#RenameExtensionIntoCore GL_ARB_texture_storage_multisample
+RenameExtensionIntoCore GL_ARB_texture_view
+RenameExtensionIntoCore GL_EXT_texture_view
+#RenameExtensionIntoCore GL_ARB_vertex_attrib_binding
 # <<< OpenGL 4.3
 
+# >>> OpenGL 4.4
+# Uncommented extensions use a 'EXT' suffix only to distinguish DSA usage!
+# <<< OpenGL 4.4
+
+# >>> OpenGL 4.5
+# Uncommented extensions use a 'EXT' suffix only to distinguish DSA usage!
+RenameExtensionIntoCore GL_ARB_clip_control
+RenameExtensionIntoCore GL_ARB_cull_distance
+RenameExtensionIntoCore GL_ARB_ES3_1_compatibility
+RenameExtensionIntoCore GL_ARB_conditional_render_inverted
+RenameExtensionIntoCore GL_KHR_context_flush_control
+RenameExtensionIntoCore GL_ARB_derivative_control
+RenameExtensionIntoCore GL_ARB_direct_state_access
+#RenameExtensionIntoCore GL_EXT_direct_state_access
+RenameExtensionIntoCore GL_ARB_get_texture_sub_image
+RenameExtensionIntoCore GL_ARB_robustness
+RenameExtensionIntoCore GL_KHR_robustness
+RenameExtensionIntoCore GL_EXT_robustness
+RenameExtensionIntoCore GL_ARB_shader_texture_image_samples
+RenameExtensionIntoCore GL_ARB_texture_barrier
+# <<< OpenGL 4.5
+
 # >>> OpenGL ES 2.0
 # <<< OpenGL ES 2.0
 
 # >>> OpenGL ES 3.0
 # <<< OpenGL ES 3.0
 
-# Ignore a few obsolete versions of extensions that have been subsumed into the core or ARB extensions
-IgnoreExtension GL_EXT_multisample
-IgnoreExtension GL_EXT_point_parameters
-IgnoreExtension GL_EXT_separate_shader_objects
-IgnoreExtension GL_EXT_shader_image_load_store
+# >>> OpenGL ES 3.1
+#FIXME
+# <<< OpenGL ES 3.1
+
+# GL_EXT_separate_shader_objects of GLES2/gl2ext.h
+# collides with GL/glext.h variant. 
+# The latter is obsolete and has different semantics!
+# GLES2/gl2ext.h's GL_EXT_separate_shader_objects version 
+# has been added to GL/glext-supplement.h overriding the 'odd' GL/glext.h one.
+RenameExtensionIntoCore GL_EXT_separate_shader_objects
+
+RenameExtensionIntoCore GL_EXT_color_buffer_half_float
+RenameExtensionIntoCore GL_EXT_occlusion_query_boolean
+RenameExtensionIntoCore GL_EXT_shadow_samplers
+RenameExtensionIntoCore GL_EXT_sRGB
+RenameExtensionIntoCore GL_EXT_sRGB_write_control
+RenameExtensionIntoCore GL_EXT_texture_rg
+RenameExtensionIntoCore GL_EXT_texture_type_2_10_10_10_REV
+RenameExtensionIntoCore GL_EXT_packed_float
+RenameExtensionIntoCore GL_EXT_texture_format_BGRA8888
+RenameExtensionIntoCore GL_EXT_disjoint_timer_query
 
 #
 # Opaques and other directives for platform-independent routines
@@ -437,8 +529,11 @@ IgnoreExtension GL_EXT_shader_image_load_store
 Opaque boolean GLboolean
 Opaque long GLsync
 Opaque long GLeglImageOES
-Opaque long cl_context
-Opaque long cl_event
+Opaque long GLhandleARB
+# for 'struct _cl_context*'
+Opaque long _cl_context*
+# for 'struct _cl_event*'
+Opaque long _cl_event*
 ReturnsString glGetString
 ReturnsString glGetStringi
 
@@ -483,8 +578,6 @@ NIODirectOnly glVertexAttribPointer
 NIODirectOnly glVertexPointer
 NIODirectOnly glVertexWeightPointerEXT
 NIODirectOnly glWeightPointerARB
-NIODirectOnly wglFreeMemoryNV
-NIODirectOnly glXFreeMemoryNV
 
 # Native PointerBuffer usage:
 NIODirectOnly glMultiDrawElements
@@ -503,11 +596,6 @@ NIODirectOnly glExtGetBufferPointervQCOM
 #
 #NIO Review: No technical reason to constrain array access for these:
 
-# Capacity of wglAllocateMemoryNV/glXAllocateMemoryNV return value is
-# same as value of first argument
-ReturnValueCapacity wglAllocateMemoryNV {0}
-ReturnValueCapacity glXAllocateMemoryNV {0}
-
 # Pass arguments to ARB_vertex_program, ARB_fragment_program,
 # ARB_shader_objects, NV_vertex_program, NV_fragment_program, and
 # ARB_vertex_shader as Strings