Vulkan: add check for vertexAttributeInstanceRateZeroDivisor

Allow zero divisor for vertex attributes when
mVertexAttributeDivisorFeaturesmVertexAttributeDivisorFeatures.vertexAttributeInstanceRateZeroDivisor
is true.

Bug: b/439073246
Change-Id: I68705faffcefb38360f6fbcf5d937d1d902180aa
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6961233
Reviewed-by: Amirali Abdolrashidi <abdolrashidi@google.com>
Commit-Queue: Charlie Lao <cclao@google.com>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>

Author: cclao

src/libANGLE/renderer/vulkan/VertexArrayVk.cpp

@@ -313,21 +313,28 @@ VertexArrayVk::VertexArrayVk(ContextVk *contextVk,
       mVertexInputAttribDesc{},
       mCurrentElementArrayBuffer(nullptr),
       mLineLoopHelper(contextVk->getRenderer()),
-      mDirtyLineLoopTranslation(true),
-      mAllowZeroDivisor(!contextVk->getFeatures().supportsVertexInputDynamicState.enabled)
+      mDirtyLineLoopTranslation(true)
 {
     vk::BufferHelper &emptyBuffer = contextVk->getEmptyBuffer();
 
     mCurrentArrayBufferHandles.fill(emptyBuffer.getBuffer().getHandle());
     mCurrentArrayBufferOffsets.fill(0);
     mCurrentArrayBuffers.fill(&emptyBuffer);
 
-    GLuint divisor = mAllowZeroDivisor ? 0 : 1;
+    // Divisor value is ignored by the implementation when using VK_VERTEX_INPUT_RATE_VERTEX, but it
+    // is set to 1 to avoid a validation error due to a validation layer issue.
+    mZeroDivisor =
+        contextVk->getRenderer()->isVertexAttributeInstanceRateZeroDivisorAllowed() ? 0 : 1;
+
     for (uint32_t attribIndex = 0; attribIndex < mVertexInputBindingDesc.size(); attribIndex++)
     {
         mVertexInputBindingDesc[attribIndex] = VkVertexInputBindingDescription2EXT{
-            VK_STRUCTURE_TYPE_VERTEX_INPUT_BINDING_DESCRIPTION_2_EXT,    nullptr, attribIndex, 0,
-            static_cast<VkVertexInputRate>(VK_VERTEX_INPUT_RATE_VERTEX), divisor};
+            VK_STRUCTURE_TYPE_VERTEX_INPUT_BINDING_DESCRIPTION_2_EXT,
+            nullptr,
+            attribIndex,
+            0,
+            static_cast<VkVertexInputRate>(VK_VERTEX_INPUT_RATE_VERTEX),
+            mZeroDivisor};
     }
 
     for (uint32_t attribIndex = 0; attribIndex < mVertexInputAttribDesc.size(); attribIndex++)
@@ -1556,23 +1563,17 @@ ANGLE_INLINE void VertexArrayVk::setVertexInputBindingDescDivisor(vk::Renderer *
                                                                   size_t attribIndex,
                                                                   GLuint divisor)
 {
-    mVertexInputBindingDesc[attribIndex].divisor = divisor;
     if (divisor != 0)
     {
         mVertexInputBindingDesc[attribIndex].inputRate =
             static_cast<VkVertexInputRate>(VK_VERTEX_INPUT_RATE_INSTANCE);
+        mVertexInputBindingDesc[attribIndex].divisor = divisor;
     }
     else
     {
         mVertexInputBindingDesc[attribIndex].inputRate =
             static_cast<VkVertexInputRate>(VK_VERTEX_INPUT_RATE_VERTEX);
-        if (!mAllowZeroDivisor)
-        {
-            // Divisor value is ignored by the implementation when using
-            // VK_VERTEX_INPUT_RATE_VERTEX, but it is set to 1 to avoid a validation error
-            // due to a validation layer issue.
-            mVertexInputBindingDesc[attribIndex].divisor = 1;
-        }
+        mVertexInputBindingDesc[attribIndex].divisor = mZeroDivisor;
     }
 }
 }  // namespace rx

src/libANGLE/renderer/vulkan/VertexArrayVk.h

@@ -265,7 +265,8 @@ class VertexArrayVk : public VertexArrayImpl
     gl::VertexArray::DirtyBindingBits mBindingDirtyBitsRequiresPipelineUpdate;
     gl::VertexArray::DirtyAttribBits mAttribDirtyBitsRequiresPipelineUpdate;
 
-    bool mAllowZeroDivisor;
+    // This maybe 0 or 1 depends on feature bit
+    uint32_t mZeroDivisor;
 };
 }  // namespace rx
 

src/libANGLE/renderer/vulkan/vk_renderer.h

@@ -720,6 +720,12 @@ class Renderer : angle::NonCopyable
     uint32_t getPreferredVectorWidthDouble() const { return mPreferredVectorWidthDouble; }
     uint32_t getPreferredVectorWidthHalf() const { return mPreferredVectorWidthHalf; }
 
+    bool isVertexAttributeInstanceRateZeroDivisorAllowed() const
+    {
+        return !mFeatures.supportsVertexInputDynamicState.enabled ||
+               mVertexAttributeDivisorFeatures.vertexAttributeInstanceRateZeroDivisor == VK_TRUE;
+    }
+
   private:
     angle::Result setupDevice(vk::ErrorContext *context,
                               const angle::FeatureOverrides &featureOverrides,