Merge branch 'anuke' into be

Author: buthed010203

extensions/profiling/src/arc/profiling/GL20Interceptor.java

@@ -1,6 +1,8 @@
 package arc.profiling;
 
-import arc.graphics.GL20;
+import arc.*;
+import arc.graphics.*;
+import arc.util.*;
 
 import java.nio.*;
 
@@ -10,16 +12,21 @@
  */
 public class GL20Interceptor extends GLInterceptor implements GL20{
     protected final GL20 gl20;
+    protected volatile @Nullable Thread mainThread;
 
     protected GL20Interceptor(GLProfiler glProfiler, GL20 gl20){
         super(glProfiler);
         this.gl20 = gl20;
+        Core.app.post(() -> mainThread = Thread.currentThread());
     }
 
     private void check(){
+        if(mainThread != null && Thread.currentThread() != mainThread){
+            glProfiler.getListener().onError("GL call on wrong thread: " + Thread.currentThread());
+        }
         int error = gl20.glGetError();
         while(error != GL20.GL_NO_ERROR){
-            glProfiler.getListener().onError(error);
+            glProfiler.getListener().onError(resolveErrorNumber(error));
             error = gl20.glGetError();
         }
     }

extensions/profiling/src/arc/profiling/GL30Interceptor.java

@@ -1,7 +1,9 @@
 package arc.profiling;
 
+import arc.*;
 import arc.graphics.GL20;
 import arc.graphics.GL30;
+import arc.util.*;
 
 import java.nio.Buffer;
 import java.nio.FloatBuffer;
@@ -13,18 +15,22 @@
  * @author Jan Polák
  */
 public class GL30Interceptor extends GLInterceptor implements GL30{
-
     protected final GL30 gl30;
+    protected volatile @Nullable Thread mainThread;
 
     protected GL30Interceptor(GLProfiler glProfiler, GL30 gl30){
         super(glProfiler);
         this.gl30 = gl30;
+        Core.app.post(() -> mainThread = Thread.currentThread());
     }
 
     private void check(){
+        if(mainThread != null && Thread.currentThread() != mainThread){
+            glProfiler.getListener().onError("GL call on wrong thread: " + Thread.currentThread());
+        }
         int error = gl30.glGetError();
         while(error != GL20.GL_NO_ERROR){
-            glProfiler.getListener().onError(error);
+            glProfiler.getListener().onError(resolveErrorNumber(error));
             error = gl30.glGetError();
         }
     }

extensions/profiling/src/arc/profiling/GLErrorListener.java

@@ -2,8 +2,6 @@
 
 import arc.util.*;
 
-import static arc.profiling.GLInterceptor.resolveErrorNumber;
-
 /**
  * Listener for GL errors detected by {@link GLProfiler}.
  * @author Jan Polák
@@ -16,9 +14,9 @@ public interface GLErrorListener{
         String place = getCallName();
 
         if(place != null){
-            Log.err(new RuntimeException(Strings.format("[GLProfiler] Error @ from @", resolveErrorNumber(error), place)));
+            Log.err(new RuntimeException(Strings.format("[GLProfiler] Error @ from @", error, place)));
         }else{
-            Log.err(new RuntimeException(Strings.format("[GLProfiler] Error @", resolveErrorNumber(error))));
+            Log.err(new RuntimeException(Strings.format("[GLProfiler] Error @", error)));
         }
     };
 
@@ -27,17 +25,17 @@ public interface GLErrorListener{
         String place = getCallName();
 
         if(place != null){
-            throw new RuntimeException(Strings.format("[GLProfiler] Error @ from @", resolveErrorNumber(error), place));
+            throw new RuntimeException(Strings.format("[GLProfiler] Error @ from @", error, place));
         }else{
-            throw new RuntimeException(Strings.format("[GLProfiler] Error @", resolveErrorNumber(error)));
+            throw new RuntimeException(Strings.format("[GLProfiler] Error @", error));
         }
     };
 
     /**
      * Put your error logging code here.
      * @see GLInterceptor#resolveErrorNumber(int)
      */
-    void onError(int error);
+    void onError(String error);
 
     static @Nullable String getCallName(){
         String place = null;