From bbb15062affc572b1deaefcf539082845f1427f2 Mon Sep 17 00:00:00 2001 From: Julien Gouesse Date: Fri, 28 Aug 2015 19:12:56 +0200 Subject: [PATCH] Adds the support of DebugGL for OpenGL ES 3 into the JOGL backend --- .../java/com/jme3/system/jogl/JoglAbstractDisplay.java | 7 ++++++- .../java/com/jme3/system/jogl/JoglNewtAbstractDisplay.java | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglAbstractDisplay.java b/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglAbstractDisplay.java index f90e812db..2248e4b22 100644 --- a/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglAbstractDisplay.java +++ b/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglAbstractDisplay.java @@ -41,10 +41,12 @@ import com.jme3.renderer.jogl.JoglRenderer; import com.jogamp.opengl.util.Animator; import com.jogamp.opengl.util.AnimatorBase; import com.jogamp.opengl.util.FPSAnimator; + import java.awt.GraphicsDevice; import java.awt.GraphicsEnvironment; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Logger; + import com.jogamp.opengl.DebugGL2; import com.jogamp.opengl.DebugGL3; import com.jogamp.opengl.DebugGL3bc; @@ -52,6 +54,7 @@ import com.jogamp.opengl.DebugGL4; import com.jogamp.opengl.DebugGL4bc; import com.jogamp.opengl.DebugGLES1; import com.jogamp.opengl.DebugGLES2; +import com.jogamp.opengl.DebugGLES3; import com.jogamp.opengl.GL; import com.jogamp.opengl.GLAutoDrawable; import com.jogamp.opengl.GLCapabilities; @@ -136,7 +139,9 @@ public abstract class JoglAbstractDisplay extends JoglContext implements GLEvent if (gl.isGLES2()) { glad.setGL(new DebugGLES2(gl.getGLES2())); } else { - // TODO ES3 + if (gl.isGLES3()) { + glad.setGL(new DebugGLES3(gl.getGLES3())); + } } } } else { diff --git a/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglNewtAbstractDisplay.java b/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglNewtAbstractDisplay.java index 5239db8e8..f05c92b95 100644 --- a/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglNewtAbstractDisplay.java +++ b/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglNewtAbstractDisplay.java @@ -42,8 +42,10 @@ import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.util.Animator; import com.jogamp.opengl.util.AnimatorBase; import com.jogamp.opengl.util.FPSAnimator; + import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Logger; + import com.jogamp.opengl.DebugGL2; import com.jogamp.opengl.DebugGL3; import com.jogamp.opengl.DebugGL3bc; @@ -51,6 +53,7 @@ import com.jogamp.opengl.DebugGL4; import com.jogamp.opengl.DebugGL4bc; import com.jogamp.opengl.DebugGLES1; import com.jogamp.opengl.DebugGLES2; +import com.jogamp.opengl.DebugGLES3; import com.jogamp.opengl.GL; import com.jogamp.opengl.GLAutoDrawable; import com.jogamp.opengl.GLCapabilities; @@ -115,7 +118,9 @@ public abstract class JoglNewtAbstractDisplay extends JoglContext implements GLE if (gl.isGLES2()) { glad.setGL(new DebugGLES2(gl.getGLES2())); } else { - // TODO ES3 + if (gl.isGLES3()) { + glad.setGL(new DebugGLES3(gl.getGLES3())); + } } } } else {