Skip to content

A
angle
Commit 63490943 by Jamie Madill Committed by Commit Bot
Options

Work around VS 2017 compiler bug in dEQP.

We should upstream this fix to dEQP once we have the chance. BUG=chromium:759402 Change-Id: I64e5df9bc6552e6fabe2b4b60c877fa30fd4c1f2 Reviewed-on: https://chromium-review.googlesource.com/670101 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 806cda93
Showing with 5 additions and 2 deletions
src/tests/deqp.gypi
...@@ -490,7 +490,6 @@ ...@@ -490,7 +490,6 @@
'<(deqp_path)/modules/gles3/functional/es3fShaderInvarianceTests.hpp', '<(deqp_path)/modules/gles3/functional/es3fShaderInvarianceTests.hpp',
'<(deqp_path)/modules/gles3/functional/es3fShaderLoopTests.cpp', '<(deqp_path)/modules/gles3/functional/es3fShaderLoopTests.cpp',
'<(deqp_path)/modules/gles3/functional/es3fShaderLoopTests.hpp', '<(deqp_path)/modules/gles3/functional/es3fShaderLoopTests.hpp',
'<(deqp_path)/modules/gles3/functional/es3fShaderMatrixTests.cpp',
'<(deqp_path)/modules/gles3/functional/es3fShaderMatrixTests.hpp', '<(deqp_path)/modules/gles3/functional/es3fShaderMatrixTests.hpp',
'<(deqp_path)/modules/gles3/functional/es3fShaderOperatorTests.cpp', '<(deqp_path)/modules/gles3/functional/es3fShaderOperatorTests.cpp',
'<(deqp_path)/modules/gles3/functional/es3fShaderOperatorTests.hpp', '<(deqp_path)/modules/gles3/functional/es3fShaderOperatorTests.hpp',
...@@ -607,6 +606,10 @@ ...@@ -607,6 +606,10 @@
'<(deqp_path)/modules/gles3/tes3TestPackage.cpp', '<(deqp_path)/modules/gles3/tes3TestPackage.cpp',
'<(deqp_path)/modules/gles3/tes3TestPackage.hpp', '<(deqp_path)/modules/gles3/tes3TestPackage.hpp',
'<(deqp_path)/modules/gles3/tes3TestPackageEntry.cpp', '<(deqp_path)/modules/gles3/tes3TestPackageEntry.cpp',
# TODO(jmadill): Remove this once the test is updated in dEQP or the VC++2017
# compiler is fixed (crbug.com/759402)
#'<(deqp_path)/modules/gles3/functional/es3fShaderMatrixTests.cpp',
'<(angle_path)/src/tests/deqp_support/es3fShaderMatrixTests.cpp',
], ],
'deqp_gles31_sources': 'deqp_gles31_sources':
[ [
......
src/tests/deqp_support/es2fShaderMatrixTests.cpp
...@@ -1223,7 +1223,7 @@ void ShaderMatrixTests::init (void) ...@@ -1223,7 +1223,7 @@ void ShaderMatrixTests::init (void)
} // deqp } // deqp
#if defined(_MSC_VER) && _MSC_FULL_VER == 191125507 #if defined(_MSC_VER) && _MSC_FULL_VER == 191125507
// Work around crbug.com/759402 which is a code-gen bug in VC++ 2015, version // Work around crbug.com/759402 which is a code-gen bug in VC++ 2017, version
// 15.3.2. // 15.3.2.
#pragma optimize("", off) #pragma optimize("", off)
#endif #endif
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