Ticket #1768: glerrors-osx10.5-12152012.patch

source/renderer/PostprocManager.cpp

@@ -118 +118 @@
     // Allocate the Depth/Stencil texture.
     glGenTextures(1, (GLuint*)&m_DepthTex);
     glBindTexture(GL_TEXTURE_2D, m_DepthTex);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH24_STENCIL8, m_Width, m_Height,
-              0, GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8, 0);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH24_STENCIL8_EXT, m_Width, m_Height,
+              0, GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, 0);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE,
             GL_NONE);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -134 +134 @@
     pglGenFramebuffersEXT(1, &m_PingFbo);
     pglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_PingFbo);
     pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, m_ColourTex1, 0);
-    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, m_DepthTex, 0);
+    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, m_DepthTex, 0);
+    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, GL_TEXTURE_2D, m_DepthTex, 0);
     
     GLenum status = pglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
     if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
@@ -145 +146 @@
     pglGenFramebuffersEXT(1, &m_PongFbo);
     pglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_PongFbo);
     pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, m_ColourTex2, 0);
-    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, m_DepthTex, 0);
+    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, m_DepthTex, 0);
+    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, GL_TEXTURE_2D, m_DepthTex, 0);
     
     status = pglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
     if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
@@ -305 +307 @@
     pglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_PongFbo);   
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
     
-    GLenum buffers[] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 };
+    GLenum buffers[] = { GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT1_EXT };
     pglDrawBuffers(1, buffers);
     
     pglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_PingFbo);
@@ -421 +423 @@
     }
     
     pglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_PongFbo);
-    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT1, GL_TEXTURE_2D, 0, 0);
+    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT1_EXT, GL_TEXTURE_2D, 0, 0);
     
-    GLenum buffers[] = { GL_COLOR_ATTACHMENT0 };
+    GLenum buffers[] = { GL_COLOR_ATTACHMENT0_EXT };
     pglDrawBuffers(1, buffers);
     
     pglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_PingFbo);
-    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT1, GL_TEXTURE_2D, 0, 0);
+    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT1_EXT, GL_TEXTURE_2D, 0, 0);
     pglDrawBuffers(1, buffers); 
     
     pglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_PongFbo);
-    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, 0);
+    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0);
+    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0);
     
     pglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_PingFbo);
-    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, 0);
+    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0);
+    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0);
     
     // First render blur textures. Note that this only happens ONLY ONCE, before any effects are applied!
     // (This may need to change depending on future usage, however that will have a fps hit)
@@ -446 +450 @@
     }
     
     pglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_PongFbo);
-    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, m_DepthTex, 0);
+    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, m_DepthTex, 0);
+    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, GL_TEXTURE_2D, m_DepthTex, 0);
     
     pglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_PingFbo);
-    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, m_DepthTex, 0);
+    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, m_DepthTex, 0);
+    pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, GL_TEXTURE_2D, m_DepthTex, 0);
 }
 
 

source/renderer/ShadowMap.cpp

@@ -322 +322 @@
     }
     
     // save the caller's FBO    
-    glGetIntegerv(GL_FRAMEBUFFER_BINDING, &SavedViewFBO);
+    glGetIntegerv(GL_FRAMEBUFFER_BINDING_EXT, &SavedViewFBO);
 
     pglGenFramebuffersEXT(1, &Framebuffer);
 
@@ -457 +457 @@
     // HACK HACK: this depends in non-obvious ways on the behaviour of the caller
     
     // save caller's FBO
-    glGetIntegerv(GL_FRAMEBUFFER_BINDING, &m->SavedViewFBO);
+    glGetIntegerv(GL_FRAMEBUFFER_BINDING_EXT, &m->SavedViewFBO);
 
     // Calc remaining shadow matrices
     m->CalcShadowMatrices();