Bug 1207 - GLDebugMessageHandler: Support GL_KHR_debug for Desktop and ES profile

GL_KHR_debug <https://www.opengl.org/registry/specs/KHR/debug.txt>

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.

4 files changed, 10 insertions, 3 deletions

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 * </p>
 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
 
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 740f3c483..3242bfff1 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -181,6 +181,7 @@ function jrun() {
     #D_ARGS="-Djogl.debug.GLEventListenerState"
     #D_ARGS="-Djogl.debug.GLDebugMessageHandler"
     #D_ARGS="-Djogl.debug.GLDebugMessageHandler -Djogl.debug.DebugGL"
+    #D_ARGS="-Djogl.debug.GLDebugMessageHandler -Djogl.debug.DebugGL -Djogl.debug.GLContext"
     #D_ARGS="-Djogl.debug.GLDebugMessageHandler -Djogl.debug.TraceGL -Djogl.debug.DebugGL -Djogl.debug.GLSLCode -Djogl.debug.GLSLState"
     #D_ARGS="-Djogl.debug.GLDebugMessageHandler -Djogl.debug.DebugGL -Djogl.debug.TraceGL"
     #D_ARGS="-Djogl.1thread=false -Djogl.debug.Threading"
@@ -513,7 +514,7 @@ function testawtswt() {
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestInitConcurrent02NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLContextSurfaceLockNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLDebug00NEWT $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLDebug01NEWT $*
+testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLDebug01NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLException01NEWT $*
 
@@ -570,7 +571,7 @@ function testawtswt() {
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableFactoryGL2OffscrnCapsNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableFactoryGLnBitmapCapsNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableFactoryES2OffscrnCapsNEWT $*
-testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableFactoryGLProfileDeviceNEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableFactoryGLProfileDeviceNEWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableGLCanvasOnOffscrnCapsAWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableGLWindowOnOffscrnCapsNEWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableNewtCanvasAWTOnOffscrnCapsAWT $*