Suppress cast warnings for active textures mask

Bug: angleproject:2747 Bug: angleproject:2763 Change-Id: I19f9e5ba760d3b5baf3997284523ee1db6bb8166 Reviewed-on: https://chromium-review.googlesource.com/1172206Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jie A Chen <jie.a.chen@intel.com>

Suppress cast warnings for active textures mask
90f466a6 · jchen10 · Commit Bot · a43d7306 · 90f466a6 · 90f466a6
Commit 90f466a6 authored Aug 13, 2018 by jchen10 Committed by Commit Bot Aug 13, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

State.cpp src/libANGLE/State.cpp +3 -2

StateManagerGL.cpp src/libANGLE/renderer/gl/StateManagerGL.cpp +1 -1

No files found.
--- a/src/libANGLE/State.cpp
+++ b/src/libANGLE/State.cpp
@@ -2656,8 +2656,9 @@ Error State::syncProgramTextures(const Context *context)
    {
        TextureType textureType = textureTypes[textureUnitIndex];
-        Texture *texture = getSamplerTexture(textureUnitIndex, textureType);
+        Texture *texture =
-        Sampler *sampler = getSampler(textureUnitIndex);
+            getSamplerTexture(static_cast<unsigned int>(textureUnitIndex), textureType);
+        Sampler *sampler = getSampler(static_cast<GLuint>(textureUnitIndex));
        ASSERT(static_cast<size_t>(textureUnitIndex) < mActiveTexturesCache.size());
        ASSERT(static_cast<size_t>(textureUnitIndex) < newActiveTextures.size());

--- a/src/libANGLE/renderer/gl/StateManagerGL.cpp
+++ b/src/libANGLE/renderer/gl/StateManagerGL.cpp
@@ -983,7 +983,7 @@ void StateManagerGL::updateProgramTextureAndSamplerBindings(const gl::Context *c
            }
        }
-        const gl::Sampler *sampler = glState.getSampler(textureUnitIndex);
+        const gl::Sampler *sampler = glState.getSampler(static_cast<GLuint>(textureUnitIndex));
        if (sampler != nullptr)
        {
            SamplerGL *samplerGL = GetImplAs<SamplerGL>(sampler);