Commit: 07a0ef14e6171c9f1a50026dd26e9cf364e38a50 - MikuMikuStudio (git)

Main repository of MikuMikuStudio

Commit MetaInfo

• Revision: 07a0ef14e6171c9f1a50026dd26e9cf364e38a50 (tree)
• Zeit: 2014-02-19 14:40:56
• Autor: kobayasi <kobayasi@pscn...>
• Commiter: kobayasi

Log Message

Support setFrameBuffer and depth texture on iOS

Ändern Zusammenfassung

• modified: gdx/src/main/java/com/jme3/renderer/gdx/GdxRenderer.java
• modified: gdx/src/main/java/com/jme3/renderer/gdx/TextureUtilGdx.java

Diff

--- a/gdx/src/main/java/com/jme3/renderer/gdx/GdxRenderer.java
+++ b/gdx/src/main/java/com/jme3/renderer/gdx/GdxRenderer.java
@@ -103,7 +103,7 @@ public final class GdxRenderer implements Renderer {
     private boolean verboseLogging = false;
     private boolean useVBO = true;
     public boolean adreno_finish_bug = false;
-
+    private int mainFrameBuffer = -1;
     public GdxRenderer() {
     }
 
@@ -411,6 +411,12 @@ public final class GdxRenderer implements Renderer {
             adreno_finish_bug = true;
         }
         logger.log(Level.INFO, "Caps: {0}", caps);
+
+        // Get main framebuffer id because main framebuffer is not 0 on iOS.
+        if (mainFrameBuffer == -1) {
+            Gdx.gl20.glGetIntegerv(GL20.GL_FRAMEBUFFER_BINDING, intBuf16);
+            mainFrameBuffer = intBuf16.get(0);
+        }
     }
 
     /**
@@ -1712,13 +1718,13 @@ public final class GdxRenderer implements Renderer {
 
         if (fb == null) {
             // unbind any fbos
-            if (context.boundFBO != 0) {
-                Gdx.gl20.glBindFramebuffer(GL20.GL_FRAMEBUFFER, 0);
+            if (context.boundFBO != mainFrameBuffer) {
+                Gdx.gl20.glBindFramebuffer(GL20.GL_FRAMEBUFFER, mainFrameBuffer);
 //                RendererUtil.checkGLError();
 
                 statistics.onFrameBufferUse(null, true);
 
-                context.boundFBO = 0;
+                context.boundFBO = mainFrameBuffer;
             }
 
             /*

--- a/gdx/src/main/java/com/jme3/renderer/gdx/TextureUtilGdx.java
+++ b/gdx/src/main/java/com/jme3/renderer/gdx/TextureUtilGdx.java
@@ -406,13 +406,13 @@ public class TextureUtilGdx {
                 format = GL20.GL_COMPRESSED_TEXTURE_FORMATS;
                 dataType = GL20.GL_UNSIGNED_BYTE;
             case Depth:
-                format = GL20.GL_DEPTH_COMPONENT;
-                dataType = GL20.GL_UNSIGNED_BYTE;
-                break;
+//                format = GL20.GL_DEPTH_COMPONENT;
+//                dataType = GL20.GL_UNSIGNED_BYTE;
+//                break;
             case Depth16:
                 format = GL20.GL_DEPTH_COMPONENT;
-                internalFormat = GL20.GL_DEPTH_COMPONENT16;
-                dataType = GL20.GL_UNSIGNED_BYTE;
+                internalFormat = GL20.GL_DEPTH_COMPONENT;
+                dataType = GL20.GL_UNSIGNED_SHORT;
                 break;
             case Depth24:
             case Depth32: