Skip to content

A
angle
Commit c4eca923 by Olli Etuaho Committed by Commit Bot
Options

Fix MSVS 2015 warnings

Fix warnings about implicit int to bool conversion and noexcept. TEST=build on MVSV 2015 Change-Id: I437977ca01f62ce2df39872da5903a0338a73bba Reviewed-on: https://chromium-review.googlesource.com/765371 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 19744529
Showing with 5 additions and 1 deletion
src/libANGLE/renderer/gl/ProgramGL.cpp
...@@ -603,7 +603,7 @@ bool ProgramGL::getShaderStorageBlockMemberInfo(const std::string & /* memberNam ...@@ -603,7 +603,7 @@ bool ProgramGL::getShaderStorageBlockMemberInfo(const std::string & /* memberNam
props.data(), kPropCount, &length, params.data()); props.data(), kPropCount, &length, params.data());
ASSERT(kPropCount == length); ASSERT(kPropCount == length);
memberInfoOut->arrayStride = params[0]; memberInfoOut->arrayStride = params[0];
memberInfoOut->isRowMajorMatrix = params[1]; memberInfoOut->isRowMajorMatrix = params[1] != 0;
memberInfoOut->matrixStride = params[2]; memberInfoOut->matrixStride = params[2];
memberInfoOut->offset = params[3]; memberInfoOut->offset = params[3];
memberInfoOut->topLevelArrayStride = params[4]; memberInfoOut->topLevelArrayStride = params[4];
......
src/libGLESv2.gypi
...@@ -969,6 +969,10 @@ ...@@ -969,6 +969,10 @@
[ [
'LIBANGLE_IMPLEMENTATION', 'LIBANGLE_IMPLEMENTATION',
], ],
'msvs_disabled_warnings':
[
4577, # 'noexcept' used with no exception handling mode specified; termination on exception is not guaranteed.
],
'export_dependent_settings': 'export_dependent_settings':
[ [
'angle_common', 'angle_common',
......
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