Vulkan: Add support for GL_IMAGE_FORMAT_COMPATIBILITY_TYPE

For some reason, this wasn't implemented when texture image load and store was implemented. Bug: angleproject:4311 Change-Id: I24c508660ad7eb3aa944601175803751b54ce0ff Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2011324Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Ian Elliott <ianelliott@google.com>

Vulkan: Add support for GL_IMAGE_FORMAT_COMPATIBILITY_TYPE
7f8b6e3f · Ian Elliott · Commit Bot · 8075d3ed · 7f8b6e3f · 7f8b6e3f
Commit 7f8b6e3f authored Jan 20, 2020 by Ian Elliott Committed by Commit Bot Jan 21, 2020
Showing with 4 additions and 1 deletion

queryutils.cpp src/libANGLE/queryutils.cpp +3 -0

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

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

No files found.
--- a/src/libANGLE/queryutils.cpp
+++ b/src/libANGLE/queryutils.cpp
@@ -320,6 +320,9 @@ void QueryTexParameterBase(const Context *context,
            *params = CastFromGLintStateValue<ParamType>(
                pname, texture->getImplementationColorReadType(context));
            break;
+        case GL_IMAGE_FORMAT_COMPATIBILITY_TYPE:
+            *params = GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE;
+            break;
        default:
            UNREACHABLE();
            break;

--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -5290,6 +5290,7 @@ bool ValidateGetTexParameterBase(Context *context,
            break;

        case GL_DEPTH_STENCIL_TEXTURE_MODE:
+        case GL_IMAGE_FORMAT_COMPATIBILITY_TYPE:
            if (context->getClientVersion() < Version(3, 1))
            {
                context->validationError(GL_INVALID_ENUM, kEnumRequiresGLES31);

--- a/src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt
@@ -60,7 +60,6 @@

 // Image related failures

-4311 : KHR-GLES31.core.shader_image_load_store.basic-api-texParam = FAIL
 4314 : KHR-GLES31.core.shader_image_load_store.basic-glsl-earlyFragTests = FAIL
 4316 : KHR-GLES31.core.shader_image_load_store.negative-linkErrors = FAIL
 4312 VULKAN : KHR-GLES31.core.shader_image_load_store.basic-glsl-misc-fs = SKIP