commit 4d61f7edade0f237b5f009b8c0df08b59845d77a
author Cooper Partin <coopp@microsoft.com> Wed Aug 12 10:56:50 2015 -0700
committer Geoff Lang <geofflang@chromium.org> Thu Aug 13 13:28:42 2015 +0000
tree 1deb2c80824668380fd7584e0f56290e5ecb1152
parent fd00ccff1219e35dddee176af3d289582c08bd9f

Reland Fixed compiler warning C4267 'conversion from 'size_t' to 'type', possible loss of data'
Additional warnings found with more testing and added C4267 warning disable only for angle_libpng

BUG=angleproject:1120

Change-Id: Ic403dcff5a8018056fa51a8c408e64207f3362eb
Reviewed-on: https://chromium-review.googlesource.com/293028
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/tests/gl_tests/FramebufferRenderMipmapTest.cpp

diff --git a/src/tests/gl_tests/FramebufferRenderMipmapTest.cpp b/src/tests/gl_tests/FramebufferRenderMipmapTest.cpp
index 9946e3f..b58c48d 100644
--- a/src/tests/gl_tests/FramebufferRenderMipmapTest.cpp
+++ b/src/tests/gl_tests/FramebufferRenderMipmapTest.cpp
@@ -88,7 +88,8 @@
     for (size_t i = 0; i < levels; i++)
     {
         size_t size = 1 << ((levels - 1) - i);
-        glTexImage2D(GL_TEXTURE_2D, i, GL_RGBA, size, size, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+        glTexImage2D(GL_TEXTURE_2D, static_cast<GLint>(i), GL_RGBA, static_cast<GLsizei>(size),
+                     static_cast<GLsizei>(size), 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
     }
 
     EXPECT_GL_NO_ERROR();
@@ -100,7 +101,8 @@
 
     for (size_t i = 0; i < levels; i++)
     {
-        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex, i);
+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex,
+                               static_cast<GLint>(i));
 
         if (i > 0 && !renderToMipmapSupported)
         {
@@ -152,7 +154,8 @@
     for (size_t i = 0; i < testLevels; i++)
     {
         size_t size = 1 << ((testLevels - 1) - i);
-        glTexImage2D(GL_TEXTURE_2D, i, GL_RGBA, size, size, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+        glTexImage2D(GL_TEXTURE_2D, static_cast<GLint>(i), GL_RGBA, static_cast<GLsizei>(size),
+                     static_cast<GLsizei>(size), 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
     }
 
     EXPECT_GL_NO_ERROR();
@@ -165,7 +168,8 @@
     // Render to the levels of the texture with different colors
     for (size_t i = 0; i < testLevels; i++)
     {
-        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex, i);
+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex,
+                               static_cast<GLint>(i));
         EXPECT_GL_NO_ERROR();
 
         glUseProgram(mProgram);
@@ -178,7 +182,8 @@
     // Test that the levels of the texture are correct
     for (size_t i = 0; i < testLevels; i++)
     {
-        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex, i);
+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex,
+                               static_cast<GLint>(i));
         EXPECT_GL_NO_ERROR();
 
         const GLfloat *color = levelColors + (i * 4);