Fix image linking not verifying same format

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())
     {

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

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