Return valid qualifier after error

Using EvqLast for the variable causes us to hit an assert in sh::getQualifierString when we try to print a later error message. Just use the appropriate qualifier regardless that it's not valid for a compute shader, we've output the error. Bug: angleproject:4187 Change-Id: If6fa5dea07d7b6e0d3307485f41d59c5ea7f1c4c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1948525 Commit-Queue: Courtney Goeltzenleuchter <courtneygo@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Cody Northrop <cnorthrop@google.com>

Return valid qualifier after error
4ad8b55e · Courtney Goeltzenleuchter · Commit Bot · 1ed23f2d · 4ad8b55e · 4ad8b55e
Commit 4ad8b55e authored Dec 03, 2019 by Courtney Goeltzenleuchter Committed by Commit Bot Dec 11, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

ParseContext.cpp src/compiler/translator/ParseContext.cpp +1 -1

deqp_khr_gles31_test_expectations.txt src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt +0 -1

No files found.
--- a/src/compiler/translator/ParseContext.cpp
+++ b/src/compiler/translator/ParseContext.cpp
@@ -4731,7 +4731,7 @@ TStorageQualifierWrapper *TParseContext::parseOutQualifier(const TSourceLoc &loc
        case GL_COMPUTE_SHADER:
        {
            error(loc, "storage qualifier isn't supported in compute shaders", "out");
-            return new TStorageQualifierWrapper(EvqLast, loc);
+            return new TStorageQualifierWrapper(EvqOut, loc);
        }
        case GL_GEOMETRY_SHADER_EXT:
        {

--- a/src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt
@@ -49,7 +49,6 @@
 4190 VULKAN : KHR-GLES31.core.compute_shader.pipeline-compute-chain = SKIP
 4191 VULKAN : KHR-GLES31.core.compute_shader.resources-max = FAIL
 4192 VULKAN : KHR-GLES31.core.compute_shader.pipeline-post-xfb = FAIL
-4187 VULKAN : KHR-GLES31.core.compute_shader.glsl-compile-time-errors = SKIP
 4194 VULKAN PIXEL2ORXL : KHR-GLES31.core.compute_shader.resource-ubo = FAIL
 4194 VULKAN PIXEL2ORXL : KHR-GLES31.core.compute_shader.built-in-variables = FAIL