commit c5cf9bc47d0ee028adbbf9e9f94ca567eec601dc
author Cooper Partin <coopp@microsoft.com> Thu Aug 06 10:46:48 2015 -0700
committer Jamie Madill <jmadill@chromium.org> Wed Aug 12 14:13:23 2015 +0000
tree fa7e60efd51fb96ad829b3b6458701dd80cf157d
parent 27446bda2196139b25f836dc8b313b3a8a8c3209

Fixed compiler warning C4267 'conversion from 'size_t' to 'type', possible loss of data'

BUG=angleproject:1120

Change-Id: I01ef10bea7f487c2b394d030c76628f38d2ea645
Reviewed-on: https://chromium-review.googlesource.com/292780
Tested-by: Cooper Partin <coopp@microsoft.com>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/Texture.cpp

diff --git a/src/libANGLE/Texture.cpp b/src/libANGLE/Texture.cpp
index f532797..970cb30 100644
--- a/src/libANGLE/Texture.cpp
+++ b/src/libANGLE/Texture.cpp
@@ -164,9 +164,8 @@
     const ImageDesc &baseImageDesc = getImageDesc(getBaseImageTarget(), 0);
     if (mTarget == GL_TEXTURE_3D)
     {
-        const size_t maxDim =
-            std::max(std::max(baseImageDesc.size.width, baseImageDesc.size.height),
-                     baseImageDesc.size.depth);
+        const int maxDim = std::max(std::max(baseImageDesc.size.width, baseImageDesc.size.height),
+                                    baseImageDesc.size.depth);
         return log2(maxDim) + 1;
     }
     else
@@ -331,7 +330,7 @@
         return error;
     }
 
-    mImmutableLevelCount = levels;
+    mImmutableLevelCount = static_cast<GLsizei>(levels);
     clearImageDescs();
     setImageDescChain(levels, size, internalFormat);
 
@@ -366,16 +365,17 @@
 
 void Texture::setImageDescChain(size_t levels, Extents baseSize, GLenum sizedInternalFormat)
 {
-    for (size_t level = 0; level < levels; level++)
+    for (int level = 0; level < static_cast<int>(levels); level++)
     {
-        Extents levelSize(std::max<size_t>(baseSize.width >> level, 1),
-                          std::max<size_t>(baseSize.height >> level, 1),
-                          (mTarget == GL_TEXTURE_2D_ARRAY) ? baseSize.depth : std::max<size_t>(baseSize.depth >> level, 1));
+        Extents levelSize(
+            std::max<int>(baseSize.width >> level, 1), std::max<int>(baseSize.height >> level, 1),
+            (mTarget == GL_TEXTURE_2D_ARRAY) ? baseSize.depth
+                                             : std::max<int>(baseSize.depth >> level, 1));
         ImageDesc levelInfo(levelSize, sizedInternalFormat);
 
         if (mTarget == GL_TEXTURE_CUBE_MAP)
         {
-            for (size_t face = FirstCubeMapTextureTarget; face <= LastCubeMapTextureTarget; face++)
+            for (GLenum face = FirstCubeMapTextureTarget; face <= LastCubeMapTextureTarget; face++)
             {
                 setImageDesc(face, level, levelInfo);
             }
@@ -486,7 +486,8 @@
 
     setTargetImage(imageTarget);
 
-    Extents size(imageTarget->getWidth(), imageTarget->getHeight(), 1);
+    Extents size(static_cast<int>(imageTarget->getWidth()),
+                 static_cast<int>(imageTarget->getHeight()), 1);
     GLenum internalFormat = imageTarget->getInternalFormat();
     GLenum type           = GetInternalFormatInfo(internalFormat).type;
 
@@ -672,12 +673,14 @@
 
 GLsizei Texture::getAttachmentWidth(const gl::FramebufferAttachment::Target &target) const
 {
-    return getWidth(target.textureIndex().type, target.textureIndex().mipIndex);
+    return static_cast<GLsizei>(
+        getWidth(target.textureIndex().type, target.textureIndex().mipIndex));
 }
 
 GLsizei Texture::getAttachmentHeight(const gl::FramebufferAttachment::Target &target) const
 {
-    return getHeight(target.textureIndex().type, target.textureIndex().mipIndex);
+    return static_cast<GLsizei>(
+        getHeight(target.textureIndex().type, target.textureIndex().mipIndex));
 }
 
 GLenum Texture::getAttachmentInternalFormat(const gl::FramebufferAttachment::Target &target) const