commit 8dd688b7569df569a672a8a67b2db86a9d376cfc
author egdaniel <egdaniel@google.com> Thu Jan 22 10:16:09 2015 -0800
committer Commit bot <commit-bot@chromium.org> Thu Jan 22 10:16:09 2015 -0800
tree e173468f68becd63d0796010c6ddf15215912d3b
parent e44acc9617b875e2ffc84cdf938a5e359e8e8edb

Rename GrOptDrawState to GrPipeline and GrDrawState to GrPipelineBuilder

BUG=skia:

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

src/gpu/gl/GrGLProgramDesc.cpp

diff --git a/src/gpu/gl/GrGLProgramDesc.cpp b/src/gpu/gl/GrGLProgramDesc.cpp
index a89941c..32f831e 100644
--- a/src/gpu/gl/GrGLProgramDesc.cpp
+++ b/src/gpu/gl/GrGLProgramDesc.cpp
@@ -9,7 +9,7 @@
 #include "GrGLProcessor.h"
 #include "GrProcessor.h"
 #include "GrGLGpu.h"
-#include "GrOptDrawState.h"
+#include "GrPipeline.h"
 #include "SkChecksum.h"
 #include "gl/builders/GrGLFragmentShaderBuilder.h"
 
@@ -88,7 +88,7 @@
 
 bool GrGLProgramDescBuilder::Build(GrProgramDesc* desc,
                                    const GrPrimitiveProcessor& primProc,
-                                   const GrOptDrawState& optState,
+                                   const GrPipeline& pipeline,
                                    const GrProgramDesc::DescInfo& descInfo,
                                    const GrGLGpu* gpu,
                                    const GrBatchTracker& batchTracker) {
@@ -110,8 +110,8 @@
         return false;
     }
 
-    for (int s = 0; s < optState.numFragmentStages(); ++s) {
-        const GrPendingFragmentStage& fps = optState.getFragmentStage(s);
+    for (int s = 0; s < pipeline.numFragmentStages(); ++s) {
+        const GrPendingFragmentStage& fps = pipeline.getFragmentStage(s);
         const GrFragmentProcessor& fp = *fps.processor();
         fp.getGLProcessorKey(gpu->glCaps(), &b);
         if (!get_meta_key(fp, gpu->glCaps(), primProc.getTransformKey(fp.coordTransforms()), &b)) {
@@ -120,7 +120,7 @@
         }
     }
 
-    const GrXferProcessor& xp = *optState.getXferProcessor();
+    const GrXferProcessor& xp = *pipeline.getXferProcessor();
     xp.getGLProcessorKey(gpu->glCaps(), &b);
     if (!get_meta_key(xp, gpu->glCaps(), 0, &b)) {
         desc->fKey.reset();
@@ -136,7 +136,7 @@
     memset(header, 0, kHeaderSize);
 
     if (descInfo.fReadsDst) {
-        const GrDeviceCoordTexture* dstCopy = optState.getDstCopy();
+        const GrDeviceCoordTexture* dstCopy = pipeline.getDstCopy();
         SkASSERT(dstCopy || gpu->caps()->dstReadInShaderSupport());
         const GrTexture* dstCopyTexture = NULL;
         if (dstCopy) {
@@ -151,14 +151,14 @@
 
     if (descInfo.fReadsFragPosition) {
         header->fFragPosKey =
-                GrGLFragmentShaderBuilder::KeyForFragmentPosition(optState.getRenderTarget(),
+                GrGLFragmentShaderBuilder::KeyForFragmentPosition(pipeline.getRenderTarget(),
                                                                   gpu->glCaps());
     } else {
         header->fFragPosKey = 0;
     }
 
-    header->fColorEffectCnt = optState.numColorStages();
-    header->fCoverageEffectCnt = optState.numCoverageStages();
+    header->fColorEffectCnt = pipeline.numColorStages();
+    header->fCoverageEffectCnt = pipeline.numCoverageStages();
     desc->finalize();
     return true;
 }