From 71d3798e9b80ab0d85d798f4a6a36df95bf2ec20 Mon Sep 17 00:00:00 2001 From: Jamie Madill Date: Fri, 26 Jan 2018 12:55:20 -0500 Subject: [PATCH] Work around VC++ code-gen bug in shader matrix tests. This code-gen bug was found in crbug.com/759402, and was causing test runtime failures when run. Work around it by disabling optimization for the specific compiler version. Components: AOSP Affects: dEQP-GLES2.functional.shaders.matrix.* dEQP-GLES3.functional.shaders.matrix.* --- modules/gles2/functional/es2fShaderMatrixTests.cpp | 6 ++++++ modules/gles3/functional/es3fShaderMatrixTests.cpp | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/modules/gles2/functional/es2fShaderMatrixTests.cpp b/modules/gles2/functional/es2fShaderMatrixTests.cpp index 4b6a8fd..9feb4dc 100644 --- a/modules/gles2/functional/es2fShaderMatrixTests.cpp +++ b/modules/gles2/functional/es2fShaderMatrixTests.cpp @@ -1221,3 +1221,9 @@ void ShaderMatrixTests::init (void) } // Functional } // gles2 } // deqp + +#if defined(_MSC_VER) && _MSC_FULL_VER == 191125507 +// Work around crbug.com/759402 which is a code-gen bug in VC++ 2017, version +// 15.3.2. +#pragma optimize("", off) +#endif diff --git a/modules/gles3/functional/es3fShaderMatrixTests.cpp b/modules/gles3/functional/es3fShaderMatrixTests.cpp index 63bb63b..650d79e 100644 --- a/modules/gles3/functional/es3fShaderMatrixTests.cpp +++ b/modules/gles3/functional/es3fShaderMatrixTests.cpp @@ -1957,3 +1957,9 @@ void ShaderMatrixTests::init (void) } // Functional } // gles3 } // deqp + +#if defined(_MSC_VER) && _MSC_FULL_VER == 191125507 +// Work around crbug.com/759402 which is a code-gen bug in VC++ 2017, version +// 15.3.2. +#pragma optimize("", off) +#endif -- 2.7.4