Work around VC++ 2017 compiler bug

A code-gen bug was found in 15.3.2 (VC++ 2017 Update 3.2) that causes test failures due to one loop being skipped. Attempts to disable optimizations for just the affected function failed so optimizations must be disabled at the end of the source file, which seems to cause all template functions and compiler generated functions to have optimizations disabled. A VS bug has been filed and cross-linked. BUG=759402 Change-Id: Ida765a47234a63bad48e6a4e910f3b82919d6be9 Reviewed-on: https://chromium-review.googlesource.com/647313Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

Work around VC++ 2017 compiler bug
fb2a871c · Geoff Lang · Commit Bot · f00f7ffe · fb2a871c · fb2a871c
Commit fb2a871c authored Sep 01, 2017 by Geoff Lang Committed by Commit Bot Sep 01, 2017
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

deqp.gypi src/tests/deqp.gypi +10 -1

es2fShaderMatrixTests.cpp src/tests/deqp_support/es2fShaderMatrixTests.cpp +0 -0

No files found.
--- a/src/tests/deqp.gypi
+++ b/src/tests/deqp.gypi
@@ -229,7 +229,6 @@
            '<(deqp_path)/modules/gles2/functional/es2fShaderInvarianceTests.hpp',
            '<(deqp_path)/modules/gles2/functional/es2fShaderLoopTests.cpp',
            '<(deqp_path)/modules/gles2/functional/es2fShaderLoopTests.hpp',
-            '<(deqp_path)/modules/gles2/functional/es2fShaderMatrixTests.cpp',
            '<(deqp_path)/modules/gles2/functional/es2fShaderMatrixTests.hpp',
            '<(deqp_path)/modules/gles2/functional/es2fShaderOperatorTests.cpp',
            '<(deqp_path)/modules/gles2/functional/es2fShaderOperatorTests.hpp',
@@ -324,6 +323,10 @@
            '<(deqp_path)/modules/gles2/tes2TestPackage.cpp',
            '<(deqp_path)/modules/gles2/tes2TestPackage.hpp',
            '<(deqp_path)/modules/gles2/tes2TestPackageEntry.cpp',
+            # TODO(geofflang): Remove this once the test is updated in dEQP or the VC++2017
+            # compiler is fixed (crbug.com/759402)
+            #'<(deqp_path)/modules/gles2/functional/es2fShaderMatrixTests.cpp',
+            '<(angle_path)/src/tests/deqp_support/es2fShaderMatrixTests.cpp',
        ],
        'deqp_gles3_sources':
        [
@@ -1629,6 +1632,12 @@
                        'deqp_support/tcuANGLEPlatform.cpp',
                        'deqp_support/tcuANGLEPlatform.h',
                    ],
+                    # TODO(geofflang): Remove once es2fShaderMatrixTests.cpp no longer requires
+                    # a local copy (crbug.com/759402)
+                    'include_dirs':
+                    [
+                        '<(deqp_path)/modules/gles2/functional',
+                    ],
                },
                {

--- a/src/tests/deqp_support/es2fShaderMatrixTests.cpp
+++ b/src/tests/deqp_support/es2fShaderMatrixTests.cpp