commit 3b26e231d99154814eb428f75a67bbe7a21adadc
author Minmin Gong <mgong@microsoft.com> Tue Apr 07 18:31:54 2015 -0700
committer Jamie Madill <jmadill@chromium.org> Thu Apr 09 14:05:37 2015 +0000
tree dcf4e9a9a6c0e16bb992bf895b9636f4fad84fe5
parent 47fadcb975e91ff33527cc5f460eb08a97d2a0ff

Fix and enable warning C4244 (Conversion from 'type1' to 'type2', possible loss of data)

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

src/libANGLE/renderer/gl/VertexArrayGL.cpp

diff --git a/src/libANGLE/renderer/gl/VertexArrayGL.cpp b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
index 996321d..76635a0 100644
--- a/src/libANGLE/renderer/gl/VertexArrayGL.cpp
+++ b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
@@ -264,7 +264,7 @@
             // Find the index range in the buffer
             const IndexRangeCache *rangeCache = mElementArrayBuffer.get()->getIndexRangeCache();
 
-            if (!rangeCache->findRange(type, elementArrayBufferOffset, count, outIndexRange))
+            if (!rangeCache->findRange(type, static_cast<unsigned int>(elementArrayBufferOffset), count, outIndexRange))
             {
                 // Need to compute the index range.
                 mStateManager->bindBuffer(GL_ELEMENT_ARRAY_BUFFER, elementArrayBufferID);
@@ -273,7 +273,7 @@
                 *outIndexRange = IndexRangeCache::ComputeRange(type, elementArrayBufferPointer + elementArrayBufferOffset, count);
 
                 // TODO: Store the range cache at the impl level since the gl::Buffer object is supposed to remain constant
-                const_cast<IndexRangeCache*>(rangeCache)->addRange(type, elementArrayBufferOffset, count, *outIndexRange);
+                const_cast<IndexRangeCache*>(rangeCache)->addRange(type, static_cast<unsigned int>(elementArrayBufferOffset), count, *outIndexRange);
 
                 if (!mFunctions->unmapBuffer(GL_ELEMENT_ARRAY_BUFFER))
                 {