make sure all texture->isCompressed calls are type-specific

Issue=306 Signed-off-by: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@1079 736b8ea6-26fd-11df-bfd4-992fa37f6226

make sure all texture->isCompressed calls are type-specific
eb3c01a8 · daniel@transgaming.com · 46f2d0a9 · eb3c01a8
Commit eb3c01a8 authored May 09, 2012 by daniel@transgaming.com
Show whitespace changes
Inline Side-by-side

Showing with 34 additions and 16 deletions

libGLESv2.cpp src/libGLESv2/libGLESv2.cpp +34 -16

No files found.
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -2353,19 +2353,21 @@ void __stdcall glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum t
                    return error(GL_INVALID_OPERATION);
                }

-                if (tex->isCompressed())
-                {
-                    return error(GL_INVALID_OPERATION);
-                }
-
                switch (textarget)
                {
                  case GL_TEXTURE_2D:
+                    {
                        if (tex->getTarget() != GL_TEXTURE_2D)
                        {
                            return error(GL_INVALID_OPERATION);
                        }
+                        gl::Texture2D *tex2d = static_cast<gl::Texture2D *>(tex);
+                        if (tex2d->isCompressed())
+                        {
+                            return error(GL_INVALID_OPERATION);
+                        }
                        break;
+                    }

                  case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
                  case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
@@ -2373,11 +2375,18 @@ void __stdcall glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum t
                  case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
                  case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
                  case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
+                    {
                        if (tex->getTarget() != GL_TEXTURE_CUBE_MAP)
                        {
                            return error(GL_INVALID_OPERATION);
                        }
+                        gl::TextureCubeMap *texcube = static_cast<gl::TextureCubeMap *>(tex);
+                        if (texcube->isCompressed())
+                        {
+                            return error(GL_INVALID_OPERATION);
+                        }
                        break;
+                    }

                  default:
                    return error(GL_INVALID_ENUM);
@@ -2487,28 +2496,37 @@ void __stdcall glGenerateMipmap(GLenum target)

        if (context)
        {
-            gl::Texture *texture;
-
            switch (target)
            {
              case GL_TEXTURE_2D:
-                texture = context->getTexture2D();
-                break;
+                {
+                    gl::Texture2D *tex2d = context->getTexture2D();

-              case GL_TEXTURE_CUBE_MAP:
-                texture = context->getTextureCubeMap();
-                break;
+                    if (tex2d->isCompressed())
+                    {
+                        return error(GL_INVALID_OPERATION);
+                    }

-              default:
-                return error(GL_INVALID_ENUM);
+                    tex2d->generateMipmaps();
+                    break;
                }

-            if (texture->isCompressed())
+              case GL_TEXTURE_CUBE_MAP:
+                {
+                    gl::TextureCubeMap *texcube = context->getTextureCubeMap();
+
+                    if (texcube->isCompressed())
                    {
                        return error(GL_INVALID_OPERATION);
                    }

-            texture->generateMipmaps();
+                    texcube->generateMipmaps();
+                    break;
+                }
+
+              default:
+                return error(GL_INVALID_ENUM);
+            }
        }
    }
    catch(std::bad_alloc&)