with the new metadata surface.transluent, correctly set the transluency before starting the thread.

tito · tito · commit 364aede2bb8c · 2013-11-05T02:43:39.000+01:00
diff --git a/src/src/org/renpy/android/SDLSurfaceView.java b/src/src/org/renpy/android/SDLSurfaceView.java
@@ -529,22 +529,23 @@ static void ackStop() {
      * not normally called or subclassed by clients of GLSurfaceView.
      */
     public void surfaceCreated(SurfaceHolder holder) {
-        Log.i(TAG, "surfaceCreated() is not handled :|");
+        //Log.i(TAG, "surfaceCreated() is not handled :|");
     }
 
     /**
      * This method is part of the SurfaceHolder.Callback interface, and is
      * not normally called or subclassed by clients of GLSurfaceView.
      */
     public void surfaceDestroyed(SurfaceHolder holder) {
-        Log.i(TAG, "surfaceDestroyed() is not handled :|");
+        //Log.i(TAG, "surfaceDestroyed() is not handled :|");
     }
 
     /**
      * 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, "surfaceChanged() :|");
         mWidth = w;
         mHeight = h;
 
@@ -563,7 +564,9 @@ public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
             new Thread(this).start();
         } else {
             mChanged = true;
-            nativeExpose();
+            if (mStarted) {
+                nativeExpose();
+            }
         }
     }
 
@@ -650,16 +653,16 @@ public void run() {
             return;
         }
 
-        Log.w(TAG, "Done");
-        waitForStart();
-
         if ( ai.metaData.getInt("surface.transluent") != 0 ) {
             Log.i(TAG, "Surface will be transluent");
             getHolder().setFormat(PixelFormat.TRANSLUCENT);
         } else {
             Log.i(TAG, "Surface will NOT be transluent");
         }
 
+        Log.w(TAG, "Done");
+        waitForStart();
+
         nativeResize(mWidth, mHeight);
         nativeInitJavaCallbacks();
         nativeSetEnv("ANDROID_PRIVATE", mFilesDirectory);
@@ -814,15 +817,15 @@ private void waitForStart() {
         GLES20.glUniformMatrix4fv(muMVPMatrixHandle, 1, false, mMVPMatrix, 0);
         GLES20.glDrawArrays(GLES20.GL_TRIANGLES, 0, 6);
         checkGlError("glDrawArrays");
-        mEgl.eglSwapBuffers(mEglDisplay, mEglSurface);
+        swapBuffers();
 
         // Wait to be notified it's okay to start Python.
         synchronized (this) {
             while (!mStarted) {
                 // Draw & Flip.
                 GLES20.glClear(GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT);
                 GLES20.glDrawArrays(GLES20.GL_TRIANGLES, 0, 6);
-                mEgl.eglSwapBuffers(mEglDisplay, mEglSurface);
+                swapBuffers();
 
                 try {
                     this.wait(250);
