From 2db11ad80582af8715071b47b5331b79001d511c Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 30 Aug 2015 04:55:12 +0200 Subject: Bug 1207 - GLDebugMessageHandler: Support GL_KHR_debug for Desktop and ES profile GL_KHR_debug GL_KHR_debug shall be favorized before - GL_ARB_debug_output - GL_AMD_debug_output Allow GL_KHR_debug for GL2GL3 and GL2ES2 profiles, i.e. including ES profiles: GLES2, GLES3. GL_ARB_debug_output and GL_AMD_debug_output are only allowed for desktop GL2GL3 profiles. --- make/config/jogl/gl-es1.cfg | 3 +++ make/config/jogl/gl-es3-impl.cfg | 3 +++ make/config/jogl/gl-gl4bc.cfg | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'make/config/jogl') diff --git a/make/config/jogl/gl-es1.cfg b/make/config/jogl/gl-es1.cfg index 6ce59770e..f72ad54ea 100644 --- a/make/config/jogl/gl-es1.cfg +++ b/make/config/jogl/gl-es1.cfg @@ -39,6 +39,9 @@ ProcAddressTableClassName GLES1ProcAddressTable GetProcAddressTableExpr _pat # GetProcAddressTableExpr ((GLES1ProcAddressTable)_context.getGLProcAddressTable()) +# Manual implement glDebugMessageCallback* using the proc address resolver +ForceProcAddressGen glDebugMessageCallbackKHR + # 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 # depend on the presence of an import library for a particular device diff --git a/make/config/jogl/gl-es3-impl.cfg b/make/config/jogl/gl-es3-impl.cfg index 01ef034f6..c6b9b45f1 100644 --- a/make/config/jogl/gl-es3-impl.cfg +++ b/make/config/jogl/gl-es3-impl.cfg @@ -44,6 +44,9 @@ ProcAddressTableClassName GLES3ProcAddressTable GetProcAddressTableExpr _pat # GetProcAddressTableExpr ((GLES3ProcAddressTable)_context.getGLProcAddressTable()) +# Manual implement glDebugMessageCallback* using the proc address resolver +ForceProcAddressGen glDebugMessageCallbackKHR + # 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 # depend on the presence of an import library for a particular device diff --git a/make/config/jogl/gl-gl4bc.cfg b/make/config/jogl/gl-gl4bc.cfg index e3e706688..60cc0fc48 100644 --- a/make/config/jogl/gl-gl4bc.cfg +++ b/make/config/jogl/gl-gl4bc.cfg @@ -180,7 +180,7 @@ MethodJavadoc glMapNamedBufferRangeEXT *

DelegateImplementation glUnmapNamedBuffer glUnmapNamedBufferDelegate DelegateImplementation glUnmapNamedEXTBuffer glUnmapNamedEXTBufferDelegate -# Manuall implement glDebugMessageCallback* using the proc address resolver +# Manual implement glDebugMessageCallback* using the proc address resolver ForceProcAddressGen glDebugMessageCallback ForceProcAddressGen glDebugMessageCallbackAMD -- cgit v1.2.3