Revert "Reapply "Implement GPU timer query support across multiple platforms and handle unsupported cases""

This reverts commit 4bf14ab.

Author: riccardobl

jme3-android/src/main/java/com/jme3/renderer/android/AndroidGL.java

@@ -100,9 +100,6 @@ public void glAttachShader(int program, int shader) {
 
     @Override
     public void glBeginQuery(int target, int query) {
-        if (target == GL.GL_TIME_ELAPSED) {
-            throw new UnsupportedOperationException("64-bit GPU timer queries are not exposed by the Android GLES bindings");
-        }
         GLES30.glBeginQuery(target, query);
     }
 
@@ -290,9 +287,6 @@ public void glEnableVertexAttribArray(int index) {
 
     @Override
     public void glEndQuery(int target) {
-        if (target == GL.GL_TIME_ELAPSED) {
-            throw new UnsupportedOperationException("64-bit GPU timer queries are not exposed by the Android GLES bindings");
-        }
         GLES30.glEndQuery(target);
     }
 
@@ -354,7 +348,10 @@ public String glGetProgramInfoLog(int program, int maxLength) {
 
     @Override
     public long glGetQueryObjectui64(int query, int pname) {
-        throw new UnsupportedOperationException("64-bit query results are not exposed by the Android GLES bindings");
+        IntBuffer buff = (IntBuffer)tmpBuff.clear();
+        //FIXME This is wrong IMO should be glGetQueryObjectui64v with a LongBuffer but it seems the API doesn't provide it.
+        GLES30.glGetQueryObjectuiv(query, pname, buff);
+        return buff.get(0);
     }
 
     @Override

jme3-core/src/main/java/com/jme3/app/DetailedProfiler.java

@@ -32,7 +32,6 @@
 package com.jme3.app;
 
 import com.jme3.profile.*;
-import com.jme3.renderer.Caps;
 import com.jme3.renderer.Renderer;
 import com.jme3.renderer.ViewPort;
 import com.jme3.renderer.queue.RenderQueue;
@@ -87,16 +86,14 @@ public void appStep(AppStep step) {
             frameTime.setNewFrameValueCpu(System.nanoTime());
 
             frameEnded = false;
-            if (renderer != null) {
-                for (StatLine statLine : data.values()) {
-                    for (Iterator<Integer> i = statLine.taskIds.iterator(); i.hasNext(); ) {
-                        int id = i.next();
-                        if (renderer.isTaskResultAvailable(id)) {
-                            long val = renderer.getProfilingTime(id);
-                            statLine.setValueGpu(val);
-                            i.remove();
-                            idsPool.push(id);
-                        }
+            for (StatLine statLine : data.values()) {
+                for (Iterator<Integer> i = statLine.taskIds.iterator(); i.hasNext(); ) {
+                    int id = i.next();
+                    if (renderer.isTaskResultAvailable(id)) {
+                        long val = renderer.getProfilingTime(id);
+                        statLine.setValueGpu(val);
+                        i.remove();
+                        idsPool.push(id);
                     }
                 }
             }
@@ -225,8 +222,8 @@ private void addStep(String path, long value) {
             int id = getUnusedTaskId();
             line.taskIds.add(id);
             renderer.startProfiling(id);
-            ongoingGpuProfiling = true;
         }
+        ongoingGpuProfiling = true;
         prevPath = path;
 
     }
@@ -242,13 +239,8 @@ private String getPath(String step, String... subPath) {
     }
 
     public void setRenderer(Renderer renderer) {
-        idsPool.clear();
-        if (renderer != null && renderer.getCaps().contains(Caps.GpuTimerQuery)) {
-            this.renderer = renderer;
-            poolTaskIds(renderer);
-        } else {
-            this.renderer = null;
-        }
+        this.renderer = renderer;
+        poolTaskIds(renderer);
     }
 
     private void poolTaskIds(Renderer renderer) {

jme3-core/src/main/java/com/jme3/renderer/Caps.java

@@ -467,12 +467,6 @@ public enum Caps {
      * GPU support for binary shaders.
      */
     BinaryShader,
-
-    /**
-     * Supports GPU timer queries with full 64-bit elapsed-time results.
-     */
-    GpuTimerQuery,
-
     /**
      * Supporting working with UniformBufferObject.
      */

jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java

@@ -247,18 +247,6 @@ private boolean hasAnyExtension(String... extensionNames) {
         return false;
     }
 
-    private boolean hasGpuTimerQuerySupport() {
-        if (caps.contains(Caps.OpenGL33) || hasExtension("GL_ARB_timer_query")) {
-            return true;
-        }
-
-        Platform.Os os = JmeSystem.getPlatform().getOs();
-        boolean glesBindingSupports64BitTimerQuery = os != Platform.Os.Android && os != Platform.Os.iOS;
-        return caps.contains(Caps.OpenGLES20)
-                && hasExtension("GL_EXT_disjoint_timer_query")
-                && glesBindingSupports64BitTimerQuery;
-    }
-
     private void loadCapabilitiesES() {
         String version = gl.glGetString(GL.GL_VERSION);
         int oglVer = extractVersion(version);
@@ -693,10 +681,6 @@ && hasExtension("GL_ARB_half_float_pixel"))
             }
         }
 
-        if (hasGpuTimerQuerySupport()) {
-            caps.add(Caps.GpuTimerQuery);
-        }
-
         if (hasExtension("GL_OES_geometry_shader") || hasExtension("GL_EXT_geometry_shader")) {
             caps.add(Caps.GeometryShader);
         }
@@ -3844,43 +3828,28 @@ public void setLinearizeSrgbImages(boolean linearize) {
 
     @Override
     public int[] generateProfilingTasks(int numTasks) {
-        if (!caps.contains(Caps.GpuTimerQuery)) {
-            throw new RendererException("GPU timer queries are not supported by the current renderer");
-        }
         IntBuffer ids = BufferUtils.createIntBuffer(numTasks);
         gl.glGenQueries(numTasks, ids);
         return BufferUtils.getIntArray(ids);
     }
 
     @Override
     public void startProfiling(int taskId) {
-        if (!caps.contains(Caps.GpuTimerQuery)) {
-            throw new RendererException("GPU timer queries are not supported by the current renderer");
-        }
         gl.glBeginQuery(GL.GL_TIME_ELAPSED, taskId);
     }
 
     @Override
     public void stopProfiling() {
-        if (!caps.contains(Caps.GpuTimerQuery)) {
-            throw new RendererException("GPU timer queries are not supported by the current renderer");
-        }
         gl.glEndQuery(GL.GL_TIME_ELAPSED);
     }
 
     @Override
     public long getProfilingTime(int taskId) {
-        if (!caps.contains(Caps.GpuTimerQuery)) {
-            throw new RendererException("GPU timer queries are not supported by the current renderer");
-        }
         return gl.glGetQueryObjectui64(taskId, GL.GL_QUERY_RESULT);
     }
 
     @Override
     public boolean isTaskResultAvailable(int taskId) {
-        if (!caps.contains(Caps.GpuTimerQuery)) {
-            throw new RendererException("GPU timer queries are not supported by the current renderer");
-        }
         return gl.glGetQueryObjectiv(taskId, GL.GL_QUERY_RESULT_AVAILABLE) == 1;
     }
 

jme3-ios/src/main/java/com/jme3/renderer/ios/IosGL.java

@@ -59,7 +59,7 @@ public class IosGL implements GL, GL2, GLES_30, GLExt, GLFbo {
     @Override
     public void resetStats() {
     }
-
+    
     private static int getLimitBytes(ByteBuffer buffer) {
         checkLimit(buffer);
         return buffer.limit();
@@ -143,9 +143,6 @@ public void glAttachShader(int program, int shader) {
 
     @Override
     public void glBeginQuery(int target, int query) {
-        if (target == GL.GL_TIME_ELAPSED) {
-            throw new UnsupportedOperationException("64-bit GPU timer queries are not implemented by the iOS GLES binding");
-        }
         JmeIosGLES.glBeginQuery(target, query);
     }
 
@@ -336,9 +333,6 @@ public void glEnableVertexAttribArray(int index) {
 
     @Override
     public void glEndQuery(int target) {
-        if (target == GL.GL_TIME_ELAPSED) {
-            throw new UnsupportedOperationException("64-bit GPU timer queries are not implemented by the iOS GLES binding");
-        }
         JmeIosGLES.glEndQuery(target);
     }
 
@@ -404,7 +398,8 @@ public String glGetProgramInfoLog(int program, int maxLength) {
 
     @Override
     public long glGetQueryObjectui64(int query, int pname) {
-        throw new UnsupportedOperationException("64-bit query results are not implemented by the iOS GLES binding");
+        JmeIosGLES.glGetQueryObjectuiv(query, pname, temp_array);
+        return temp_array[0];
     }
 
     @Override

jme3-lwjgl3/src/main/java/com/jme3/renderer/lwjgl/LwjglGLES.java

@@ -14,11 +14,9 @@
 import java.nio.IntBuffer;
 import java.nio.ShortBuffer;
 
-import org.lwjgl.opengles.GLES;
 import org.lwjgl.opengles.GLES20;
 import org.lwjgl.opengles.GLES30;
 import org.lwjgl.opengles.GLES31;
-import org.lwjgl.opengles.EXTDisjointTimerQuery;
 
 
 /**
@@ -35,6 +33,7 @@ public class LwjglGLES extends LwjglRender implements GL, GL2, GLES_30, GLExt, G
     public void resetStats() {
     }
 
+
     public static void checkLimit(Buffer buffer) {
         if (buffer == null) return;
         if (buffer.limit() == 0) {
@@ -539,25 +538,11 @@ public void glViewport(int x, int y, int width, int height) {
 
     @Override
     public void glBeginQuery(int target, int query) {
-        if (target == GL.GL_TIME_ELAPSED) {
-            if (!GLES.getCapabilities().GL_EXT_disjoint_timer_query) {
-                throw new UnsupportedOperationException("GL_TIME_ELAPSED requires GL_EXT_disjoint_timer_query");
-            }
-            EXTDisjointTimerQuery.glBeginQueryEXT(target, query);
-            return;
-        }
         GLES30.glBeginQuery(target, query);
     }
 
     @Override
     public void glEndQuery(int target) {
-        if (target == GL.GL_TIME_ELAPSED) {
-            if (!GLES.getCapabilities().GL_EXT_disjoint_timer_query) {
-                throw new UnsupportedOperationException("GL_TIME_ELAPSED requires GL_EXT_disjoint_timer_query");
-            }
-            EXTDisjointTimerQuery.glEndQueryEXT(target);
-            return;
-        }
         GLES30.glEndQuery(target);
     }
 
@@ -567,30 +552,22 @@ public void glGenQueries(int num, IntBuffer buff) {
         int oldLimit = buff.limit();
         int pos = buff.position();
         buff.limit(pos + num);
-        if (GLES.getCapabilities().GL_EXT_disjoint_timer_query) {
-            EXTDisjointTimerQuery.glGenQueriesEXT(buff);
-        } else {
-            GLES30.glGenQueries(buff);
-        }
+        GLES30.glGenQueries(buff);
         buff.limit(oldLimit);
     }
 
     @Override
     public int glGetQueryObjectiv(int query, int pname) {
-        if (GLES.getCapabilities().GL_EXT_disjoint_timer_query) {
-            return EXTDisjointTimerQuery.glGetQueryObjectiEXT(query, pname);
-        }
         IntBuffer b = (IntBuffer) tmpBuff.clear();
         GLES30.glGetQueryObjectuiv(query, pname, b); 
         return b.get(0);
     }
 
     @Override
     public long glGetQueryObjectui64(int query, int pname) {
-        if (!GLES.getCapabilities().GL_EXT_disjoint_timer_query) {
-            throw new UnsupportedOperationException("64-bit query results require GL_EXT_disjoint_timer_query");
-        }
-        return EXTDisjointTimerQuery.glGetQueryObjectui64EXT(query, pname);
+        IntBuffer b = (IntBuffer) tmpBuff.clear();
+        GLES30.glGetQueryObjectuiv(query, pname, b);
+        return b.get(0) & 0xFFFFFFFFL;
     }
 
     @Override