| commit | d8e62a3940b4f82d2a782448f31bc115205901f3 | [log] [tgz] |
|---|---|---|
| author | Cooper Partin <coopp@microsoft.com> | Thu Jan 29 15:21:25 2015 -0800 |
| committer | Jamie Madill <jmadill@chromium.org> | Fri Jan 30 15:24:21 2015 +0000 |
| tree | d9f07c312bb91a6be54135bd4eaae0d644b09e2f | |
| parent | bc393df9cd8ae893da686533644da29a8c4911ae [diff] [blame] |
Added required casts to fix 64-bit compilation errors Change-Id: I5ec9090e0129c778de8fcdc6cf70ea0fe460a19d Reviewed-on: https://chromium-review.googlesource.com/244510 Tested-by: Cooper Partin <coopp@microsoft.com> Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp index 81910ff..81c6598 100644 --- a/src/libANGLE/Context.cpp +++ b/src/libANGLE/Context.cpp
@@ -230,7 +230,7 @@ { GLuint handle = mResourceManager->createFenceSync(); - return reinterpret_cast<GLsync>(handle); + return reinterpret_cast<GLsync>(static_cast<uintptr_t>(handle)); } GLuint Context::createVertexArray()