Added required casts to fix 64-bit compilation errors

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

Added required casts to fix 64-bit compilation errors
d8e62a39 · Cooper Partin · Jamie Madill · bc393df9 · d8e62a39 · d8e62a39
Commit d8e62a39 authored Jan 29, 2015 by Cooper Partin Committed by Jamie Madill Jan 30, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Context.cpp src/libANGLE/Context.cpp +1 -1

VertexBuffer.cpp src/libANGLE/renderer/d3d/VertexBuffer.cpp +1 -1

No files found.
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -230,7 +230,7 @@ GLsync Context::createFenceSync()
 {
    GLuint handle = mResourceManager->createFenceSync();

-    return reinterpret_cast<GLsync>(handle);
+    return reinterpret_cast<GLsync>(static_cast<uintptr_t>(handle));
 }

 GLuint Context::createVertexArray()

--- a/src/libANGLE/renderer/d3d/VertexBuffer.cpp
+++ b/src/libANGLE/renderer/d3d/VertexBuffer.cpp
@@ -293,7 +293,7 @@ gl::Error StaticVertexBufferInterface::storeVertexAttributes(const gl::VertexAtt
    }

    size_t attributeOffset = static_cast<size_t>(attrib.offset) % ComputeVertexAttributeStride(attrib);
-    VertexElement element = { attrib.type, attrib.size, ComputeVertexAttributeStride(attrib), attrib.normalized, attrib.pureInteger, attributeOffset, streamOffset };
+    VertexElement element = { attrib.type, attrib.size, static_cast<GLuint>(ComputeVertexAttributeStride(attrib)), attrib.normalized, attrib.pureInteger, attributeOffset, streamOffset };
    mCache.push_back(element);

    if (outStreamOffset)