From cccddaeb39ad19a4e8c77fdff1d4950f48e32e8e Mon Sep 17 00:00:00 2001 From: Kenneth Russel Date: Wed, 20 May 2009 21:47:58 +0000 Subject: Recently code (UnifiedName, GLUnifiedName) was added to GlueGen to automatically detect duplicate constant and function definitions between vendor and ARB extensions and the OpenGL core, and to remove the suffixes of ARB extensions. This code has helped automate the process of discovering extensions that were promoted into the OpenGL core. While this code has saved some manual effort, it has also caused several problems: 1. It causes obsolete ARB extensions to be incorrectly moved into the core OpenGL namespace. GL_ARB_texture_rectangle, GL_ARB_vertex_blend, and GL_ARB_matrix_palette are examples of extensions that should not have their ARB suffixes removed because they are dead-end extensions. Definitions which are explicitly specified that they will change, such as those in the EGL_KHR_sync extension, were also incorrectly moved into the core namespace. 2. It has caused certain OpenGL ES-specific definitions to accidentally be promoted into the core OpenGL namespace: for example, the constants associated with the GL_OES_point_size_array extension, which were incorrectly placed into the GL2ES1 interface. 3. It causes namespace collisions between certain ARB extensions that are only accessible via their ARB entry points and core OpenGL routines: specifically GL_ARB_vertex_program and GL_ARB_fragment program. Based on tests on NVIDIA's drivers, when a developer wants to use the earlier ARB_vertex_program and ARB_fragment_program semantics rather than GLSL, it is mandatory to use the ARB entry points rather than the core OpenGL entry points. 4. It is not easy to configure the behavior of this automatic merging, nor easy to see how it would be extended to be configurable. 5. It does not address the problem of detecting which extensions are common between desktop OpenGL and OpenGL ES. A different algorithm would be needed to solve that problem. 6. It has a high degree of functional overlap to the IgnoreExtension directive which has previously been used to ignore ARB extensions that were promoted into the OpenGL core. There were already IgnoreExtension directives in place for all of the OpenGL extensions subsumed in OpenGL 1.1 through 1.3. 7. It has been the cause of several bugs and unexpected interactions with the Ignore and ForceProcAddressGen directives. After careful consideration, it appears that the problems with this code outweigh the benefits and it has been removed. The run-time code which attempts to find extension variants of core entry points has been retained, however. To reduce the amount of subsequent manual work, the following additions have been made: 1. A generic SymbolFilter mechanism has been added to GlueGen, which can be used to pre-process the entire set of constant and function definitions at any time during glue code generation (although it is recommended to do so at the beginning of processing, i.e., in GlueEmitter.beginEmission()). 2. The RenameJavaMethod directive has been generalized to RenameJavaSymbol, and can now work on constant definitions. 3. A ConstantDefinition class has been added. 4. A RenameExtensionIntoCore directive has been added to the GLEmitter which will rename all constant definitions and entry points associated with a particular OpenGL extension into the core namespace, i.e., stripping off any ARB or similar suffixes. 5. An AutoUnifyExtensions directive has been added which is disabled by default but which will automatically ignore any OpenGL extension which has been completely subsumed into the OpenGL core and, if not, print out the first declaration in that extension which caused it to fail to be ignored. The extensions common between OpenGL ES and desktop OpenGL have now largely been moved into the core namespace using the RenameExtensionIntoCore directive. A couple of these extensions had slight differences between desktop OpenGL and OpenGL ES; the common declarations were renamed manually. IgnoreExtension directives have been added for those ARB extensions promoted into the OpenGL core up to OpenGL 2.1. A few extensions which were either silently promoted into the core specification (GL_EXT_paletted_texture) or are obsolete (GL_EXT_multisample, GL_EXT_point_parameters) were also ignored. The GlueGen runtime code which looks up extension versions of core APIs via GLExtensionNames makes this possible without breaking compatibility on older machines that do not support OpenGL 2.1 directly. With these changes, the same effect as the automatic extension unification mechanism has been achieved, with much more explainable and controllable results. Before-and-after versions of all of the public interfaces (GL, GL2ES1, GL2ES2, GLES1, GLES2, and GL2) have been compared by hand to ensure that the results are as expected and desired. Bugs in BuildStaticGLInfo were fixed which were preventing the extension associations in the OpenGL ES headers from being discovered. getExtensions() was added to be able to enumerate the discovered extensions. Most .cfg files were changed to parse both the desktop OpenGL and the OpenGL ES headers using the GLHeaders directive so that the extension associations are known for both sets of APIs. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1908 232f8b59-042b-4e1e-8c03-345bb8c30851 --- make/config/jogl/gl-common-extensions.cfg | 78 +++++++++++++++++++++- make/config/jogl/gl-common.cfg | 51 +++++++++++++- make/config/jogl/gl-es1.cfg | 7 ++ make/config/jogl/gl-es2.cfg | 2 + make/config/jogl/gl-gl2.cfg | 3 + make/config/jogl/gl-if-gl.cfg | 2 + make/config/jogl/gl-if-gl2_es1.cfg | 34 +++++++--- make/config/jogl/gl-if-gl2_es2.cfg | 2 + make/config/jogl/gl-impl-CustomJavaCode-gles1.java | 2 +- make/config/jogl/gl-impl-CustomJavaCode-gles2.java | 2 +- 10 files changed, 169 insertions(+), 14 deletions(-) (limited to 'make') diff --git a/make/config/jogl/gl-common-extensions.cfg b/make/config/jogl/gl-common-extensions.cfg index 5b1d57fb0..f03d58d4a 100644 --- a/make/config/jogl/gl-common-extensions.cfg +++ b/make/config/jogl/gl-common-extensions.cfg @@ -5,16 +5,17 @@ DropUniqVendorExtensions APPLE DropUniqVendorExtensions ATI DropUniqVendorExtensions HP DropUniqVendorExtensions IBM +DropUniqVendorExtensions INGR DropUniqVendorExtensions MESA DropUniqVendorExtensions MESAX DropUniqVendorExtensions NV +DropUniqVendorExtensions PGI DropUniqVendorExtensions SGI DropUniqVendorExtensions SGIS DropUniqVendorExtensions SGIX DropUniqVendorExtensions SUN DropUniqVendorExtensions WIN - # Enums handled by base GL class Ignore GL_FRAMEBUFFER_EXT Ignore GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT @@ -62,3 +63,78 @@ RenameJavaMethod glGetRenderbufferParameterivEXT glGetRenderbufferParameteriv RenameJavaMethod glIsFramebufferEXT glIsFramebuffer RenameJavaMethod glIsRenderbufferEXT glIsRenderbuffer RenameJavaMethod glRenderbufferStorageEXT glRenderbufferStorage + +# Remove extension suffixes from extensions which are common between OpenGL and OpenGL ES +RenameExtensionIntoCore GL_ARB_half_float_pixel +RenameExtensionIntoCore GL_ARB_point_sprite +RenameExtensionIntoCore GL_OES_blend_equation_separate +RenameExtensionIntoCore GL_OES_blend_func_separate +RenameExtensionIntoCore GL_OES_blend_subtract +RenameExtensionIntoCore GL_OES_compressed_paletted_texture +RenameExtensionIntoCore GL_OES_depth24 +RenameExtensionIntoCore GL_OES_depth32 +RenameExtensionIntoCore GL_OES_framebuffer_object +RenameExtensionIntoCore GL_OES_mapbuffer +RenameExtensionIntoCore GL_OES_point_sprite +RenameExtensionIntoCore GL_OES_rgb8_rgba8 +RenameExtensionIntoCore GL_OES_read_format +RenameExtensionIntoCore GL_OES_stencil1 +RenameExtensionIntoCore GL_OES_stencil4 +RenameExtensionIntoCore GL_OES_stencil8 +RenameExtensionIntoCore GL_OES_stencil_wrap +RenameExtensionIntoCore GL_OES_texture_cube_map +RenameExtensionIntoCore GL_OES_texture_half_float +RenameExtensionIntoCore GL_OES_texture_mirrored_repeat + +RenameJavaSymbol GL_STENCIL_INDEX1_EXT GL_STENCIL_INDEX1 +RenameJavaSymbol GL_STENCIL_INDEX4_EXT GL_STENCIL_INDEX4 +RenameJavaSymbol GL_STENCIL_INDEX8_EXT GL_STENCIL_INDEX8 + +# The following extensions have some differences requiring us to +# manually rename some symbols and leave others alone for best +# correctness +# RenameExtensionIntoCore GL_ARB_matrix_palette +# We do not want to pull in all of this extension into the core namespace +# RenameExtensionIntoCore GL_ARB_vertex_blend + +RenameJavaSymbol GL_MAX_VERTEX_UNITS_ARB GL_MAX_VERTEX_UNITS +RenameJavaSymbol GL_MAX_PALETTE_MATRICES_ARB GL_MAX_PALETTE_MATRICES +RenameJavaSymbol GL_MATRIX_PALETTE_ARB GL_MATRIX_PALETTE +RenameJavaSymbol GL_MATRIX_INDEX_ARRAY_ARB GL_MATRIX_INDEX_ARRAY +RenameJavaSymbol GL_WEIGHT_ARRAY_ARB GL_WEIGHT_ARRAY +RenameJavaSymbol GL_CURRENT_PALETTE_MATRIX_ARB GL_CURRENT_PALETTE_MATRIX +RenameJavaSymbol GL_MATRIX_INDEX_ARRAY_SIZE_ARB GL_MATRIX_INDEX_ARRAY_SIZE +RenameJavaSymbol GL_MATRIX_INDEX_ARRAY_TYPE_ARB GL_MATRIX_INDEX_ARRAY_TYPE +RenameJavaSymbol GL_MATRIX_INDEX_ARRAY_STRIDE_ARB GL_MATRIX_INDEX_ARRAY_STRIDE +RenameJavaSymbol GL_MATRIX_INDEX_ARRAY_POINTER_ARB GL_MATRIX_INDEX_ARRAY_POINTER +RenameJavaSymbol GL_WEIGHT_ARRAY_SIZE_ARB GL_WEIGHT_ARRAY_SIZE +RenameJavaSymbol GL_WEIGHT_ARRAY_TYPE_ARB GL_WEIGHT_ARRAY_TYPE +RenameJavaSymbol GL_WEIGHT_ARRAY_STRIDE_ARB GL_WEIGHT_ARRAY_STRIDE +RenameJavaSymbol GL_WEIGHT_ARRAY_POINTER_ARB GL_WEIGHT_ARRAY_POINTER +RenameJavaSymbol glCurrentPaletteMatrixARB glCurrentPaletteMatrix +RenameJavaSymbol glMatrixIndexPointerARB glMatrixIndexPointer +RenameJavaSymbol glWeightPointerARB glWeightPointer + +# There are some definitions in this extension that don't exist in desktop OpenGL, +# so we shouldn't remove the suffixes of those OES-only variants +# RenameExtensionIntoCore GL_OES_matrix_palette +RenameJavaSymbol GL_MAX_VERTEX_UNITS_OES GL_MAX_VERTEX_UNITS +RenameJavaSymbol GL_MAX_PALETTE_MATRICES_OES GL_MAX_PALETTE_MATRICES +RenameJavaSymbol GL_MATRIX_PALETTE_OES GL_MATRIX_PALETTE +RenameJavaSymbol GL_MATRIX_INDEX_ARRAY_OES GL_MATRIX_INDEX_ARRAY +RenameJavaSymbol GL_WEIGHT_ARRAY_OES GL_WEIGHT_ARRAY +RenameJavaSymbol GL_CURRENT_PALETTE_MATRIX_OES GL_CURRENT_PALETTE_MATRIX +RenameJavaSymbol GL_MATRIX_INDEX_ARRAY_SIZE_OES GL_MATRIX_INDEX_ARRAY_SIZE +RenameJavaSymbol GL_MATRIX_INDEX_ARRAY_TYPE_OES GL_MATRIX_INDEX_ARRAY_TYPE +RenameJavaSymbol GL_MATRIX_INDEX_ARRAY_STRIDE_OES GL_MATRIX_INDEX_ARRAY_STRIDE +RenameJavaSymbol GL_MATRIX_INDEX_ARRAY_POINTER_OES GL_MATRIX_INDEX_ARRAY_POINTER +RenameJavaSymbol GL_WEIGHT_ARRAY_SIZE_OES GL_WEIGHT_ARRAY_SIZE +RenameJavaSymbol GL_WEIGHT_ARRAY_TYPE_OES GL_WEIGHT_ARRAY_TYPE +RenameJavaSymbol GL_WEIGHT_ARRAY_STRIDE_OES GL_WEIGHT_ARRAY_STRIDE +RenameJavaSymbol GL_WEIGHT_ARRAY_POINTER_OES GL_WEIGHT_ARRAY_POINTER +RenameJavaSymbol GL_WEIGHT_ARRAY_BUFFER_BINDING_OES GL_WEIGHT_ARRAY_BUFFER_BINDING +RenameJavaSymbol glCurrentPaletteMatrixOES glCurrentPaletteMatrix +RenameJavaSymbol glMatrixIndexPointerOES glMatrixIndexPointer +RenameJavaSymbol glWeightPointerOES glWeightPointer + + diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg index 1ee882e40..8c3061773 100644 --- a/make/config/jogl/gl-common.cfg +++ b/make/config/jogl/gl-common.cfg @@ -27,10 +27,12 @@ Ignore glGetBufferPointerv # Ignore GL functions that deal with explicit pointer values in such a # way that we cannot implement the functionality in Java Ignore glGetBufferPointerv +Ignore glGetBufferPointervARB Ignore glGetPointerv Ignore glGetPointervEXT Ignore glGetTexParameterPointervAPPLE Ignore glGetVertexAttribPointerv +Ignore glGetVertexAttribPointervARB Ignore glGetVertexAttribPointervNV Ignore glTracePointerRangeMESA @@ -55,6 +57,7 @@ Ignore glGetVariantPointervEXT Ignore (GL|GLU|GLX|WGL|AGL|CGL)_EXT_.+ Ignore (GL|GLU|GLX|WGL|AGL|CGL)_ARB_.+ +Ignore (GL|GLU|GLX|WGL|AGL|CGL)_OES_.+ Ignore (GL|GLU|GLX|WGL|AGL|CGL)_PGI_.+ Ignore (GL|GLU|GLX|WGL|AGL|CGL)_SGI_.+ Ignore (GL|GLU|GLX|WGL|AGL|CGL)_SGIS_.+ @@ -149,7 +152,9 @@ IgnoreExtension GL_EXT_convolution IgnoreExtension GL_EXT_draw_range_elements IgnoreExtension GL_EXT_histogram IgnoreExtension GL_EXT_packed_pixels -# FIXME: is GL_EXT_paletted_texture also obsolete? +# NOTE: also ignoring GL_EXT_paletted_texture because it appears that it was subsumed +# into the core even though that isn't stated explicitly in the spec +IgnoreExtension GL_EXT_paletted_texture IgnoreExtension GL_EXT_rescale_normal IgnoreExtension GL_EXT_separate_specular_color IgnoreExtension GL_EXT_texture3D @@ -175,6 +180,50 @@ IgnoreExtension GL_EXT_texture_env_combine IgnoreExtension GL_EXT_texture_env_dot3 IgnoreExtension GL_SGIS_texture_border_clamp +# 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_ARB_shadow +IgnoreExtension GL_ARB_texture_env_crossbar +IgnoreExtension GL_ARB_texture_mirrored_repeat +IgnoreExtension GL_ARB_window_pos +IgnoreExtension GL_EXT_blend_func_separate +IgnoreExtension GL_EXT_fog_coord +IgnoreExtension GL_EXT_texture_lod_bias +IgnoreExtension GL_EXT_multi_draw_arrays +IgnoreExtension GL_EXT_secondary_color +IgnoreExtension GL_EXT_stencil_wrap +IgnoreExtension GL_NV_blend_square +IgnoreExtension GL_SGIS_generate_mipmap + +# Ignore extensions subsumed in OpenGL 1.5 (from OpenGL 1.5 spec, Appendix H) +IgnoreExtension GL_ARB_occlusion_query +IgnoreExtension GL_ARB_vertex_buffer_object +IgnoreExtension GL_EXT_shadow_funcs + +# 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) +IgnoreExtension GL_ARB_vertex_shader +IgnoreExtension GL_ARB_fragment_shader +IgnoreExtension GL_ARB_draw_buffers +IgnoreExtension GL_ARB_texture_non_power_of_two +IgnoreExtension GL_ARB_point_sprite +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 + +# 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 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_texture_rectangle + # # Opaques and other directives for platform-independent routines # diff --git a/make/config/jogl/gl-es1.cfg b/make/config/jogl/gl-es1.cfg index a840aedb5..0bc4dc916 100755 --- a/make/config/jogl/gl-es1.cfg +++ b/make/config/jogl/gl-es1.cfg @@ -40,6 +40,8 @@ GetProcAddressTableExpr ((GLES1ProcAddressTable)_context.getGLProcAddressTable() # and functions and the extensions in which they are defined GLHeader GLES/gl.h GLHeader GLES/glext.h +GLHeader GL/gl.h +GLHeader GL/glext.h # 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 @@ -53,6 +55,11 @@ LocalProcAddressCallingConvention __ALL__ GL_APIENTRY # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums TagNativeBinding true +# Ignore certain extensions that will be picked up by the dynamic +# lookup mechanism anyway if they are present +IgnoreExtension GL_OES_fixed_point +IgnoreExtension GL_OES_single_precision + CustomJavaCode GLES1Impl public void glOrtho(double left, double right, double bottom, double top, double near_val, double far_val) { CustomJavaCode GLES1Impl glOrtho((float) left, (float) right, (float) bottom, (float) top, (float) near_val, (float) far_val); } diff --git a/make/config/jogl/gl-es2.cfg b/make/config/jogl/gl-es2.cfg index af0867a6f..bd467776e 100755 --- a/make/config/jogl/gl-es2.cfg +++ b/make/config/jogl/gl-es2.cfg @@ -29,6 +29,8 @@ GetProcAddressTableExpr ((GLES2ProcAddressTable)_context.getGLProcAddressTable() # and functions and the extensions in which they are defined GLHeader GLES2/gl2.h GLHeader GLES2/gl2ext.h +GLHeader GL/gl.h +GLHeader GL/glext.h # 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 diff --git a/make/config/jogl/gl-gl2.cfg b/make/config/jogl/gl-gl2.cfg index f0aafd932..c98f81571 100644 --- a/make/config/jogl/gl-gl2.cfg +++ b/make/config/jogl/gl-gl2.cfg @@ -45,6 +45,9 @@ Ignore GL_STENCIL_INDEX16_EXT # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums TagNativeBinding true +# Ignore extensions that are already picked up via the GL2ES1 interface +IgnoreExtension GL_EXT_point_parameters + CustomJavaCode GL2 public static final int GL_STENCIL_INDEX16 = 0x8D49; CustomJavaCode GL2 public static final int GL_RGBA_FLOAT32_APPLE = 0x8814; CustomJavaCode GL2 public static final int GL_RGBA_FLOAT16_APPLE = 0x881A; diff --git a/make/config/jogl/gl-if-gl.cfg b/make/config/jogl/gl-if-gl.cfg index acbf0f976..46e11fdd4 100755 --- a/make/config/jogl/gl-if-gl.cfg +++ b/make/config/jogl/gl-if-gl.cfg @@ -31,6 +31,8 @@ GetProcAddressTableExpr DontGenerateProcAddressTableStuff # and functions and the extensions in which they are defined GLHeader GLES2/gl2.h GLHeader GLES2/gl2ext.h +GLHeader GL/gl.h +GLHeader GL/glext.h # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums TagNativeBinding true diff --git a/make/config/jogl/gl-if-gl2_es1.cfg b/make/config/jogl/gl-if-gl2_es1.cfg index ecd9bc525..d09ebcb30 100755 --- a/make/config/jogl/gl-if-gl2_es1.cfg +++ b/make/config/jogl/gl-if-gl2_es1.cfg @@ -21,18 +21,20 @@ Include gl-common-extensions.cfg JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl -# Ignore all ES 1.X only stuff to GL2 -Ignore glPointSizePointer +# Ignore all ES 1.X only stuff not in GL2 +IgnoreExtension GL_OES_compressed_ETC1_RGB8_texture +IgnoreExtension GL_OES_draw_texture +IgnoreExtension GL_OES_fixed_point +IgnoreExtension GL_OES_matrix_get +IgnoreExtension GL_OES_point_size_array +IgnoreExtension GL_OES_query_matrix +IgnoreExtension GL_OES_vertex_half_float Ignore glGetFixedv -Ignore ^glDrawTex.* -#heavy float/double array diff to GL2 -Ignore glClipPlanef -Ignore ^glGetClipPlanef(OES)? +# Ignore OES variants of single precision floating point routines +IgnoreExtension GL_OES_single_precision -#impl diff -Ignore ^glEGL.* -Ignore ^gl.*(xv)(OES)? +# Ignore fixed point versions of routines in ES 1.x core Ignore glAlphaFuncx Ignore glClearColorx Ignore glClearDepthx @@ -62,7 +64,17 @@ Ignore glTexEnvx Ignore glTexGenx Ignore glTexParameterx Ignore glTranslatex -Ignore glLoadPaletteFromModelViewMatrix + +#heavy float/double array diff to GL2 +Ignore glClipPlanef +Ignore ^glGetClipPlanef(OES)? + +#impl diff +Ignore ^glEGL.* +Ignore ^gl.*(xv)(OES)? +Ignore glTexGenxOES +Ignore GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES +Ignore glLoadPaletteFromModelViewMatrixOES Ignore glGetFixedv CustomJavaCode GL2ES1 public void glOrtho(double left, double right, double bottom, double top, double near_val, double far_val); @@ -76,6 +88,8 @@ GetProcAddressTableExpr DontGenerateProcAddressTableStuff # and functions and the extensions in which they are defined GLHeader GLES/gl.h GLHeader GLES/glext.h +GLHeader GL/gl.h +GLHeader GL/glext.h # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums TagNativeBinding true diff --git a/make/config/jogl/gl-if-gl2_es2.cfg b/make/config/jogl/gl-if-gl2_es2.cfg index 716351c3f..832c32ee5 100755 --- a/make/config/jogl/gl-if-gl2_es2.cfg +++ b/make/config/jogl/gl-if-gl2_es2.cfg @@ -33,6 +33,8 @@ GetProcAddressTableExpr DontGenerateProcAddressTableStuff # and functions and the extensions in which they are defined GLHeader GLES2/gl2.h GLHeader GLES2/gl2ext.h +GLHeader GL/gl.h +GLHeader GL/glext.h # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums TagNativeBinding true diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java index 3af0864cd..a7c42a81d 100755 --- a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java +++ b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java @@ -276,7 +276,7 @@ private Map/**/ arbVBOCache = new HashMap(); /** Entry point to C language function:
LPVOID glMapBuffer(GLenum target, GLenum access); */ public java.nio.ByteBuffer glMapBuffer(int target, int access) { - final long __addr_ = ((GLES1ProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBuffer; + final long __addr_ = ((GLES1ProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBufferOES; if (__addr_ == 0) { throw new GLException("Method \"glMapBuffer\" not available"); } diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles2.java b/make/config/jogl/gl-impl-CustomJavaCode-gles2.java index bf94eed43..e1adf3b7c 100755 --- a/make/config/jogl/gl-impl-CustomJavaCode-gles2.java +++ b/make/config/jogl/gl-impl-CustomJavaCode-gles2.java @@ -286,7 +286,7 @@ private Map/**/ arbVBOCache = new HashMap(); /** Entry point to C language function:
LPVOID glMapBuffer(GLenum target, GLenum access); */ public java.nio.ByteBuffer glMapBuffer(int target, int access) { - final long __addr_ = ((GLES2ProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBuffer; + final long __addr_ = ((GLES2ProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBufferOES; if (__addr_ == 0) { throw new GLException("Method \"glMapBuffer\" not available"); } -- cgit v1.2.3