Vulkan: varyings of type Matrix/Struct can't use components.

- This is not yet fixing all issues for these tests but it does get us further in the execution of the test case. Bug: angleproject:2581 Change-Id: I96510e013ccc87fd21bce6823e1278ed9ff60739 Reviewed-on: https://chromium-review.googlesource.com/1079267Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Luc Ferron <lucferron@chromium.org>

Vulkan: varyings of type Matrix/Struct can't use components.
78ee3423 · Luc Ferron · Commit Bot · 2274b652 · 78ee3423
Commit 78ee3423 authored May 30, 2018 by Luc Ferron Committed by Commit Bot May 31, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

GlslangWrapper.cpp src/libANGLE/renderer/vulkan/GlslangWrapper.cpp +8 -2

No files found.
--- a/src/libANGLE/renderer/vulkan/GlslangWrapper.cpp
+++ b/src/libANGLE/renderer/vulkan/GlslangWrapper.cpp
@@ -150,8 +150,14 @@ gl::LinkResult GlslangWrapper::linkProgram(const gl::Context *glContext,
    {
        const auto &varying        = *varyingReg.packedVarying;

-        std::string locationString = "location = " + Str(varyingReg.registerRow) +
-                                     ", component = " + Str(varyingReg.registerColumn);
+        std::string locationString = "location = " + Str(varyingReg.registerRow);
+        if (varyingReg.registerColumn > 0)
+        {
+            ASSERT(!varying.varying->isStruct());
+            ASSERT(!gl::IsMatrixType(varying.varying->type));
+            locationString += ", component = " + Str(varyingReg.registerColumn);
+        }
+
        InsertLayoutSpecifierString(&vertexSource, varying.varying->name, locationString);
        InsertLayoutSpecifierString(&fragmentSource, varying.varying->name, locationString);