call setFormat in the constructor, to avoid the surfaceview creation twice on the start. it is enough to resolve the issues seen on the Gabriel Nexus 7 2013 gen/Android 4.3

tito · tito · commit 937f87321f52 · 2013-11-07T16:37:39.000+01:00
diff --git a/src/src/org/renpy/android/SDLSurfaceView.java b/src/src/org/renpy/android/SDLSurfaceView.java
@@ -60,8 +60,9 @@
 
 
 public class SDLSurfaceView extends SurfaceView implements SurfaceHolder.Callback, Runnable {
-    private static String TAG = "SDLSurface";
-    private final String mVertexShader =
+    static private final String TAG = "SDLSurface";
+    static private final boolean DEBUG = false;
+    static private final String mVertexShader =
         "uniform mat4 uMVPMatrix;\n" +
         "attribute vec4 aPosition;\n" +
         "attribute vec2 aTextureCoord;\n" +
@@ -71,7 +72,7 @@ public class SDLSurfaceView extends SurfaceView implements SurfaceHolder.Callbac
         "  vTextureCoord = aTextureCoord;\n" +
         "}\n";
 
-    private final String mFragmentShader =
+    static private final String mFragmentShader =
         "precision mediump float;\n" +
         "varying vec2 vTextureCoord;\n" +
         "uniform sampler2D sTexture;\n" +
@@ -380,9 +381,13 @@ public SDLSurfaceView(PythonActivity act, String argument) {
         }
 
         if ( ai.metaData.getInt("surface.transparent") != 0 ) {
-            Log.d(TAG, "Surface will be transparent, so put on the top.");
+            Log.d(TAG, "Surface will be transparent.");
             setZOrderOnTop(true);
+            getHolder().setFormat(PixelFormat.TRANSPARENT);
+        } else {
+            Log.i(TAG, "Surface will NOT be transparent");
         }
+
     }
 
 
@@ -540,7 +545,7 @@ static void ackStop() {
      * not normally called or subclassed by clients of GLSurfaceView.
      */
     public void surfaceCreated(SurfaceHolder holder) {
-        //Log.i(TAG, "surfaceCreated() is not handled :|");
+        if (DEBUG) Log.d(TAG, "surfaceCreated()");
         synchronized (this) {
             if (!mStarted) {
                 this.notifyAll();
@@ -553,15 +558,16 @@ public void surfaceCreated(SurfaceHolder holder) {
      * not normally called or subclassed by clients of GLSurfaceView.
      */
     public void surfaceDestroyed(SurfaceHolder holder) {
-        //Log.i(TAG, "surfaceDestroyed() is not handled :|");
+        if (DEBUG) Log.d(TAG, "surfaceDestroyed()");
     }
 
     /**
      * This method is part of the SurfaceHolder.Callback interface, and is
      * not normally called or subclassed by clients of GLSurfaceView.
      */
     public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
-        //Log.i(TAG, String.format("surfaceChanged() fmt=%d size=%dx%d", format, w, h));
+        if (DEBUG) Log.i(TAG, String.format("surfaceChanged() fmt=%d size=%dx%d", format, w, h));
+
         mWidth = w;
         mHeight = h;
 
@@ -609,7 +615,7 @@ public void run() {
         int[] attrib_list = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL10.EGL_NONE };
 
         // Create an opengl es 2.0 surface
-        Log.w(TAG, "Choose egl configuration");
+        Log.i(TAG, "Choose egl configuration");
         int configToTest = 0;
         boolean configFound = false;
 
@@ -645,7 +651,7 @@ public void run() {
                 continue;
             }
 
-            Log.w(TAG, "Create egl context");
+            if (DEBUG) Log.d(TAG, "Create egl context");
             mEglContext = mEgl.eglCreateContext(mEglDisplay, mEglConfig, EGL10.EGL_NO_CONTEXT, attrib_list);
             if (mEglContext == null) {
                 Log.w(TAG, "Unable to create egl context with this configuration, try the next one.");
@@ -669,14 +675,7 @@ public void run() {
             return;
         }
 
-        if ( ai.metaData.getInt("surface.transparent") != 0 ) {
-            Log.i(TAG, "Surface will be transparent");
-            getHolder().setFormat(PixelFormat.TRANSPARENT);
-        } else {
-            Log.i(TAG, "Surface will NOT be transparent");
-        }
-
-        //Log.d(TAG, "Done");
+        if (DEBUG) Log.d(TAG, "Done egl");
         waitForStart();
 
         nativeResize(mWidth, mHeight);
@@ -707,13 +706,6 @@ public void run() {
         System.exit(0);
     }
 
-    private void glCheck(GL10 gl) {
-        int gle = gl.glGetError();
-        if (gle != gl.GL_NO_ERROR) {
-            throw new RuntimeException("GL Error: " + gle);
-        }
-    }
-
     private void waitForStart() {
 
         int presplashId = mResourceManager.getIdentifier("presplash", "drawable");
@@ -1028,7 +1020,7 @@ public boolean onTouchEvent(final MotionEvent event) {
 
     @Override
     public boolean onKeyDown(int keyCode, final KeyEvent event) {
-        //Log.i("python", String.format("key down %d", keyCode));
+        if (DEBUG) Log.d(TAG, String.format("onKeyDown() keyCode=%d", keyCode));
         if (mDelLen > 0){
             mDelLen = 0;
             return true;
@@ -1042,11 +1034,11 @@ public boolean onKeyDown(int keyCode, final KeyEvent event) {
 
     @Override
     public boolean onKeyUp(int keyCode, final KeyEvent event) {
+        if (DEBUG) Log.d(TAG, String.format("onKeyUp() keyCode=%d", keyCode));
         if (mDelLen > 0){
             mDelLen = 0;
             return true;
         }
-        //Log.i("python", String.format("key up %d", keyCode));
         if (mInputActivated && nativeKey(keyCode, 0, event.getUnicodeChar())) {
             return true;
         } else {
@@ -1056,6 +1048,9 @@ public boolean onKeyUp(int keyCode, final KeyEvent event) {
 
     @Override
     public boolean onKeyMultiple(int keyCode, int count, KeyEvent event){
+        if (DEBUG)
+            Log.d(TAG, String.format(
+                "onKeyMultiple() keyCode=%d count=%d", keyCode, count));
         String keys = event.getCharacters();
         char[] keysBuffer = new char[keys.length()];
         if (mDelLen > 0){
@@ -1087,7 +1082,7 @@ public boolean onKeyMultiple(int keyCode, int count, KeyEvent event){
 
     @Override
     public boolean onKeyPreIme(int keyCode, final KeyEvent event){
-        //Log.i("python", String.format("key pre ime %d", keyCode));
+        if (DEBUG) Log.d(TAG, String.format("onKeyPreIme() keyCode=%d", keyCode));
         if (mInputActivated){
             switch (event.getAction()) {
                 case KeyEvent.ACTION_DOWN:
@@ -1214,7 +1209,7 @@ private void checkGlError(String op) {
         int error;
         while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
             Log.e(TAG, op + ": glError " + error);
-            throw new RuntimeException(op + ": glError " + error);
+            //throw new RuntimeException(op + ": glError " + error);
         }
     }
     private static final int FLOAT_SIZE_BYTES = 4;
