setDepthStencilTargetを修正、パック形式はGL_DEPTH_STENCIL_ATTACHMENTを指定

Author: zakki

src/hsp3dish/gameplay/src/Base.h

@@ -297,11 +297,11 @@ using std::va_list;
     #else
         #error "Unsupported Apple Device"
     #endif
-#elif EMSCRIPTEN
+#elif __EMSCRIPTEN__
     #define GLEW_STATIC
     #include <GL/glew.h>
     #define OPENGL_ES
-    #define USE_VAO
+    #define GP_USE_VAO
 #endif
 
 // Graphics (GLSL)

src/hsp3dish/gameplay/src/DepthStencilTarget.cpp

@@ -50,6 +50,14 @@ DepthStencilTarget* DepthStencilTarget::create(const char* id, Format format, un
     __gl_error_code = glGetError();
     if ( __gl_error_code != GL_NO_ERROR)
     {
+#ifdef __EMSCRIPTEN__
+        glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_STENCIL, width, height);
+    }
+
+    __gl_error_code = glGetError();
+    if ( __gl_error_code != GL_NO_ERROR)
+    {
+#endif
         const char* extString = (const char*)glGetString(GL_EXTENSIONS);
 
         if (strstr(extString, "GL_OES_packed_depth_stencil") != 0)

src/hsp3dish/gameplay/src/FrameBuffer.cpp

@@ -221,9 +221,6 @@ void FrameBuffer::setRenderTarget(RenderTarget* target, unsigned int index, GLen
 
         // Restore the FBO binding
         GL_ASSERT( glBindFramebuffer(GL_FRAMEBUFFER, _currentFrameBuffer->_handle) );
-
-        // FIXME: Without this, setDepthStencilTarget will fail
-        glGetError();
     }
 }
 
@@ -261,14 +258,21 @@ void FrameBuffer::setDepthStencilTarget(DepthStencilTarget* target)
         GL_ASSERT( glBindFramebuffer(GL_FRAMEBUFFER, _handle) );
 
         // Attach the render buffer to the framebuffer
-        GL_ASSERT( glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, _depthStencilTarget->_depthBuffer) );
         if (target->isPacked())
         {
-            GL_ASSERT( glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, _depthStencilTarget->_depthBuffer) );
+            GL_ASSERT( glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, _depthStencilTarget->_depthBuffer) );
         }
         else if (target->getFormat() == DepthStencilTarget::DEPTH_STENCIL)
         {
+#ifdef __EMSCRIPTEN__
+            GP_WARN("Unexpected status %d %zu %zu", target->isPacked(), _depthStencilTarget->_depthBuffer, _depthStencilTarget->_stencilBuffer);
+            GL_ASSERT( glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, _depthStencilTarget->_depthBuffer) );
             GL_ASSERT( glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, _depthStencilTarget->_stencilBuffer) );
+#endif
+        }
+        else
+        {
+            GL_ASSERT( glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, _depthStencilTarget->_depthBuffer) );
         }
 
         // Check the framebuffer is good to go.