commit d0fe875455a6ebf0b61297f2f5ee33963e54873b
author Robert Phillips <robertphillips@google.com> Thu Jan 31 14:13:59 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Feb 01 13:36:53 2019 +0000
tree 57e7fd84faeccf50f1a93346123e9903b5207299
parent 3dc93896b3a9c368c9f051a20822c35fd2efc25c

Remove destination GrRenderTargetProxy from GrPipeline

Change-Id: Ie2ee3d51220163fde8a959255dd5f6cce4e27ad8
Reviewed-on: https://skia-review.googlesource.com/c/188038
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrProgramDesc.cpp

diff --git a/src/gpu/GrProgramDesc.cpp b/src/gpu/GrProgramDesc.cpp
index d888a63..952dc00 100644
--- a/src/gpu/GrProgramDesc.cpp
+++ b/src/gpu/GrProgramDesc.cpp
@@ -193,6 +193,7 @@
 }
 
 bool GrProgramDesc::Build(GrProgramDesc* desc,
+                          GrPixelConfig config,
                           const GrPrimitiveProcessor& primProc,
                           bool hasPointSize,
                           const GrPipeline& pipeline,
@@ -246,7 +247,7 @@
 
     // make sure any padding in the header is zeroed.
     memset(header, 0, kHeaderSize);
-    header->fOutputSwizzle = shaderCaps.configOutputSwizzle(pipeline.proxy()->config()).asKey();
+    header->fOutputSwizzle = shaderCaps.configOutputSwizzle(config).asKey();
     header->fSnapVerticesToPixelCenters = pipeline.snapVerticesToPixelCenters();
     header->fColorFragmentProcessorCnt = pipeline.numColorFragmentProcessors();
     header->fCoverageFragmentProcessorCnt = pipeline.numCoverageFragmentProcessors();