In GenerateMipmap, determine if texture is a compressed or depth texture via…

In GenerateMipmap, determine if texture is a compressed or depth texture via generic methods instead of from the typed class. Part of GenerateMipmap cleanups. TRAC #23959 Signed-off-by: Geoff Lang Signed-off-by: Shannon Woods

In GenerateMipmap, determine if texture is a compressed or depth texture via…
33f9c2ef · Jamie Madill · d3d2a342 · 33f9c2ef
Commit 33f9c2ef authored Oct 07, 2013 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 11 deletions

libGLESv2.cpp src/libGLESv2/libGLESv2.cpp +2 -11

No files found.
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -2206,8 +2206,6 @@ void __stdcall glGenerateMipmap(GLenum target)
        {
            gl::Texture *texture = NULL;
            GLint internalFormat = GL_NONE;
-            bool isCompressed = false;
-            bool isDepth = false;
            switch (target)
            {
@@ -2217,8 +2215,6 @@ void __stdcall glGenerateMipmap(GLenum target)
                    if (tex2d)
                    {
                        internalFormat = tex2d->getInternalFormat(0);
-                        isCompressed = tex2d->isCompressed(0);
-                        isDepth = tex2d->isDepth(0);
                        texture = tex2d;
                    }
                    break;
@@ -2230,8 +2226,6 @@ void __stdcall glGenerateMipmap(GLenum target)
                    if (texcube)
                    {
                        internalFormat = texcube->getInternalFormat(GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0);
-                        isCompressed = texcube->isCompressed(GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0);
-                        isDepth = false;
                        texture = texcube;
                    }
                    break;
@@ -2248,8 +2242,6 @@ void __stdcall glGenerateMipmap(GLenum target)
                    if (tex3D)
                    {
                        internalFormat = tex3D->getInternalFormat(0);
-                        isCompressed = tex3D->isCompressed(0);
-                        isDepth = tex3D->isDepth(0);
                        texture = tex3D;
                    }
                    break;
@@ -2266,8 +2258,6 @@ void __stdcall glGenerateMipmap(GLenum target)
                      if (tex2darr)
                      {
                          internalFormat = tex2darr->getInternalFormat(0);
-                          isCompressed = tex2darr->isCompressed(0);
-                          isDepth = tex2darr->isDepth(0);
                          texture = tex2darr;
                      }
                      break;
@@ -2284,7 +2274,8 @@ void __stdcall glGenerateMipmap(GLenum target)
            // Internally, all texture formats are sized so checking if the format
            // is color renderable and filterable will not fail.
-            if (isDepth || isCompressed ||
+            if (gl::IsDepthRenderingSupported(internalFormat, context) ||
+                gl::IsFormatCompressed(internalFormat, context->getClientVersion()) ||
                !gl::IsColorRenderingSupported(internalFormat, context) ||
                !gl::IsTextureFilteringSupported(internalFormat, context))
            {