Vulkan: Assign locations to varyings.

src/compiler/translator/OutputVulkanGLSL.cpp

@@ -44,7 +44,8 @@ void TOutputVulkanGLSL::writeLayoutQualifier(TIntermTyped *variable)
 
     bool needsCustomLayout =
         (type.getQualifier() == EvqAttribute || type.getQualifier() == EvqFragmentOut ||
-         type.getQualifier() == EvqVertexIn || IsSampler(type.getBasicType()));
+         type.getQualifier() == EvqVertexIn || IsVarying(type.getQualifier()) ||
+         IsSampler(type.getBasicType()));
 
     if (!NeedsToWriteLayoutQualifier(type) && !needsCustomLayout)
     {

src/libANGLE/renderer/vulkan/GlslangWrapper.cpp

@@ -20,6 +20,7 @@
 
 #include "common/string_utils.h"
 #include "common/utilities.h"
+#include "libANGLE/ProgramLinkedResources.h"
 
 namespace rx
 {
@@ -35,8 +36,7 @@ void InsertLayoutSpecifierString(std::string *shaderString,
     searchStringBuilder << "@@ LAYOUT-" << variableName << " @@";
     std::string searchString = searchStringBuilder.str();
 
-    bool success = angle::ReplaceSubstring(shaderString, searchString, layoutString);
-    ASSERT(success);
+    angle::ReplaceSubstring(shaderString, searchString, layoutString);
 }
 
 }  // anonymous namespace
@@ -85,6 +85,7 @@ GlslangWrapper::~GlslangWrapper()
 
 gl::LinkResult GlslangWrapper::linkProgram(const gl::Context *glContext,
                                            const gl::ProgramState &programState,
+                                           const gl::ProgramLinkedResources &resources,
                                            std::vector<uint32_t> *vertexCodeOut,
                                            std::vector<uint32_t> *fragmentCodeOut)
 {
@@ -106,6 +107,16 @@ gl::LinkResult GlslangWrapper::linkProgram(const gl::Context *glContext,
         InsertLayoutSpecifierString(&vertexSource, attribute.name, locationString);
     }
 
+    // Assign varying locations.
+    // TODO(jmadill): This might need to be redone.
+    for (const auto &varyingReg : resources.varyingPacking.getRegisterList())
+    {
+        const auto &varying        = *varyingReg.packedVarying;
+        std::string locationString = "location = " + Str(varyingReg.registerRow);
+        InsertLayoutSpecifierString(&vertexSource, varying.varying->name, locationString);
+        InsertLayoutSpecifierString(&fragmentSource, varying.varying->name, locationString);
+    }
+
     // Bind the default uniforms for vertex and fragment shaders.
     // See corresponding code in OutputVulkanGLSL.cpp.
     std::stringstream searchStringBuilder;

src/libANGLE/renderer/vulkan/GlslangWrapper.h

@@ -25,6 +25,7 @@ class GlslangWrapper : public gl::RefCountObjectNoID
 
     gl::LinkResult linkProgram(const gl::Context *glContext,
                                const gl::ProgramState &programState,
+                               const gl::ProgramLinkedResources &resources,
                                std::vector<uint32_t> *vertexCodeOut,
                                std::vector<uint32_t> *fragmentCodeOut);
 

src/libANGLE/renderer/vulkan/ProgramVk.cpp

@@ -212,8 +212,9 @@ gl::LinkResult ProgramVk::link(const gl::Context *glContext,
     std::vector<uint32_t> vertexCode;
     std::vector<uint32_t> fragmentCode;
     bool linkSuccess = false;
-    ANGLE_TRY_RESULT(glslangWrapper->linkProgram(glContext, mState, &vertexCode, &fragmentCode),
-                     linkSuccess);
+    ANGLE_TRY_RESULT(
+        glslangWrapper->linkProgram(glContext, mState, resources, &vertexCode, &fragmentCode),
+        linkSuccess);
     if (!linkSuccess)
     {
         return false;