NEWTWin: FPS dump on ARM more frequently :)

2 files changed, 15 insertions, 3 deletions

diff --git a/Jake2.sh b/Jake2.sh
index 8624444..af1d241 100644
--- a/Jake2.sh
+++ b/Jake2.sh
@@ -20,10 +20,11 @@ D0_ARGS="-Djava.awt.headless=true"
 #D_ARGS="-Djogl.debug.FixedFuncImpl"
 #D_ARGS="-Djogl.debug.FixedFuncPipeline"
 #D_ARGS="-Djogl.debug.GLSLCode"
-D_ARGS="-Djogl.debug.ImmModeSink.Buffer"
+#D_ARGS="-Djogl.debug.ImmModeSink.Buffer"
 
 #G_ARGS="+connect 10.1.0.52 +set cl_timeout 12000"
 #G_ARGS="+set timeout 12000 +set cl_timeout 12000 +set gl_mode 0"
+#G_ARGS="+set timeout 12000 +set cl_timeout 12000 +set gl_mode 0 +set vid_ref joglgl2"
 #G_ARGS="+set timeout 12000 +set cl_timeout 12000 +set gl_mode 0 +set vid_ref jogles1"
 G_ARGS="+set timeout 12000 +set cl_timeout 12000 +set gl_mode 0 +set vid_ref jogles2"
 #G_ARGS="+set timeout 12000 +set cl_timeout 12000 +set gl_mode 0 +set vid_ref jogldummy"
diff --git a/src/jake2/render/opengl/NEWTWin.java b/src/jake2/render/opengl/NEWTWin.java
index 833376c..078f97c 100644
--- a/src/jake2/render/opengl/NEWTWin.java
+++ b/src/jake2/render/opengl/NEWTWin.java
@@ -23,6 +23,7 @@ import javax.media.opengl.GLProfile;
 
 import jogamp.opengl.FPSCounterImpl;
 
+import com.jogamp.common.os.Platform;
 import com.jogamp.newt.NewtFactory;
 import com.jogamp.newt.Screen;
 import com.jogamp.newt.ScreenMode;
@@ -77,6 +78,7 @@ public class NEWTWin {
      * @return enum Base.rserr_t
      */
     public int setMode(GLProfile glp, Dimension dim, int mode, boolean fullscreen, String driverName) {
+        final boolean isARM = Platform.CPUFamily.ARM == Platform.getCPUFamily();
 
         final Dimension newDim = new Dimension();
 
@@ -111,7 +113,13 @@ public class NEWTWin {
         }
         
         if(null == window) {
-            window = GLWindow.create(screen, new GLCapabilities(glp));
+            final GLCapabilities caps = new GLCapabilities(glp);
+            /*** FIXME ..
+            caps.setRedBits(5);
+            caps.setGreenBits(6);
+            caps.setBlueBits(5);
+            caps.setAlphaBits(0); */
+            window = GLWindow.create(screen, caps);
             window.setTitle("Jake2 ("+driverName+"-newt-"+glp.getName().toLowerCase()+")");
         }
 
@@ -194,11 +202,14 @@ public class NEWTWin {
         window.requestFocus();
         window.display(); // force GL resource validation
         
+        VID.Printf(Defines.PRINT_ALL, "...reques GLCaps "+window.getRequestedCapabilities()+'\n');
+        VID.Printf(Defines.PRINT_ALL, "...chosen GLCaps "+window.getChosenGLCapabilities()+'\n');
+        
         if(screenRemRef) {
             screen.removeReference();
         }
 
-        fpsCounter.setUpdateFPSFrames(5*60, System.err);
+        fpsCounter.setUpdateFPSFrames(isARM ? 60 : 4*60, System.err);
 
         return Base.rserr_ok;
     }