Reland "Vulkan: Generate xfb support code in SPIR-V for extension path"

src/compiler/translator/TranslatorVulkan.cpp

@@ -933,9 +933,12 @@ bool TranslatorVulkan::translateImpl(TIntermBlock *root,
         }
 
         // Append a macro for transform feedback substitution prior to modifying depth.
-        if (!AppendTransformFeedbackOutputToMain(this, root, &getSymbolTable()))
+        if (compileOptions & SH_ADD_VULKAN_XFB_EMULATION_SUPPORT_CODE)
         {
-            return false;
+            if (!AppendTransformFeedbackOutputToMain(this, root, &getSymbolTable()))
+            {
+                return false;
+            }
         }
     }
 

src/libANGLE/renderer/glslang_wrapper_utils.cpp

@@ -516,35 +516,6 @@ bool IsFirstRegisterOfVarying(const gl::PackedVaryingRegister &varyingReg, bool
     return true;
 }
 
-// Calculates XFB layout qualifier arguments for each tranform feedback varying.  Stores calculated
-// values for the SPIR-V transformation.
-void GenerateTransformFeedbackExtensionOutputs(const gl::ProgramState &programState,
-                                               std::string *xfbShaderSource)
-{
-    const std::vector<gl::TransformFeedbackVarying> &tfVaryings =
-        programState.getLinkedTransformFeedbackVaryings();
-
-    std::string xfbOut;
-
-    for (uint32_t varyingIndex = 0; varyingIndex < tfVaryings.size(); ++varyingIndex)
-    {
-        const gl::TransformFeedbackVarying &tfVarying = tfVaryings[varyingIndex];
-        const std::string &tfVaryingName              = tfVarying.mappedName;
-
-        if (tfVaryingName == "gl_Position")
-        {
-            ASSERT(tfVarying.isBuiltIn());
-
-            // Add initialization code for the position varying.
-            xfbOut = sh::vk::kXfbExtensionPositionOutName;
-            xfbOut += " = " + tfVaryingName + ";\n";
-            break;
-        }
-    }
-
-    *xfbShaderSource = SubstituteTransformFeedbackMarkers(*xfbShaderSource, xfbOut);
-}
-
 void AssignAttributeLocations(const gl::ProgramExecutable &programExecutable,
                               gl::ShaderType shaderType,
                               ShaderInterfaceVariableInfoMap *variableInfoMapOut)
@@ -1714,6 +1685,7 @@ class SpirvTransformer final : public SpirvTransformerBase
     void writeOutputPrologue();
     void preRotateXY(uint32_t xId, uint32_t yId, uint32_t *rotatedXIdOut, uint32_t *rotatedYIdOut);
     void transformZToVulkanClipSpace(uint32_t zId, uint32_t wId, uint32_t *correctedZIdOut);
+    void writeTransformFeedbackExtensionOutput(uint32_t positionId);
 
     // Special flags:
     GlslangSpirvOptions mOptions;
@@ -1763,6 +1735,9 @@ class SpirvTransformer final : public SpirvTransformerBase
     PerVertexData mOutputPerVertex;
     PerVertexData mInputPerVertex;
 
+    // Ids needed to generate transform feedback support code.
+    uint32_t mTransformFeedbackExtensionPositionId = 0;
+
     // A handful of ids that are used to generate gl_Position transformation code (for pre-rotation
     // or depth correction).  These IDs are used to load/store gl_Position and apply modifications
     // and swizzles.
@@ -2164,6 +2139,12 @@ void SpirvTransformer::writeOutputPrologue()
 
     writeAccessChain(positionPointerId, mVec4OutTypePointerId, mOutputPerVertexId, mInt0Id);
     writeLoad(positionId, mVec4Id, positionPointerId);
+
+    if (mOptions.isTransformFeedbackStage && mTransformFeedbackExtensionPositionId != 0)
+    {
+        writeTransformFeedbackExtensionOutput(positionId);
+    }
+
     writeCompositeExtract(xId, mFloatId, positionId, 0);
     writeCompositeExtract(yId, mFloatId, positionId, 1);
     writeCompositeExtract(zId, mFloatId, positionId, 2);
@@ -2245,6 +2226,11 @@ void SpirvTransformer::transformZToVulkanClipSpace(uint32_t zId,
     writeFMul(*correctedZIdOut, mFloatId, zPlusWId, mFloatHalfId);
 }
 
+void SpirvTransformer::writeTransformFeedbackExtensionOutput(uint32_t positionId)
+{
+    writeStore(mTransformFeedbackExtensionPositionId, positionId);
+}
+
 void SpirvTransformer::visitDecorate(const uint32_t *instruction)
 {
     // SPIR-V 1.0 Section 3.32 Instructions, OpDecorate
@@ -2557,6 +2543,13 @@ void SpirvTransformer::visitVariable(const uint32_t *instruction)
         info.activeStages[mOptions.shaderType])
     {
         mHasTransformFeedbackOutput = true;
+
+        // If this is the special ANGLEXfbPosition variable, remember its id to be used for the
+        // ANGLEXfbPosition = gl_Position; assignment code generation.
+        if (strcmp(name, sh::vk::kXfbExtensionPositionOutName) == 0)
+        {
+            mTransformFeedbackExtensionPositionId = id;
+        }
     }
 }
 
@@ -4424,26 +4417,15 @@ void GlslangGetShaderSource(const GlslangSourceOptions &options,
     gl::ShaderType xfbStage = programState.getAttachedTransformFeedbackStage();
     std::string *xfbSource  = &(*shaderSourcesOut)[xfbStage];
 
-    // Write transform feedback output code.
-    if (!xfbSource->empty())
+    // Write transform feedback output code for emulation path
+    if (xfbStage == gl::ShaderType::Vertex && !xfbSource->empty() &&
+        options.emulateTransformFeedback)
     {
         if (!programState.getLinkedTransformFeedbackVaryings().empty())
         {
-            if (options.supportsTransformFeedbackExtension)
-            {
-                GenerateTransformFeedbackExtensionOutputs(programState, xfbSource);
-            }
-            else if (options.emulateTransformFeedback)
-            {
-                ASSERT(xfbStage == gl::ShaderType::Vertex);
-                GenerateTransformFeedbackEmulationOutputs(options, xfbStage, programState,
-                                                          programInterfaceInfo, xfbSource,
-                                                          variableInfoMapOut);
-            }
-            else
-            {
-                *xfbSource = SubstituteTransformFeedbackMarkers(*xfbSource, "");
-            }
+            GenerateTransformFeedbackEmulationOutputs(options, xfbStage, programState,
+                                                      programInterfaceInfo, xfbSource,
+                                                      variableInfoMapOut);
         }
         else
         {
@@ -4451,18 +4433,6 @@ void GlslangGetShaderSource(const GlslangSourceOptions &options,
         }
     }
 
-    std::string *tessEvalSources = &(*shaderSourcesOut)[gl::ShaderType::TessEvaluation];
-    if (xfbStage > gl::ShaderType::TessEvaluation && !tessEvalSources->empty())
-    {
-        *tessEvalSources = SubstituteTransformFeedbackMarkers(*tessEvalSources, "");
-    }
-
-    std::string *vertexSource = &(*shaderSourcesOut)[gl::ShaderType::Vertex];
-    if (xfbStage > gl::ShaderType::Vertex && !vertexSource->empty())
-    {
-        *vertexSource = SubstituteTransformFeedbackMarkers(*vertexSource, "");
-    }
-
     gl::ShaderType frontShaderType = gl::ShaderType::InvalidEnum;
 
     for (const gl::ShaderType shaderType : programState.getExecutable().getLinkedShaderStages())

src/libANGLE/renderer/vulkan/ShaderVk.cpp

@@ -86,7 +86,8 @@ std::shared_ptr<WaitableCompileEvent> ShaderVk::compile(const gl::Context *conte
     {
         compileOptions |= SH_ADD_VULKAN_XFB_EXTENSION_SUPPORT_CODE;
     }
-    else if (contextVk->getFeatures().emulateTransformFeedback.enabled)
+    else if (mState.getShaderType() == gl::ShaderType::Vertex &&
+             contextVk->getFeatures().emulateTransformFeedback.enabled)
     {
         compileOptions |= SH_ADD_VULKAN_XFB_EMULATION_SUPPORT_CODE;
     }

src/libANGLE/renderer/vulkan/vk_caps_utils.cpp

@@ -921,6 +921,7 @@ void RendererVk::ensureCapsInitialized() const
     {
         // TODO: geometry shader support is incomplete.  http://anglebug.com/3571
         mNativeExtensions.geometryShader =
+            mFeatures.supportsTransformFeedbackExtension.enabled &&
             mFeatures.exposeNonConformantExtensionsAndVersions.enabled;
         mNativeCaps.maxFramebufferLayers = LimitToInt(limitsVk.maxFramebufferLayers);
         mNativeCaps.layerProvokingVertex = GL_LAST_VERTEX_CONVENTION_EXT;

src/tests/deqp_support/deqp_gles31_test_expectations.txt

@@ -182,8 +182,6 @@
 // Geometry shader support:
 5430 VULKAN : dEQP-GLES31.functional.geometry_shading.query.primitives_generated_* = FAIL
 5452 VULKAN : dEQP-GLES31.functional.geometry_shading.layered.layer_provoking_vertex_* = FAIL
-3571 VULKAN : dEQP-GLES31.functional.geometry_shading.*transform_feedback* = SKIP
-3571 VULKAN : dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.*geo* = SKIP
 
 ////
 //// AMD Vulkan expectations