commit 655fe36e254e7f11e79a4fad4febd5d768194c35
author Nicolas Capens <nicolascapens@chromium.org> Fri Apr 11 13:12:34 2014 -0400
committer Nicolas Capens <nicolascapens@chromium.org> Fri Apr 11 18:12:53 2014 +0000
tree 6116b6a88bec4224cb3ed3e269f2fc53922c1ab5
parent 15cba8b12cec6c45c0c8793ad14eeb4cf5f86cba

Use shader optimization level 3 selectively.

Default to HLSL compiler optimization level 1 and work around a compiler bug with break in nested loops by using optimization level 3.

BUG=angle:603

Change-Id: I4f7985a5648f1b5f54d80554c21aced7fc1777c2
Reviewed-on: https://chromium-review.googlesource.com/194129
Tested-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

src/libGLESv2/Shader.cpp

diff --git a/src/libGLESv2/Shader.cpp b/src/libGLESv2/Shader.cpp
index 14bfe0a..75a7bbc 100644
--- a/src/libGLESv2/Shader.cpp
+++ b/src/libGLESv2/Shader.cpp
@@ -238,6 +238,7 @@
         mUsesDepthRange            = mHlsl.find("GL_USES_DEPTH_RANGE")  != std::string::npos;
         mUsesFragDepth             = mHlsl.find("GL_USES_FRAG_DEPTH")   != std::string::npos;
         mUsesDiscardRewriting      = mHlsl.find("ANGLE_USES_DISCARD_REWRITING") != std::string::npos;
+        mUsesNestedBreak           = mHlsl.find("ANGLE_USES_NESTED_BREAK") != std::string::npos;
     }
 }
 
@@ -270,6 +271,7 @@
     mUsesFragDepth = false;
     mShaderVersion = 100;
     mUsesDiscardRewriting = false;
+    mUsesNestedBreak = false;
 
     mActiveUniforms.clear();
     mActiveInterfaceBlocks.clear();
@@ -377,7 +379,17 @@
 {
     if (mUsesDiscardRewriting)
     {
-        return rx::ANGLE_D3D_WORKAROUND_SM3_OPTIMIZER;
+        // ANGLE issue 486:
+        // Work-around a D3D9 compiler bug that presents itself when using conditional discard, by disabling optimization
+        return rx::ANGLE_D3D_WORKAROUND_SKIP_OPTIMIZATION;
+    }
+
+    if (mUsesNestedBreak)
+    {
+        // ANGLE issue 603:
+        // Work-around a D3D9 compiler bug that presents itself when using break in a nested loop, by maximizing optimization
+        // We want to keep the use of ANGLE_D3D_WORKAROUND_MAX_OPTIMIZATION minimal to prevent hangs, so usesDiscard takes precedence
+        return rx::ANGLE_D3D_WORKAROUND_MAX_OPTIMIZATION;
     }
 
     return rx::ANGLE_D3D_WORKAROUND_NONE;