commit a7dc0a83f0b59424a61e01bf3435cd7957e84e35
author egdaniel <egdaniel@google.com> Wed Sep 17 08:25:05 2014 -0700
committer Commit bot <commit-bot@chromium.org> Wed Sep 17 08:25:05 2014 -0700
tree 1cc755e80acf10963d420916cdf88bf362150c57
parent f96ba02513eadd9fa24d75396ec9f2d6682e464c

Calculate stage stats in GrOptDrawState

BUG=skia:
R=bsalomon@google.com

Author: egdaniel@google.com

Review URL: https://codereview.chromium.org/545693004

tests/GLProgramsTest.cpp

diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index e8b6da5..a748212 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -21,6 +21,19 @@
 #include "SkRandom.h"
 #include "Test.h"
 
+static void get_stage_stats(const GrEffectStage stage, bool* readsDst,
+                            bool* readsFragPosition, bool* requiresVertexShader) {
+    if (stage.getEffect()->willReadDstColor()) {
+        *readsDst = true;
+    }
+    if (stage.getEffect()->willReadFragmentPosition()) {
+        *readsFragPosition = true;
+    }
+    if (stage.getEffect()->requiresVertexShader()) {
+        *requiresVertexShader = true;
+    }
+}
+
 bool GrGLProgramDesc::setRandom(SkRandom* random,
                                 const GrGpuGL* gpu,
                                 const GrRenderTarget* dstRenderTarget,
@@ -57,11 +70,11 @@
         }
         GrEffectKeyBuilder b(&fKey);
         uint16_t effectKeySize;
-        if (!GetEffectKeyAndUpdateStats(*stage, gpu->glCaps(), useLocalCoords, &b,
-                                        &effectKeySize, &dstRead, &fragPos, &vertexShader)) {
+        if (!GetEffectKey(*stage, gpu->glCaps(), useLocalCoords, &b, &effectKeySize)) {
             fKey.reset();
             return false;
         }
+        get_stage_stats(*stage, &dstRead, &fragPos, &vertexShader);
         offsetAndSize[0] = effectKeyOffset;
         offsetAndSize[1] = effectKeySize;
         offset++;
@@ -79,11 +92,11 @@
         }
         GrEffectKeyBuilder b(&fKey);
         uint16_t effectKeySize;
-        if (!GetEffectKeyAndUpdateStats(*stage, gpu->glCaps(), useLocalCoords, &b,
-                                        &effectKeySize, &dstRead, &fragPos, &vertexShader)) {
+        if (!GetEffectKey(*stages[s], gpu->glCaps(), useLocalCoords, &b, &effectKeySize)) {
             fKey.reset();
             return false;
         }
+        get_stage_stats(*stage, &dstRead, &fragPos, &vertexShader);
         offsetAndSize[0] = effectKeyOffset;
         offsetAndSize[1] = effectKeySize;
     }