commit 90f466a6cfabdb923bc897bbefce94fcf4e0154a
author jchen10 <jie.a.chen@intel.com> Mon Aug 13 15:05:25 2018 +0800
committer Commit Bot <commit-bot@chromium.org> Mon Aug 13 08:26:48 2018 +0000
tree 573ac5a9cfb754f0dc137f1ede0efb582285dd22
parent a43d7306d87a9f43ef9399e9c43f7db6d698e9c0

Suppress cast warnings for active textures mask

Bug: angleproject:2747
Bug: angleproject:2763

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

src/libANGLE/State.cpp

diff --git a/src/libANGLE/State.cpp b/src/libANGLE/State.cpp
index 27d7e93..2124ce5 100644
--- a/src/libANGLE/State.cpp
+++ b/src/libANGLE/State.cpp
@@ -2656,8 +2656,9 @@
     {
         TextureType textureType = textureTypes[textureUnitIndex];
 
-        Texture *texture = getSamplerTexture(textureUnitIndex, textureType);
-        Sampler *sampler = getSampler(textureUnitIndex);
+        Texture *texture =
+            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());