From 99f14475993d127f1b927056b309477753563a02 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 11 Mar 2015 20:42:09 +0100 Subject: Resolve RenameJavaSymbol issues (GLUgl2 and CGL) using GLEmitter (-> DelegateImplementation) due to new GlueGen Semantics 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. --- make/config/jogl/cgl-macosx.cfg | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'make/config/jogl/cgl-macosx.cfg') 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 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 -- cgit v1.2.3