Fix 64-bit -> 32-bit implicit conversions in libangle.

src/libANGLE/State.cpp

@@ -2864,7 +2864,7 @@ void State::onProgramExecutableChange(Program *program)
 }
 
 void State::setImageUnit(const Context *context,
-                         GLuint unit,
+                         size_t unit,
                          Texture *texture,
                          GLint level,
                          GLboolean layered,
@@ -2880,7 +2880,7 @@ void State::setImageUnit(const Context *context,
     mImageUnits[unit].format  = format;
 }
 
-const ImageUnit &State::getImageUnit(GLuint unit) const
+const ImageUnit &State::getImageUnit(size_t unit) const
 {
     return mImageUnits[unit];
 }

src/libANGLE/State.h

@@ -464,7 +464,7 @@ class State : angle::NonCopyable
     AttributesMask getAndResetDirtyCurrentValues() const;
 
     void setImageUnit(const Context *context,
-                      GLuint unit,
+                      size_t unit,
                       Texture *texture,
                       GLint level,
                       GLboolean layered,
@@ -472,7 +472,7 @@ class State : angle::NonCopyable
                       GLenum access,
                       GLenum format);
 
-    const ImageUnit &getImageUnit(GLuint unit) const;
+    const ImageUnit &getImageUnit(size_t unit) const;
     const ActiveTexturePointerArray &getActiveTexturesCache() const { return mActiveTexturesCache; }
     ComponentTypeMask getCurrentValuesTypeMask() const { return mCurrentValuesTypeMask; }
 

src/libANGLE/renderer/gl/StateManagerGL.cpp

@@ -12,6 +12,7 @@
 #include <algorithm>
 #include <limits>
 
+#include "anglebase/numerics/safe_conversions.h"
 #include "common/bitset_utils.h"
 #include "common/mathutil.h"
 #include "common/matrix_utils.h"
@@ -249,8 +250,7 @@ void StateManagerGL::deleteTexture(GLuint texture)
         {
             if (mImages[imageUnitIndex].texture == texture)
             {
-                bindImageTexture(static_cast<GLuint>(imageUnitIndex), 0, 0, false, 0, GL_READ_ONLY,
-                                 GL_R32UI);
+                bindImageTexture(imageUnitIndex, 0, 0, false, 0, GL_READ_ONLY, GL_R32UI);
             }
         }
 
@@ -450,7 +450,7 @@ void StateManagerGL::bindSampler(size_t unit, GLuint sampler)
     }
 }
 
-void StateManagerGL::bindImageTexture(GLuint unit,
+void StateManagerGL::bindImageTexture(size_t unit,
                                       GLuint texture,
                                       GLint level,
                                       GLboolean layered,
@@ -468,7 +468,8 @@ void StateManagerGL::bindImageTexture(GLuint unit,
         binding.layer   = layer;
         binding.access  = access;
         binding.format  = format;
-        mFunctions->bindImageTexture(unit, texture, level, layered, layer, access, format);
+        mFunctions->bindImageTexture(angle::base::checked_cast<GLuint>(unit), texture, level,
+                                     layered, layer, access, format);
     }
 }
 

src/libANGLE/renderer/gl/StateManagerGL.h

@@ -64,7 +64,7 @@ class StateManagerGL final : angle::NonCopyable
     void activeTexture(size_t unit);
     void bindTexture(gl::TextureType type, GLuint texture);
     void bindSampler(size_t unit, GLuint sampler);
-    void bindImageTexture(GLuint unit,
+    void bindImageTexture(size_t unit,
                           GLuint texture,
                           GLint level,
                           GLboolean layered,

src/tests/gl_tests/VertexAttributeTest.cpp

@@ -4,6 +4,7 @@
 // found in the LICENSE file.
 //
 
+#include "anglebase/numerics/safe_conversions.h"
 #include "test_utils/ANGLETest.h"
 #include "test_utils/gl_raii.h"
 
@@ -1077,7 +1078,8 @@ class VertexAttributeTestES31 : public VertexAttributeTestES3
         glBindBuffer(GL_ARRAY_BUFFER, mBuffer);
         glBufferData(GL_ARRAY_BUFFER, inputSize, nullptr, GL_STATIC_DRAW);
         glBufferSubData(GL_ARRAY_BUFFER, 0, inputSize, inputData.data());
-        glVertexAttribFormat(mTestAttrib, 1, GL_FLOAT, GL_FALSE, inputRelativeOffset);
+        glVertexAttribFormat(mTestAttrib, 1, GL_FLOAT, GL_FALSE,
+                             base::checked_cast<GLuint>(inputRelativeOffset));
         glBindVertexBuffer(mTestAttrib, mBuffer, 0, inputStride);
         glEnableVertexAttribArray(mTestAttrib);