Vulkan: Follow up change to optimize number of condition checks

This is a follow up of a comment on this CL: https://chromium-review.googlesource.com/c/angle/angle/+/985954 Bug: angleproject:2442 Change-Id: Id104c1437d77e6102b94351623ee8538a1d6c3d7 Reviewed-on: https://chromium-review.googlesource.com/996012Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Luc Ferron <lucferron@chromium.org>

Vulkan: Follow up change to optimize number of condition checks
24a3137a · Luc Ferron · Commit Bot · 364a9557 · 24a3137a
Commit 24a3137a authored Apr 04, 2018 by Luc Ferron Committed by Commit Bot Apr 04, 2018
Show whitespace changes
Inline Side-by-side

Showing with 17 additions and 3 deletions

ProgramVk.cpp src/libANGLE/renderer/vulkan/ProgramVk.cpp +17 -3

No files found.
--- a/src/libANGLE/renderer/vulkan/ProgramVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ProgramVk.cpp
@@ -437,6 +437,8 @@ void ProgramVk::setUniformImpl(GLint location, GLsizei count, const T *v, GLenum
        return;
    }

+    if (linkedUniform.typeInfo->type == entryPointType)
+    {
        for (auto &uniformBlock : mDefaultUniformBlocks)
        {
            const sh::BlockMemberInfo &layoutInfo = uniformBlock.uniformLayout[location];
@@ -448,13 +450,25 @@ void ProgramVk::setUniformImpl(GLint location, GLsizei count, const T *v, GLenum
            }

            const GLint componentCount = linkedUniform.typeInfo->componentCount;
-        if (linkedUniform.typeInfo->type == entryPointType)
-        {
            UpdateDefaultUniformBlock(count, locationInfo.arrayIndex, componentCount, v, layoutInfo,
                                      &uniformBlock.uniformData);
+            uniformBlock.uniformsDirty = true;
+        }
    }
    else
    {
+        for (auto &uniformBlock : mDefaultUniformBlocks)
+        {
+            const sh::BlockMemberInfo &layoutInfo = uniformBlock.uniformLayout[location];
+
+            // Assume an offset of -1 means the block is unused.
+            if (layoutInfo.offset == -1)
+            {
+                continue;
+            }
+
+            const GLint componentCount = linkedUniform.typeInfo->componentCount;
+
            ASSERT(linkedUniform.typeInfo->type == gl::VariableBoolVectorType(entryPointType));

            GLint initialArrayOffset = locationInfo.arrayIndex * layoutInfo.arrayStride;
@@ -470,9 +484,9 @@ void ProgramVk::setUniformImpl(GLint location, GLsizei count, const T *v, GLenum
                    dest[c] = (source[c] == static_cast<T>(0)) ? GL_FALSE : GL_TRUE;
                }
            }
-        }
            uniformBlock.uniformsDirty = true;
        }
+    }
 }

 template <typename T>