Fix the CopyTex validation logic for sized types

Previously we allowed copies to a sized format only if the depth of each component matched (including 0 depth). Now we require that the bit depth of non-empty component matches. BUG=605775 Change-Id: If8abab886b0da5a1c8e89adabf3809f928dcedce Reviewed-on: https://chromium-review.googlesource.com/340382Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org>

Fix the CopyTex validation logic for sized types
76287680 · Corentin Wallez · Commit Bot · a314b61c · 76287680
Commit 76287680 authored Apr 25, 2016 by Corentin Wallez Committed by Commit Bot May 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 6 deletions

validationES3.cpp src/libANGLE/validationES3.cpp +16 -6

No files found.
--- a/src/libANGLE/validationES3.cpp
+++ b/src/libANGLE/validationES3.cpp
@@ -728,6 +728,11 @@ static CopyConversionSet BuildValidES3CopyTexImageCombinations()
    return set;
 }
+static bool EqualOrFirstZero(GLuint first, GLuint second)
+{
+    return first == 0 || first == second;
+}
 static bool IsValidES3CopyTexImageCombination(GLenum textureInternalFormat, GLenum frameBufferInternalFormat, GLuint readBufferHandle)
 {
    const InternalFormat &textureInternalFormatInfo = GetInternalFormatInfo(textureInternalFormat);
@@ -832,12 +837,17 @@ static bool IsValidES3CopyTexImageCombination(GLenum textureInternalFormat, GLen
        if (textureInternalFormatInfo.pixelBytes > 0)
        {
-            // Section 3.8.5 of the GLES 3.0.3 spec, pg 139, requires that, if the destination format is sized,
+            // Section 3.8.5 of the GLES 3.0.3 spec, pg 139, requires that, if the destination
-            // component sizes of the source and destination formats must exactly match
+            // format is sized, component sizes of the source and destination formats must exactly
-            if (textureInternalFormatInfo.redBits   != sourceEffectiveFormat->redBits   ||
+            // match if the destination format exists.
-                textureInternalFormatInfo.greenBits != sourceEffectiveFormat->greenBits ||
+            if (!EqualOrFirstZero(textureInternalFormatInfo.redBits,
-                textureInternalFormatInfo.blueBits  != sourceEffectiveFormat->blueBits  ||
+                                  sourceEffectiveFormat->redBits) ||
-                textureInternalFormatInfo.alphaBits != sourceEffectiveFormat->alphaBits)
+                !EqualOrFirstZero(textureInternalFormatInfo.greenBits,
+                                  sourceEffectiveFormat->greenBits) ||
+                !EqualOrFirstZero(textureInternalFormatInfo.blueBits,
+                                  sourceEffectiveFormat->blueBits) ||
+                !EqualOrFirstZero(textureInternalFormatInfo.alphaBits,
+                                  sourceEffectiveFormat->alphaBits))
            {
                return false;
            }