commit b195643c16d3bbcdc92f54bfc41faf8c8fafad5e
author Jamie Madill <jmadill@chromium.org> Wed Aug 12 17:35:20 2015 +0000
committer Jamie Madill <jmadill@chromium.org> Wed Aug 12 17:36:09 2015 +0000
tree 4a771fe8fd4d3dbe3e2b55957bb9ac5e7216ac42
parent 61902ecee92f3e3ba32ad4550ad55c6485b18d9b

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

Seems to have quite a few warnings in 64-bit on my machine.

BUG=angleproject:1120

This reverts commit c5cf9bc47d0ee028adbbf9e9f94ca567eec601dc.

Change-Id: I86768b900aeba52e7a2242d9ae8949f93f1a5ba9
Reviewed-on: https://chromium-review.googlesource.com/293280
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/Program.cpp

diff --git a/src/libANGLE/Program.cpp b/src/libANGLE/Program.cpp
index cecb777..23a414e 100644
--- a/src/libANGLE/Program.cpp
+++ b/src/libANGLE/Program.cpp
@@ -470,7 +470,7 @@
         return error;
     }
 
-    GLsizei streamLength   = static_cast<GLsizei>(stream.length());
+    GLsizei streamLength = stream.length();
     const void *streamData = stream.data();
 
     if (streamLength > bufSize)
@@ -632,7 +632,7 @@
 
             if (length)
             {
-                *length = static_cast<GLsizei>(strlen(name));
+                *length = strlen(name);
             }
         }
 
@@ -749,7 +749,7 @@
 
             if (length)
             {
-                *length = static_cast<GLsizei>(strlen(name));
+                *length = strlen(name);
             }
         }
 
@@ -777,7 +777,7 @@
 {
     if (mLinked)
     {
-        return static_cast<GLint>(mProgram->getUniforms().size());
+        return mProgram->getUniforms().size();
     }
     else
     {
@@ -791,7 +791,7 @@
 
     if (mLinked)
     {
-        unsigned int numUniforms = static_cast<unsigned int>(mProgram->getUniforms().size());
+        unsigned int numUniforms = mProgram->getUniforms().size();
         for (unsigned int uniformIndex = 0; uniformIndex < numUniforms; uniformIndex++)
         {
             if (!mProgram->getUniforms()[uniformIndex]->name.empty())
@@ -1030,7 +1030,7 @@
 
 GLuint Program::getActiveUniformBlockCount()
 {
-    return static_cast<GLuint>(mProgram->getUniformBlocks().size());
+    return mProgram->getUniformBlocks().size();
 }
 
 void Program::getActiveUniformBlockName(GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName) const
@@ -1053,7 +1053,7 @@
 
         if (length)
         {
-            *length = static_cast<GLsizei>(strlen(uniformBlockName));
+            *length = strlen(uniformBlockName);
         }
     }
 }
@@ -1099,14 +1099,13 @@
 
     if (mLinked)
     {
-        unsigned int numUniformBlocks =
-            static_cast<unsigned int>(mProgram->getUniformBlocks().size());
+        unsigned int numUniformBlocks = mProgram->getUniformBlocks().size();
         for (unsigned int uniformBlockIndex = 0; uniformBlockIndex < numUniformBlocks; uniformBlockIndex++)
         {
             const UniformBlock &uniformBlock = *mProgram->getUniformBlocks()[uniformBlockIndex];
             if (!uniformBlock.name.empty())
             {
-                const int length = static_cast<int>(uniformBlock.name.length()) + 1;
+                const int length = uniformBlock.name.length() + 1;
 
                 // Counting in "[0]".
                 const int arrayLength = (uniformBlock.isArrayElement() ? 3 : 0);
@@ -1460,8 +1459,7 @@
                 << "' between vertex and fragment shaders";
         return false;
     }
-    const unsigned int numBlockMembers =
-        static_cast<unsigned int>(vertexInterfaceBlock.fields.size());
+    const unsigned int numBlockMembers = vertexInterfaceBlock.fields.size();
     for (unsigned int blockMemberIndex = 0; blockMemberIndex < numBlockMembers; blockMemberIndex++)
     {
         const sh::InterfaceBlockField &vertexMember = vertexInterfaceBlock.fields[blockMemberIndex];
@@ -1507,7 +1505,7 @@
         infoLog << "Structure lengths for " << variableName << " differ between vertex and fragment shaders";
         return false;
     }
-    const unsigned int numMembers = static_cast<unsigned int>(vertexVariable.fields.size());
+    const unsigned int numMembers = vertexVariable.fields.size();
     for (unsigned int memberIndex = 0; memberIndex < numMembers; memberIndex++)
     {
         const sh::ShaderVariable &vertexMember = vertexVariable.fields[memberIndex];