From 11a5d841f983102f59450b9288294e7e4038d0fe Mon Sep 17 00:00:00 2001
From: Gustl22 <user.rebo@gmx.de>
Date: Wed, 23 Jan 2019 21:56:10 +0100
Subject: [PATCH] GL debug improvements (#636)

---
 vtm/src/org/oscim/renderer/GLUtils.java     | 43 +++++++++++----------
 vtm/src/org/oscim/renderer/MapRenderer.java |  2 +-
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/vtm/src/org/oscim/renderer/GLUtils.java b/vtm/src/org/oscim/renderer/GLUtils.java
index 40362db6..654f35c4 100644
--- a/vtm/src/org/oscim/renderer/GLUtils.java
+++ b/vtm/src/org/oscim/renderer/GLUtils.java
@@ -159,6 +159,26 @@ public class GLUtils {
         }
     }
 
+    /**
+     * Check GL error.
+     * See: https://www.khronos.org/opengl/wiki/OpenGL_Error
+     *
+     * @param op the operation which should be debugged
+     * @param id the error to be found
+     * @return true if error was found
+     */
+    public static boolean checkGlError(String op, int id) {
+        boolean hasError = false;
+        int error; // GL.NO_ERROR
+        while ((error = gl.getError()) != GL.NO_ERROR) {
+            log.error(op + ": \tglError " + getGlErrorString(error) + " (" + error + ")");
+            // throw new RuntimeException(op + ": glError " + error);
+            if (error == id)
+                hasError = true;
+        }
+        return hasError;
+    }
+
     /**
      * Check GL errors.
      * See: https://www.khronos.org/opengl/wiki/OpenGL_Error
@@ -167,35 +187,16 @@ public class GLUtils {
      * @return the OpenGL error codes
      */
     public static List<Integer> checkGlErrors(String op) {
-        int error; // GL.NO_ERROR
         List<Integer> errors = new ArrayList<>();
+        int error; // GL.NO_ERROR
         while ((error = gl.getError()) != GL.NO_ERROR) {
             log.error(op + ": \tglError " + getGlErrorString(error) + " (" + error + ")");
-            errors.add(error);
             // throw new RuntimeException(op + ": glError " + error);
+            errors.add(error);
         }
         return errors;
     }
 
-    /**
-     * Check GL out of memory.
-     * See: https://www.khronos.org/opengl/wiki/OpenGL_Error
-     *
-     * @param op the operation which should be debugged
-     * @return true if out of memory
-     */
-    public static boolean checkGlOutOfMemory(String op) {
-        int error; // GL.NO_ERROR
-        boolean oom = false;
-        while ((error = gl.getError()) != GL.NO_ERROR) {
-            log.error(op + ": \tglError " + getGlErrorString(error) + " (" + error + ")");
-            // throw new RuntimeException(op + ": glError " + error);
-            if (error == GL.OUT_OF_MEMORY)
-                oom = true;
-        }
-        return oom;
-    }
-
     /**
      * @param error the error code of OpenGL
      * @return the error code as string
diff --git a/vtm/src/org/oscim/renderer/MapRenderer.java b/vtm/src/org/oscim/renderer/MapRenderer.java
index a1e0460f..d24ec2c5 100644
--- a/vtm/src/org/oscim/renderer/MapRenderer.java
+++ b/vtm/src/org/oscim/renderer/MapRenderer.java
@@ -160,7 +160,7 @@ public class MapRenderer {
                 GLUtils.checkGlError(renderer.getClass().getName());
         }
 
-        if (GLUtils.checkGlOutOfMemory(getClass().getName() + ": finish")) {
+        if (GLUtils.checkGlError(getClass().getName() + ": finish", GL.OUT_OF_MEMORY)) {
             BufferObject.checkBufferUsage(true);
             // FIXME also throw out some textures etc
         }