D3D11: Fix integer pow workaround for nested pows.

src/compiler/translator/ExpandIntegerPowExpressions.cpp

@@ -27,6 +27,9 @@ class Traverser : public TIntermTraverser
   private:
     Traverser();
     bool visitAggregate(Visit visit, TIntermAggregate *node) override;
+    void nextIteration();
+
+    bool mFound = false;
 };
 
 // static
@@ -34,16 +37,34 @@ void Traverser::Apply(TIntermNode *root, unsigned int *tempIndex)
 {
     Traverser traverser;
     traverser.useTemporaryIndex(tempIndex);
-    root->traverse(&traverser);
-    traverser.updateTree();
+    do
+    {
+        traverser.nextIteration();
+        root->traverse(&traverser);
+        if (traverser.mFound)
+        {
+            traverser.updateTree();
+        }
+    } while (traverser.mFound);
 }
 
 Traverser::Traverser() : TIntermTraverser(true, false, false)
 {
 }
 
+void Traverser::nextIteration()
+{
+    mFound = false;
+    nextTemporaryIndex();
+}
+
 bool Traverser::visitAggregate(Visit visit, TIntermAggregate *node)
 {
+    if (mFound)
+    {
+        return false;
+    }
+
     // Test 0: skip non-pow operators.
     if (node->getOp() != EOpPow)
     {
@@ -123,7 +144,8 @@ bool Traverser::visitAggregate(Visit visit, TIntermAggregate *node)
     }
 
     queueReplacement(node, current, OriginalNode::IS_DROPPED);
-    return true;
+    mFound = true;
+    return false;
 }
 
 }  // anonymous namespace

src/tests/gl_tests/GLSLTest.cpp

@@ -2158,6 +2158,33 @@ TEST_P(GLSLTest, RenderTrisWithPointCoord)
     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
 }
 
+// Convers a bug with the integer pow statement workaround.
+TEST_P(GLSLTest, NestedPowStatements)
+{
+    const std::string &vert =
+        "attribute vec2 position;\n"
+        "void main()\n"
+        "{\n"
+        "    gl_Position = vec4(position, 0, 1);\n"
+        "}";
+    const std::string &frag =
+        "precision mediump float;\n"
+        "float func(float v)\n"
+        "{\n"
+        "   float f1 = pow(v, 2.0);\n"
+        "   return pow(f1 + v, 2.0);\n"
+        "}\n"
+        "void main()\n"
+        "{\n"
+        "    float v = func(2.0);\n"
+        "    gl_FragColor = abs(v - 36.0) < 0.001 ? vec4(0, 1, 0, 1) : vec4(1, 0, 0, 1);\n"
+        "}";
+
+    ANGLE_GL_PROGRAM(prog, vert, frag);
+    drawQuad(prog.get(), "position", 0.5f);
+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
+}
+
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
 ANGLE_INSTANTIATE_TEST(GLSLTest,
                        ES2_D3D9(),