Commit 330c8673 by Jamie Madill Committed by Commit Bot

Enable MSVC warning 4312.

This is caught in the Skia build. Bug: skia:7647 Change-Id: I9b164f6fcc55b7e13981659ee8a08766a99a2122 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2381084 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 966a62cb
...@@ -133,6 +133,7 @@ config("extra_warnings") { ...@@ -133,6 +133,7 @@ config("extra_warnings") {
if (is_win) { if (is_win) {
cflags += [ cflags += [
"/we4244", # Conversion: possible loss of data. "/we4244", # Conversion: possible loss of data.
"/we4312", # Conversion: greater size.
"/we4456", # Variable shadowing. "/we4456", # Variable shadowing.
"/we4458", # declaration hides class member. "/we4458", # declaration hides class member.
"/we4715", # not all control paths return a value "/we4715", # not all control paths return a value
......
...@@ -2957,8 +2957,8 @@ void CaptureMidExecutionSetup(const gl::Context *context, ...@@ -2957,8 +2957,8 @@ void CaptureMidExecutionSetup(const gl::Context *context,
const gl::SyncManager &syncs = apiState.getSyncManagerForCapture(); const gl::SyncManager &syncs = apiState.getSyncManagerForCapture();
for (const auto &syncIter : syncs) for (const auto &syncIter : syncs)
{ {
GLsync syncID = reinterpret_cast<GLsync>(syncIter.first); GLsync syncID = gl::bitCast<GLsync>(syncIter.first);
gl::Sync *sync = syncIter.second; const gl::Sync *sync = syncIter.second;
if (!sync) if (!sync)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment