Vulkan: Support vertex attribute aliasing for matrix types

src/libANGLE/renderer/glslang_wrapper_utils.h

@@ -88,13 +88,10 @@ struct ShaderInterfaceVariableInfo
     bool useRelaxedPrecision = false;
     // Indicate if varying is input or output
     bool varyingIsOutput = false;
-    // For vertex attributes, this is the number of components.  This is used by the vertex
-    // attribute aliasing transformation only.
+    // For vertex attributes, this is the number of components / locations.  These are used by the
+    // vertex attribute aliasing transformation only.
     uint8_t attributeComponentCount = 0;
-    // Indicate whether this is a vertex attribute of matrix type.  This is temporarily used to
-    // avoid handling aliasing matrix vertex attributes as they are currently not supported.
-    // TODO: remove when support for aliasing matrix attributes is added.  http://anglebug.com/4249
-    bool isMatrixAttribute = false;
+    uint8_t attributeLocationCount  = 0;
 };
 
 // TODO: http://anglebug.com/4524: Need a different hash key than a string, since

src/libANGLE/renderer/vulkan/ProgramExecutableVk.cpp

@@ -226,7 +226,7 @@ std::unique_ptr<rx::LinkEvent> ProgramExecutableVk::load(gl::BinaryInputStream *
             info->useRelaxedPrecision     = stream->readBool();
             info->varyingIsOutput         = stream->readBool();
             info->attributeComponentCount = stream->readInt<uint8_t>();
-            info->isMatrixAttribute       = stream->readBool();
+            info->attributeLocationCount  = stream->readInt<uint8_t>();
         }
     }
 
@@ -253,7 +253,7 @@ void ProgramExecutableVk::save(gl::BinaryOutputStream *stream)
             stream->writeInt<uint8_t>(it.second.useRelaxedPrecision);
             stream->writeInt<uint8_t>(it.second.varyingIsOutput);
             stream->writeInt<uint8_t>(it.second.attributeComponentCount);
-            stream->writeInt<uint8_t>(it.second.isMatrixAttribute);
+            stream->writeInt<uint8_t>(it.second.attributeLocationCount);
         }
     }
 }

src/tests/deqp_support/deqp_gles2_test_expectations.txt

@@ -427,9 +427,6 @@
 // Fails on 431.02 NVIDIA driver
 3748 VULKAN WIN NVIDIA : dEQP-GLES2.functional.fbo.render.repeated_clear.* = FAIL
 
-// Vertex attribute aliasing generates invalid SPIRV
-4249 VULKAN : dEQP-GLES2.functional.attribute_location.bind_aliasing.*mat* = SKIP
-
 // Fails on Metal, some of filtering tests fail when MSAA is off and pass when MSAA is on. Some
 // tests are opposite. The filtering tests mostly fail on a few pixels.
 4235 METAL AMD : dEQP-GLES2.functional.shaders.texture_functions.vertex.texturecubelod = FAIL
@@ -501,9 +498,6 @@
 // Line loop emulation bug, suspected to be caused by wrong segment order
 4853 METAL AMD : dEQP-GLES2.functional.draw.draw_arrays.line_loop.multiple_attributes = FAIL
 
-// Vertex attribute aliasing generates invalid SPIRV
-4249 METAL : dEQP-GLES2.functional.attribute_location.bind_aliasing.*mat* = SKIP
-
 // Globally disable Metal testing on Intel & NVIDIA for now
 4235 METAL INTEL : dEQP-GLES2.* = SKIP
 4235 METAL NVIDIA : dEQP-GLES2.* = SKIP

src/tests/gl_tests/VertexAttributeTest.cpp

@@ -3202,11 +3202,6 @@ void main()
 // don't allow vertex attribute aliasing.  This test includes matrix types.
 TEST_P(VertexAttributeTest, AliasingMatrixAttribLocations)
 {
-    // TODO(syoussefi): Support vertex attribute aliasing on Vulkan.  The metal backend will
-    // automatically be fixed in the process.  http://anglebug.com/4249
-    ANGLE_SKIP_TEST_IF(IsVulkan());
-    ANGLE_SKIP_TEST_IF(IsMetal());
-
     // http://anglebug.com/5180
     ANGLE_SKIP_TEST_IF(IsAndroid() && IsOpenGL());