commit a56467e082366aeb2580a719412494a323178feb
author Jamie Madill <jmadill@chromium.org> Wed Apr 11 16:19:41 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Apr 12 11:52:23 2018 +0000
tree 4430a0fc8506349c63735c2464d086e0981df465
parent 6d5af92b99b2df4c9b3876a0b43275a51131a68c

VertexArray: Use switch macro for faster iteration.

Has a small but noticeable impact on performance on a microbenchmark.
Seems to improve a synthetic score by about 1%. Should have a very
small improvement in real-world performance.

Note that the odd formatting is an idiosyncrasy of clang-format.

Bug: angleproject:2389
Change-Id: I888bf101c6d8b80a0fbafdb9c5a84205c9c8fee6
Reviewed-on: https://chromium-review.googlesource.com/962963
Reviewed-by: Luc Ferron <lucferron@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/vulkan/VertexArrayVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp b/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
index aa573fe..369fcec 100644
--- a/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
+++ b/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
@@ -144,6 +144,22 @@
     return gl::NoError();
 }
 
+#define ANGLE_VERTEX_DIRTY_ATTRIB_FUNC(INDEX)                                          \
+    case gl::VertexArray::DIRTY_BIT_ATTRIB_0 + INDEX:                                  \
+        syncDirtyAttrib(attribs[INDEX], bindings[attribs[INDEX].bindingIndex], INDEX); \
+        invalidatePipeline = true;                                                     \
+        break;
+
+#define ANGLE_VERTEX_DIRTY_BINDING_FUNC(INDEX)                                         \
+    case gl::VertexArray::DIRTY_BIT_BINDING_0 + INDEX:                                 \
+        syncDirtyAttrib(attribs[INDEX], bindings[attribs[INDEX].bindingIndex], INDEX); \
+        invalidatePipeline = true;                                                     \
+        break;
+
+#define ANGLE_VERTEX_DIRTY_BUFFER_DATA_FUNC(INDEX)         \
+    case gl::VertexArray::DIRTY_BIT_BUFFER_DATA_0 + INDEX: \
+        break;
+
 gl::Error VertexArrayVk::syncState(const gl::Context *context,
                                    const gl::VertexArray::DirtyBits &dirtyBits,
                                    const gl::VertexArray::DirtyAttribBitsArray &attribBits,
@@ -192,46 +208,13 @@
                 mDirtyLineLoopTranslation = true;
                 break;
 
+                ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_ATTRIB_FUNC);
+                ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_BINDING_FUNC);
+                ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_BUFFER_DATA_FUNC);
+
             default:
-            {
-                size_t attribIndex = gl::VertexArray::GetVertexIndexFromDirtyBit(dirtyBit);
-
-                // Invalidate the input description for pipelines.
-                mDirtyPackedInputs.set(attribIndex);
-
-                const auto &attrib  = attribs[attribIndex];
-                const auto &binding = bindings[attrib.bindingIndex];
-
-                if (attrib.enabled)
-                {
-                    gl::Buffer *bufferGL = binding.getBuffer().get();
-
-                    if (bufferGL)
-                    {
-                        BufferVk *bufferVk                        = vk::GetImpl(bufferGL);
-                        mCurrentArrayBufferResources[attribIndex] = bufferVk;
-                        mCurrentArrayBufferHandles[attribIndex] =
-                            bufferVk->getVkBuffer().getHandle();
-                        mClientMemoryAttribs.reset(attribIndex);
-                    }
-                    else
-                    {
-                        mCurrentArrayBufferResources[attribIndex] = nullptr;
-                        mCurrentArrayBufferHandles[attribIndex]   = VK_NULL_HANDLE;
-                        mClientMemoryAttribs.set(attribIndex);
-                    }
-                    // TODO(jmadill): Offset handling.  Assume zero for now.
-                    mCurrentArrayBufferOffsets[attribIndex] = 0;
-                }
-                else
-                {
-                    mClientMemoryAttribs.reset(attribIndex);
-                    UNIMPLEMENTED();
-                }
-
-                invalidatePipeline = true;
+                UNREACHABLE();
                 break;
-            }
         }
     }
 
@@ -244,6 +227,40 @@
     return gl::NoError();
 }
 
+void VertexArrayVk::syncDirtyAttrib(const gl::VertexAttribute &attrib,
+                                    const gl::VertexBinding &binding,
+                                    size_t attribIndex)
+{
+    // Invalidate the input description for pipelines.
+    mDirtyPackedInputs.set(attribIndex);
+
+    if (attrib.enabled)
+    {
+        gl::Buffer *bufferGL = binding.getBuffer().get();
+
+        if (bufferGL)
+        {
+            BufferVk *bufferVk                        = vk::GetImpl(bufferGL);
+            mCurrentArrayBufferResources[attribIndex] = bufferVk;
+            mCurrentArrayBufferHandles[attribIndex]   = bufferVk->getVkBuffer().getHandle();
+            mClientMemoryAttribs.reset(attribIndex);
+        }
+        else
+        {
+            mCurrentArrayBufferResources[attribIndex] = nullptr;
+            mCurrentArrayBufferHandles[attribIndex]   = VK_NULL_HANDLE;
+            mClientMemoryAttribs.set(attribIndex);
+        }
+        // TODO(jmadill): Offset handling.  Assume zero for now.
+        mCurrentArrayBufferOffsets[attribIndex] = 0;
+    }
+    else
+    {
+        mClientMemoryAttribs.reset(attribIndex);
+        UNIMPLEMENTED();
+    }
+}
+
 const gl::AttribArray<VkBuffer> &VertexArrayVk::getCurrentArrayBufferHandles() const
 {
     return mCurrentArrayBufferHandles;