Fix incorrect validation of ES3 internal format/format/type combinations.

* Fix wrong internal format being passed to ValidateTexImageFormatCombination. * Fix ValidateTexImageFormatCombination validating the format instead of internal format for general support. * Fix support checks for format and type comparing with wrong format and type fields. * Add an early-out in format and type check loop to reduce iterations. BUG=angle:658 Change-Id: I05e1b9f58b2e5ac4b5e1c0fa5a45cf37fb6a4ccd Reviewed-on: https://chromium-review.googlesource.com/210884Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>

Fix incorrect validation of ES3 internal format/format/type combinations.
baadf23a · Geoff Lang · eb10f1c8 · baadf23a
Commit baadf23a authored Aug 04, 2014 by Geoff Lang
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 4 deletions

validationES3.cpp src/libGLESv2/validationES3.cpp +10 -4

No files found.
--- a/src/libGLESv2/validationES3.cpp
+++ b/src/libGLESv2/validationES3.cpp
@@ -222,7 +222,7 @@ static bool ValidateTexImageFormatCombination(gl::Context *context, GLenum inter
 {
    // Note: dEQP 2013.4 expects an INVALID_VALUE error for TexImage3D with an invalid
    // internal format. (dEQP-GLES3.functional.negative_api.texture.teximage3d)
-    const gl::InternalFormat &formatInfo = gl::GetInternalFormatInfo(format);
+    const gl::InternalFormat &formatInfo = gl::GetInternalFormatInfo(internalFormat);
    if (!formatInfo.textureSupport(context->getClientVersion(), context->getExtensions()))
    {
        return gl::error(GL_INVALID_ENUM, false);
@@ -239,14 +239,20 @@ static bool ValidateTexImageFormatCombination(gl::Context *context, GLenum inter
        {
            const gl::InternalFormat &info = gl::GetInternalFormatInfo(i->internalFormat);
            bool supported = info.textureSupport(context->getClientVersion(), context->getExtensions());
-            if (supported && formatInfo.type == type)
+            if (supported && i->type == type)
            {
                typeSupported = true;
            }
-            if (supported && formatInfo.format == format)
+            if (supported && i->format == format)
            {
                formatSupported = true;
            }
+            // Early-out if both type and format are supported now
+            if (typeSupported && formatSupported)
+            {
+                break;
+            }
        }
    }
@@ -439,7 +445,7 @@ bool ValidateES3TexImageParameters(gl::Context *context, GLenum target, GLint le
    }
    else
    {
-        if (!ValidateTexImageFormatCombination(context, internalformat, format, type))
+        if (!ValidateTexImageFormatCombination(context, actualInternalFormat, format, type))
        {
            return false;
        }