diff options
| author | Sven Gothel <[email protected]> | 2015-03-11 20:42:09 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-11 20:42:09 +0100 |
| commit | 99f14475993d127f1b927056b309477753563a02 (patch) | |
| tree | bf9ca7c45e6735d8ffefadb7698a3b2d7e80ebd6 /make/config | |
| parent | a622ffbced14e1e2fe797c82fc62c431ffb6949f (diff) | |
Resolve RenameJavaSymbol issues (GLUgl2 and CGL) using GLEmitter (-> DelegateImplementation) due to new GlueGen Semanticsv2.3.0
GlueGen would usually use the original native C method name
for proc-address or direct call.
GLEmitter however uses the renamed method name,
assuming it is shorter and resulted from a 'RenameExtensionIntoCore' directive.
GLUgl2 native usage was broken since 2.2.4
GLUgl2 and CGL use RenameJavaSymbol w/ the intention of delegation,
hence resolve the issue using the new DelegateImplementation directive
which preserves the original function name for the native call.
Diffstat (limited to 'make/config')
| -rw-r--r-- | make/config/jogl/cgl-macosx.cfg | 9 | ||||
| -rw-r--r-- | make/config/jogl/glu-gl2.cfg | 14 |
2 files changed, 10 insertions, 13 deletions
diff --git a/make/config/jogl/cgl-macosx.cfg b/make/config/jogl/cgl-macosx.cfg index 6ca0787b5..df39bdaab 100644 --- a/make/config/jogl/cgl-macosx.cfg +++ b/make/config/jogl/cgl-macosx.cfg @@ -37,12 +37,9 @@ Opaque long NSOpenGLLayer * CustomCCode #include <machine/types.h> CustomCCode #include "macosx-window-system.h" -AccessControl createNSOpenGLLayerImpl PRIVATE -AccessControl setNSOpenGLLayerEnabledImpl PRIVATE -AccessControl releaseNSOpenGLLayerImpl PRIVATE -RenameJavaSymbol createNSOpenGLLayer createNSOpenGLLayerImpl -RenameJavaSymbol setNSOpenGLLayerEnabled setNSOpenGLLayerEnabledImpl -RenameJavaSymbol releaseNSOpenGLLayer releaseNSOpenGLLayerImpl +DelegateImplementation createNSOpenGLLayer createNSOpenGLLayerImpl +DelegateImplementation setNSOpenGLLayerEnabled setNSOpenGLLayerEnabledImpl +DelegateImplementation releaseNSOpenGLLayer releaseNSOpenGLLayerImpl IncludeAs CustomJavaCode CGL cgl-macosx-CustomJavaCode.java diff --git a/make/config/jogl/glu-gl2.cfg b/make/config/jogl/glu-gl2.cfg index dea7992f7..54b9a15ad 100644 --- a/make/config/jogl/glu-gl2.cfg +++ b/make/config/jogl/glu-gl2.cfg @@ -69,12 +69,12 @@ AccessControl gluScaleImage PRIVATE # Rename these methods in the implementing class -RenameJavaSymbol gluBuild1DMipmapLevels gluBuild1DMipmapLevelsC -RenameJavaSymbol gluBuild1DMipmaps gluBuild1DMipmapsC -RenameJavaSymbol gluBuild2DMipmapLevels gluBuild2DMipmapLevelsC -RenameJavaSymbol gluBuild2DMipmaps gluBuild2DMipmapsC -RenameJavaSymbol gluBuild3DMipmapLevels gluBuild3DMipmapLevelsC -RenameJavaSymbol gluBuild3DMipmaps gluBuild3DMipmapsC -RenameJavaSymbol gluScaleImage gluScaleImageC +DelegateImplementation gluBuild1DMipmapLevels gluBuild1DMipmapLevelsC +DelegateImplementation gluBuild1DMipmaps gluBuild1DMipmapsC +DelegateImplementation gluBuild2DMipmapLevels gluBuild2DMipmapLevelsC +DelegateImplementation gluBuild2DMipmaps gluBuild2DMipmapsC +DelegateImplementation gluBuild3DMipmapLevels gluBuild3DMipmapLevelsC +DelegateImplementation gluBuild3DMipmaps gluBuild3DMipmapsC +DelegateImplementation gluScaleImage gluScaleImageC Include glu-common.cfg |