Vulkan: Set empty buffer to xfb descriptor set as an initial buffer

src/libANGLE/renderer/vulkan/ProgramVk.cpp

@@ -1400,11 +1400,25 @@ angle::Result ProgramVk::updateTransformFeedbackDescriptorSet(ContextVk *context
 void ProgramVk::updateTransformFeedbackDescriptorSetImpl(ContextVk *contextVk)
 {
     const gl::State &glState = contextVk->getState();
+    gl::TransformFeedback *transformFeedback = glState.getCurrentTransformFeedback();
+
     if (!hasTransformFeedbackOutput())
     {
-        // NOTE(syoussefi): a possible optimization is to skip this if transform feedback is
-        // paused.  However, even if paused, |updateDescriptorSet| must be called at least once for
-        // the sake of validation.
+        // If xfb has no output there is no need to update descriptor set.
+        return;
+    }
+    if (!glState.isTransformFeedbackActive())
+    {
+        // We set empty Buffer to xfb descriptor set because xfb descriptor set
+        // requires valid buffer bindings, even if they are empty buffer,
+        // otherwise Vulkan validation layer generates errors.
+        if (transformFeedback)
+        {
+            TransformFeedbackVk *transformFeedbackVk = vk::GetImpl(transformFeedback);
+            transformFeedbackVk->initDescriptorSet(
+                contextVk, mState.getTransformFeedbackBufferCount(), &mEmptyBuffer,
+                mDescriptorSets[kUniformsAndXfbDescriptorSetIndex]);
+        }
         return;
     }
 

src/libANGLE/renderer/vulkan/TransformFeedbackVk.cpp

@@ -133,6 +133,25 @@ void TransformFeedbackVk::addFramebufferDependency(ContextVk *contextVk,
     }
 }
 
+void TransformFeedbackVk::initDescriptorSet(ContextVk *contextVk,
+                                            size_t xfbBufferCount,
+                                            vk::BufferHelper *emptyBuffer,
+                                            VkDescriptorSet descSet) const
+{
+    std::array<VkDescriptorBufferInfo, gl::IMPLEMENTATION_MAX_TRANSFORM_FEEDBACK_BUFFERS>
+        descriptorBufferInfo;
+
+    for (size_t bufferIndex = 0; bufferIndex < xfbBufferCount; ++bufferIndex)
+    {
+        VkDescriptorBufferInfo &bufferInfo = descriptorBufferInfo[bufferIndex];
+        bufferInfo.buffer                  = emptyBuffer->getBuffer().getHandle();
+        bufferInfo.offset                  = 0;
+        bufferInfo.range                   = VK_WHOLE_SIZE;
+    }
+
+    writeDescriptorSet(contextVk, xfbBufferCount, descriptorBufferInfo.data(), descSet);
+}
+
 void TransformFeedbackVk::updateDescriptorSet(ContextVk *contextVk,
                                               const gl::ProgramState &programState,
                                               VkDescriptorSet descSet) const
@@ -165,20 +184,7 @@ void TransformFeedbackVk::updateDescriptorSet(ContextVk *contextVk,
         bufferInfo.range  = bufferRange.size + (bufferRange.offset - bufferRange.alignedOffset);
     }
 
-    VkDevice device = contextVk->getDevice();
-
-    VkWriteDescriptorSet writeDescriptorInfo = {};
-    writeDescriptorInfo.sType                = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
-    writeDescriptorInfo.dstSet               = descSet;
-    writeDescriptorInfo.dstBinding           = kXfbBindingIndexStart;
-    writeDescriptorInfo.dstArrayElement      = 0;
-    writeDescriptorInfo.descriptorCount      = static_cast<uint32_t>(xfbBufferCount);
-    writeDescriptorInfo.descriptorType       = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
-    writeDescriptorInfo.pImageInfo           = nullptr;
-    writeDescriptorInfo.pBufferInfo          = descriptorBufferInfo.data();
-    writeDescriptorInfo.pTexelBufferView     = nullptr;
-
-    vkUpdateDescriptorSets(device, 1, &writeDescriptorInfo, 0, nullptr);
+    writeDescriptorSet(contextVk, xfbBufferCount, descriptorBufferInfo.data(), descSet);
 }
 
 void TransformFeedbackVk::getBufferOffsets(ContextVk *contextVk,
@@ -238,4 +244,25 @@ void TransformFeedbackVk::onBeginOrEnd(const gl::Context *context)
     }
 }
 
+void TransformFeedbackVk::writeDescriptorSet(ContextVk *contextVk,
+                                             size_t xfbBufferCount,
+                                             VkDescriptorBufferInfo *pBufferInfo,
+                                             VkDescriptorSet descSet) const
+{
+    VkDevice device = contextVk->getDevice();
+
+    VkWriteDescriptorSet writeDescriptorInfo = {};
+    writeDescriptorInfo.sType                = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+    writeDescriptorInfo.dstSet               = descSet;
+    writeDescriptorInfo.dstBinding           = kXfbBindingIndexStart;
+    writeDescriptorInfo.dstArrayElement      = 0;
+    writeDescriptorInfo.descriptorCount      = static_cast<uint32_t>(xfbBufferCount);
+    writeDescriptorInfo.descriptorType       = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
+    writeDescriptorInfo.pImageInfo           = nullptr;
+    writeDescriptorInfo.pBufferInfo          = pBufferInfo;
+    writeDescriptorInfo.pTexelBufferView     = nullptr;
+
+    vkUpdateDescriptorSets(device, 1, &writeDescriptorInfo, 0, nullptr);
+}
+
 }  // namespace rx

src/libANGLE/renderer/vulkan/TransformFeedbackVk.h

@@ -45,6 +45,10 @@ class TransformFeedbackVk : public TransformFeedbackImpl
     void addFramebufferDependency(ContextVk *contextVk,
                                   const gl::ProgramState &programState,
                                   vk::FramebufferHelper *framebuffer) const;
+    void initDescriptorSet(ContextVk *contextVk,
+                           size_t xfbBufferCount,
+                           vk::BufferHelper *emptyBuffer,
+                           VkDescriptorSet descSet) const;
     void updateDescriptorSet(ContextVk *contextVk,
                              const gl::ProgramState &programState,
                              VkDescriptorSet descSet) const;
@@ -56,6 +60,10 @@ class TransformFeedbackVk : public TransformFeedbackImpl
 
   private:
     void onBeginOrEnd(const gl::Context *context);
+    void writeDescriptorSet(ContextVk *contextVk,
+                            size_t xfbBufferCount,
+                            VkDescriptorBufferInfo *pBufferInfo,
+                            VkDescriptorSet descSet) const;
 
     // Cached buffer properties for faster descriptor set update and offset calculation.
     struct BoundBufferRange

src/tests/deqp_support/deqp_gles3_test_expectations.txt

@@ -625,9 +625,6 @@
 // - Primitive restart with line loops:
 2672 VULKAN : dEQP-GLES3.functional.primitive_restart.*.line_loop.*instanced = SKIP
 
-// Misc failures:
-3681 VULKAN : dEQP-GLES3.functional.lifetime.attach.deleted_input.buffer_vertex_array = SKIP
-
 // Failures on newer NVIDIA drivers (411.95) and passes on older drivers (388.16).  Passes on 418.12 on Linux.
 2976 VULKAN NVIDIA : dEQP-GLES3.functional.shaders.invariance.* = FAIL
 // Fails on 431.02 NVIDIA driver