Fix image linking not verifying same format

Bug: angleproject:4316 Change-Id: I7508c0f9b0546bf3a23f819de49e7a91a74b6bc9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2018046Reviewed-by: Ian Elliott <ianelliott@google.com> Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

Fix image linking not verifying same format
1d480fcc · Shahbaz Youssefi · Commit Bot · 4e98dfea · 1d480fcc · 1d480fcc
Commit 1d480fcc authored Jan 23, 2020 by Shahbaz Youssefi Committed by Commit Bot Jan 24, 2020
Showing with 8 additions and 2 deletions

Program.cpp src/libANGLE/Program.cpp +6 -0

Program.h src/libANGLE/Program.h +2 -1

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

No files found.
--- a/src/libANGLE/Program.cpp
+++ b/src/libANGLE/Program.cpp
@@ -472,6 +472,8 @@ const char *GetLinkMismatchErrorString(LinkMismatchError linkError)
            return "Offset layout qualifier";
        case LinkMismatchError::INSTANCE_NAME_MISMATCH:
            return "Instance name qualifier";
+        case LinkMismatchError::FORMAT_MISMATCH:
+            return "Format qualifier";
        case LinkMismatchError::LAYOUT_QUALIFIER_MISMATCH:
            return "Layout qualifier";
@@ -3938,6 +3940,10 @@ LinkMismatchError Program::LinkValidateVariablesBase(const sh::ShaderVariable &v
    {
        return LinkMismatchError::STRUCT_NAME_MISMATCH;
    }
+    if (variable1.imageUnitFormat != variable2.imageUnitFormat)
+    {
+        return LinkMismatchError::FORMAT_MISMATCH;
+    }
    if (variable1.fields.size() != variable2.fields.size())
    {

--- a/src/libANGLE/Program.h
+++ b/src/libANGLE/Program.h
@@ -77,10 +77,11 @@ enum class LinkMismatchError
    LOCATION_MISMATCH,
    OFFSET_MISMATCH,
    INSTANCE_NAME_MISMATCH,
+    FORMAT_MISMATCH,
    // Interface block specific
    LAYOUT_QUALIFIER_MISMATCH,
-    MATRIX_PACKING_MISMATCH
+    MATRIX_PACKING_MISMATCH,
 };
 class InfoLog : angle::NonCopyable

--- 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
-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
 4312 VULKAN : KHR-GLES31.core.shader_image_load_store.advanced-sync-imageAccess = SKIP
 4312 VULKAN : KHR-GLES31.core.shader_image_load_store.advanced-allMips-fs = SKIP