Fix compressed formats breaking swizzle bits checks.

We defautled to zero max bit depth, which breaks the swizzle format lookup. Change-Id: I4d1cd8bcfb79db3460950fa22630c259f90fa432 Reviewed-on: https://chromium-review.googlesource.com/181481Reviewed-by: Jamie Madill <jmadill@google.com> Commit-Queue: Jamie Madill <jmadill@google.com> Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Fix compressed formats breaking swizzle bits checks.
80b5a55e · Jamie Madill · 44cc79f6 · 80b5a55e
Commit 80b5a55e authored Jan 03, 2014 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 7 deletions

formatutils11.cpp src/libGLESv2/renderer/d3d11/formatutils11.cpp +17 -7

No files found.
--- a/src/libGLESv2/renderer/d3d11/formatutils11.cpp
+++ b/src/libGLESv2/renderer/d3d11/formatutils11.cpp
@@ -789,13 +789,23 @@ static const SwizzleInfoMap &GetSwizzleInfoMap()
 static const SwizzleFormatInfo GetSwizzleFormatInfo(GLint internalFormat, GLuint clientVersion)
 {
    // Get the maximum sized component
-    unsigned int maxBits = 0;
+    unsigned int maxBits = 1;
-    maxBits = std::max(maxBits, gl::GetAlphaBits(    internalFormat, clientVersion));
-    maxBits = std::max(maxBits, gl::GetRedBits(      internalFormat, clientVersion));
+    if (gl::IsFormatCompressed(internalFormat, clientVersion))
-    maxBits = std::max(maxBits, gl::GetGreenBits(    internalFormat, clientVersion));
+    {
-    maxBits = std::max(maxBits, gl::GetBlueBits(     internalFormat, clientVersion));
+        maxBits = (gl::GetCompressedBlockWidth(internalFormat, clientVersion) * gl::GetCompressedBlockHeight(internalFormat, clientVersion)) /
-    maxBits = std::max(maxBits, gl::GetLuminanceBits(internalFormat, clientVersion));
+                  (gl::GetPixelBytes(internalFormat, clientVersion) * 8);
-    maxBits = std::max(maxBits, gl::GetDepthBits(    internalFormat, clientVersion));
+    }
+    else
+    {
+        maxBits = std::max(maxBits, gl::GetAlphaBits(    internalFormat, clientVersion));
+        maxBits = std::max(maxBits, gl::GetRedBits(      internalFormat, clientVersion));
+        maxBits = std::max(maxBits, gl::GetGreenBits(    internalFormat, clientVersion));
+        maxBits = std::max(maxBits, gl::GetBlueBits(     internalFormat, clientVersion));
+        maxBits = std::max(maxBits, gl::GetLuminanceBits(internalFormat, clientVersion));
+        maxBits = std::max(maxBits, gl::GetDepthBits(    internalFormat, clientVersion));
+    }
    maxBits = roundUp(maxBits, 8U);
    GLenum componentType = gl::GetComponentType(internalFormat, clientVersion);