Disable sampler/texture type validation

The sampler/texture type validation validation added in https://chromium-review.googlesource.com/c/1377611 did not correctly consider sampler objects. This is a minimal change to disable the validation temporarily, which I intend to merge back to 74. A fix for the validation is in progress at: https://chromium-review.googlesource.com/c/angle/angle/+/1522364 Bug: 940080, 809237 Change-Id: If8a1ae46af7daf23cd92ccb8a985329dfd404dc9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1524475 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> (cherry picked from commit 3ce7f960) Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1529524Reviewed-by: James Darpinian <jdarpinian@chromium.org>

Disable sampler/texture type validation
96ab4909 · James Darpinian · f880e23b · 96ab4909 · 96ab4909
Commit 96ab4909 authored Mar 14, 2019 by James Darpinian
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

validationES.cpp src/libANGLE/validationES.cpp +0 -5

StateChangeTest.cpp src/tests/gl_tests/StateChangeTest.cpp +2 -0

No files found.
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -2733,11 +2733,6 @@ const char *ValidateDrawStates(Context *context)
        // Do some additonal WebGL-specific validation
        if (extensions.webglCompatibility)
        {
-            if (!state.validateSamplerFormats())
-            {
-                return kSamplerFormatMismatch;
-            }
            const TransformFeedback *transformFeedbackObject = state.getCurrentTransformFeedback();
            if (transformFeedbackObject != nullptr && transformFeedbackObject->isActive() &&
                transformFeedbackObject->buffersBoundForOtherUse())

--- a/src/tests/gl_tests/StateChangeTest.cpp
+++ b/src/tests/gl_tests/StateChangeTest.cpp
@@ -3085,6 +3085,8 @@ void main()
 // Test sampler format validation caching works.
 TEST_P(WebGL2ValidationStateChangeTest, SamplerFormatCache)
 {
+    // TODO(jdarpinian): Re-enable this test when fixing http://crbug.com/940080
+    ANGLE_SKIP_TEST_IF(true);
    constexpr char kFS[] = R"(#version 300 es
 precision mediump float;
 uniform sampler2D sampler;