From 24d5fa1241e17f596ae93dff1656a9317daf6fb3 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 30 Oct 2012 17:32:02 +0100 Subject: WGL/WGLExt Robustness: Use NIODirectOnly for all bindings. For these internal APIs, critical array is not required, hence redundant. --- make/config/jogl/wgl-win32.cfg | 6 +++++- make/config/jogl/wglext.cfg | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'make/config/jogl') diff --git a/make/config/jogl/wgl-win32.cfg b/make/config/jogl/wgl-win32.cfg index 4d2fea5d0..d9dbb13e6 100644 --- a/make/config/jogl/wgl-win32.cfg +++ b/make/config/jogl/wgl-win32.cfg @@ -18,6 +18,10 @@ GLHeader GL/wglext.h ForceProcAddressGen __ALL__ LocalProcAddressCallingConvention __ALL__ APIENTRY +# Only NIO direct function, no arrays .. +NIOOnly __ALL__ +NIODirectOnly __ALL__ + AllowNonGLExtensions true EmitProcAddressTable true ProcAddressTableClassName WGLProcAddressTable @@ -63,6 +67,6 @@ CustomJavaCode WGL { CustomJavaCode WGL if (wglGetProcAddressHandle == 0) { CustomJavaCode WGL throw new GLException("Passed null pointer for method \"wglGetProcAddress\""); CustomJavaCode WGL } -CustomJavaCode WGL return dispatch_wglGetProcAddress1(procname, wglGetProcAddressHandle); +CustomJavaCode WGL return dispatch_wglGetProcAddress0(procname, wglGetProcAddressHandle); CustomJavaCode WGL } diff --git a/make/config/jogl/wglext.cfg b/make/config/jogl/wglext.cfg index 15986b6cf..57707d6cb 100644 --- a/make/config/jogl/wglext.cfg +++ b/make/config/jogl/wglext.cfg @@ -13,6 +13,10 @@ Include gl-desktop.cfg AllowNonGLExtensions true +# Only NIO direct function, no arrays .. +NIOOnly __ALL__ +NIODirectOnly __ALL__ + GLHeader wingdi.h GLHeader GL/wglext.h -- cgit v1.2.3