Micro-optimize uniform updates.

src/libANGLE/Program.cpp

@@ -1318,11 +1318,6 @@ void Program::unlink()
     mInfoLog.reset();
 }
 
-bool Program::isLinked() const
-{
-    return mLinked;
-}
-
 bool Program::hasLinkedShaderStage(ShaderType shaderType) const
 {
     ASSERT(shaderType != ShaderType::InvalidEnum);
@@ -1759,17 +1754,6 @@ const VariableLocation &Program::getUniformLocation(GLint location) const
     return mState.mUniformLocations[location];
 }
 
-const std::vector<VariableLocation> &Program::getUniformLocations() const
-{
-    return mState.mUniformLocations;
-}
-
-const LinkedUniform &Program::getUniformByIndex(GLuint index) const
-{
-    ASSERT(index < static_cast<size_t>(mState.mUniforms.size()));
-    return mState.mUniforms[index];
-}
-
 const BufferVariable &Program::getBufferVariableByIndex(GLuint index) const
 {
     ASSERT(index < static_cast<size_t>(mState.mBufferVariables.size()));

src/libANGLE/Program.h

@@ -404,10 +404,10 @@ class ProgramState final : angle::NonCopyable
     RangeUI mAtomicCounterUniformRange;
 
     // An array of the samplers that are used by the program
-    std::vector<gl::SamplerBinding> mSamplerBindings;
+    std::vector<SamplerBinding> mSamplerBindings;
 
     // An array of the images that are used by the program
-    std::vector<gl::ImageBinding> mImageBindings;
+    std::vector<ImageBinding> mImageBindings;
 
     // Names and mapped names of output variables that are arrays include [0] in the end, similarly
     // to uniforms.
@@ -494,8 +494,8 @@ class Program final : angle::NonCopyable, public LabeledObject
                               GLint components,
                               const GLfloat *coeffs);
 
-    Error link(const gl::Context *context);
-    bool isLinked() const;
+    Error link(const Context *context);
+    bool isLinked() const { return mLinked; }
 
     bool hasLinkedShaderStage(ShaderType shaderType) const;
 
@@ -552,8 +552,16 @@ class Program final : angle::NonCopyable, public LabeledObject
     bool isValidUniformLocation(GLint location) const;
     const LinkedUniform &getUniformByLocation(GLint location) const;
     const VariableLocation &getUniformLocation(GLint location) const;
-    const std::vector<VariableLocation> &getUniformLocations() const;
-    const LinkedUniform &getUniformByIndex(GLuint index) const;
+    const std::vector<VariableLocation> &getUniformLocations() const
+    {
+        return mState.mUniformLocations;
+    }
+
+    const LinkedUniform &getUniformByIndex(GLuint index) const
+    {
+        ASSERT(index < static_cast<size_t>(mState.mUniforms.size()));
+        return mState.mUniforms[index];
+    }
 
     const BufferVariable &getBufferVariableByIndex(GLuint index) const;
 
@@ -632,7 +640,7 @@ class Program final : angle::NonCopyable, public LabeledObject
     void validate(const Caps &caps);
     bool validateSamplers(InfoLog *infoLog, const Caps &caps);
     bool isValidated() const;
-    bool samplesFromTexture(const gl::State &state, GLuint textureID) const;
+    bool samplesFromTexture(const State &state, GLuint textureID) const;
 
     const AttributesMask &getActiveAttribLocationsMask() const
     {
@@ -735,7 +743,7 @@ class Program final : angle::NonCopyable, public LabeledObject
     bool linkValidateFragmentInputBindings(const Context *context, InfoLog &infoLog) const;
 
     bool linkValidateBuiltInVaryings(const Context *context, InfoLog &infoLog) const;
-    bool linkValidateTransformFeedback(const gl::Context *context,
+    bool linkValidateTransformFeedback(const Context *context,
                                        InfoLog &infoLog,
                                        const ProgramMergedVaryings &linkedVaryings,
                                        const Caps &caps) const;

src/libANGLE/VertexAttribute.cpp

@@ -49,7 +49,7 @@ void VertexBinding::setBuffer(const gl::Context *context, Buffer *bufferIn, bool
         mBuffer->onBindingChanged(context, true, BufferBinding::Array);
 }
 
-void VertexBinding::onContainerBindingChanged(const Context *context, bool bound)
+void VertexBinding::onContainerBindingChanged(const Context *context, bool bound) const
 {
     if (mBuffer.get())
         mBuffer->onBindingChanged(context, bound, BufferBinding::Array);
@@ -71,11 +71,6 @@ void VertexBinding::updateCachedBufferSizeMinusOffset()
     }
 }
 
-GLuint64 VertexBinding::getCachedBufferSizeMinusOffset() const
-{
-    return mCachedBufferSizeMinusOffset;
-}
-
 VertexAttribute::VertexAttribute(GLuint bindingIndex)
     : enabled(false),
       type(GL_FLOAT),

src/libANGLE/VertexAttribute.h

@@ -39,11 +39,15 @@ class VertexBinding final : angle::NonCopyable
     const BindingPointer<Buffer> &getBuffer() const { return mBuffer; }
     void setBuffer(const gl::Context *context, Buffer *bufferIn, bool containerIsBound);
 
-    void onContainerBindingChanged(const Context *context, bool bound);
+    void onContainerBindingChanged(const Context *context, bool bound) const;
+
+    GLuint64 getCachedBufferSizeMinusOffset() const
+    {
+        return mCachedBufferSizeMinusOffset;
+    }
 
     // Called from VertexArray.
     void updateCachedBufferSizeMinusOffset();
-    GLuint64 getCachedBufferSizeMinusOffset() const;
 
   private:
     GLuint mStride;

src/libANGLE/validationES.cpp

@@ -2096,7 +2096,7 @@ bool ValidateUniformCommonBase(Context *context,
     const auto &uniform = program->getUniformByIndex(uniformLocation.index);
 
     // attempting to write an array to a non-array uniform is an INVALID_OPERATION
-    if (!uniform.isArray() && count > 1)
+    if (count > 1 && !uniform.isArray())
     {
         context->handleError(InvalidOperation());
         return false;