Vulkan: Only check sampler when setUniform1i(v)

src/libANGLE/Uniform.cpp

@@ -6,8 +6,6 @@
 
 #include "libANGLE/Uniform.h"
 
-#include "common/utilities.h"
-
 #include <cstring>
 
 namespace gl
@@ -97,41 +95,6 @@ LinkedUniform &LinkedUniform::operator=(const LinkedUniform &uniform)
 
 LinkedUniform::~LinkedUniform() {}
 
-bool LinkedUniform::isInDefaultBlock() const
-{
-    return bufferIndex == -1;
-}
-
-bool LinkedUniform::isSampler() const
-{
-    return typeInfo->isSampler;
-}
-
-bool LinkedUniform::isImage() const
-{
-    return typeInfo->isImageType;
-}
-
-bool LinkedUniform::isAtomicCounter() const
-{
-    return IsAtomicCounterType(type);
-}
-
-bool LinkedUniform::isField() const
-{
-    return name.find('.') != std::string::npos;
-}
-
-size_t LinkedUniform::getElementSize() const
-{
-    return typeInfo->externalSize;
-}
-
-size_t LinkedUniform::getElementComponents() const
-{
-    return typeInfo->componentCount;
-}
-
 BufferVariable::BufferVariable()
     : bufferIndex(-1), blockInfo(sh::kDefaultBlockMemberInfo), topLevelArraySize(-1)
 {}

src/libANGLE/Uniform.h

@@ -13,6 +13,7 @@
 #include "angle_gl.h"
 #include "common/MemoryBuffer.h"
 #include "common/debug.h"
+#include "common/utilities.h"
 #include "compiler/translator/blocklayout.h"
 #include "libANGLE/angletypes.h"
 
@@ -61,13 +62,13 @@ struct LinkedUniform : public sh::Uniform, public ActiveVariable
     LinkedUniform &operator=(const LinkedUniform &uniform);
     ~LinkedUniform() override;
 
-    bool isSampler() const;
-    bool isImage() const;
-    bool isAtomicCounter() const;
-    bool isInDefaultBlock() const;
-    bool isField() const;
-    size_t getElementSize() const;
-    size_t getElementComponents() const;
+    bool isSampler() const { return typeInfo->isSampler; }
+    bool isImage() const { return typeInfo->isImageType; }
+    bool isAtomicCounter() const { return IsAtomicCounterType(type); }
+    bool isInDefaultBlock() const { return bufferIndex == -1; }
+    bool isField() const { return name.find('.') != std::string::npos; }
+    size_t getElementSize() const { return typeInfo->externalSize; }
+    size_t getElementComponents() const { return typeInfo->componentCount; }
 
     const UniformTypeInfo *typeInfo;
 

src/libANGLE/renderer/vulkan/ProgramVk.cpp

@@ -757,12 +757,7 @@ void ProgramVk::setUniformImpl(GLint location, GLsizei count, const T *v, GLenum
     const gl::VariableLocation &locationInfo = mState.getUniformLocations()[location];
     const gl::LinkedUniform &linkedUniform   = mState.getUniforms()[locationInfo.index];
 
-    if (linkedUniform.isSampler())
-    {
-        // We could potentially cache some indexing here. For now this is a no-op since the mapping
-        // is handled entirely in ContextVk.
-        return;
-    }
+    ASSERT(!linkedUniform.isSampler());
 
     if (linkedUniform.typeInfo->type == entryPointType)
     {
@@ -872,6 +867,15 @@ void ProgramVk::setUniform4fv(GLint location, GLsizei count, const GLfloat *v)
 
 void ProgramVk::setUniform1iv(GLint location, GLsizei count, const GLint *v)
 {
+    const gl::VariableLocation &locationInfo = mState.getUniformLocations()[location];
+    const gl::LinkedUniform &linkedUniform   = mState.getUniforms()[locationInfo.index];
+    if (linkedUniform.isSampler())
+    {
+        // We could potentially cache some indexing here. For now this is a no-op since the mapping
+        // is handled entirely in ContextVk.
+        return;
+    }
+
     setUniformImpl(location, count, v, GL_INT);
 }