commit 8e91d25a53c1869ede04cad4fb0d318dd94ee4c4
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Oct 17 18:22:44 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Oct 17 18:22:44 2012 +0000
tree 959e956aa803430e152e2c51e83bc67ad227be52
parent d4211110a2b36fff9fa3c1f5f340eba635541634

Removes D3D format usage from framebuffer completeness check.

TRAC #21609

Signed-off-by: Daniel Koch

Author:    Shannon Woods

git-svn-id: https://angleproject.googlecode.com/svn/trunk@1303 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/Framebuffer.cpp

diff --git a/src/libGLESv2/Framebuffer.cpp b/src/libGLESv2/Framebuffer.cpp
index 2372257..77d79c0 100644
--- a/src/libGLESv2/Framebuffer.cpp
+++ b/src/libGLESv2/Framebuffer.cpp
@@ -303,7 +303,6 @@
         {
             GLint internalformat = colorbuffer->getInternalFormat();
             GLenum format = gl::ExtractFormat(internalformat);
-            D3DFORMAT d3dformat = colorbuffer->getD3DFormat();
 
             if (IsCompressed(format) ||
                 format == GL_ALPHA ||
@@ -313,13 +312,13 @@
                 return GL_FRAMEBUFFER_UNSUPPORTED;
             }
 
-            if ((dx2es::IsFloat32Format(d3dformat) && !context->supportsFloat32RenderableTextures()) ||
-                (dx2es::IsFloat16Format(d3dformat) && !context->supportsFloat16RenderableTextures()))
+            if ((gl::IsFloat32Format(internalformat) && !context->supportsFloat32RenderableTextures()) ||
+                (gl::IsFloat16Format(internalformat) && !context->supportsFloat16RenderableTextures()))
             {
                 return GL_FRAMEBUFFER_UNSUPPORTED;
             }
 
-            if (dx2es::IsDepthTextureFormat(d3dformat) || dx2es::IsStencilTextureFormat(d3dformat))
+            if (gl::IsDepthTexture(internalformat) || gl::IsStencilTexture(internalformat))
             {
                 return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
             }
@@ -362,7 +361,7 @@
         }
         else if (IsInternalTextureTarget(mDepthbufferType))
         {
-            D3DFORMAT d3dformat = depthbuffer->getD3DFormat();
+            GLint internalformat = depthbuffer->getInternalFormat();
 
             // depth texture attachments require OES/ANGLE_depth_texture
             if (!context->supportsDepthTextures())
@@ -370,7 +369,7 @@
                 return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
             }
 
-            if (!dx2es::IsDepthTextureFormat(d3dformat))
+            if (!gl::IsDepthTexture(internalformat))
             {
                 return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
             }
@@ -421,7 +420,7 @@
         }
         else if (IsInternalTextureTarget(mStencilbufferType))
         {
-            D3DFORMAT d3dformat = stencilbuffer->getD3DFormat();
+            GLint internalformat = stencilbuffer->getInternalFormat();
 
             // texture stencil attachments come along as part
             // of OES_packed_depth_stencil + OES/ANGLE_depth_texture
@@ -430,7 +429,7 @@
                 return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
             }
 
-            if (!dx2es::IsStencilTextureFormat(d3dformat))
+            if (!gl::IsStencilTexture(internalformat))
             {
                 return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
             }