commit f272bea9a6a035d39e9d8ae740bcd39fc236b976
author Robert Phillips <robertphillips@google.com> Thu Oct 17 08:56:16 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Oct 17 18:07:59 2019 +0000
tree eb305b2728f1b9a9d683554ddf6249234d2126ec
parent 8c1cb1c3f2b1ea5af4d8030f24b026fc1a6aff9a

Plumb GrBackendFormat into the GrPrimitiveProcessor::TextureSampler

This is not a substantive CL. It is just setting up for removing the
usage of the GrGpu in the creation of the GrProgramDesc.

Change-Id: Ic24204de256862e5e780626bde3a44f4d735c6e9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/249121
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/ops/GrLatticeOp.cpp

diff --git a/src/gpu/ops/GrLatticeOp.cpp b/src/gpu/ops/GrLatticeOp.cpp
index adcfe8c..d63c7d6 100644
--- a/src/gpu/ops/GrLatticeOp.cpp
+++ b/src/gpu/ops/GrLatticeOp.cpp
@@ -96,12 +96,11 @@
               GrSamplerState::Filter filter, bool wideColor)
             : INHERITED(kLatticeGP_ClassID), fColorSpaceXform(std::move(csxf)) {
 
-        GrSamplerState samplerState = GrSamplerState(GrSamplerState::WrapMode::kClamp,
-                                                     filter);
+        GrSamplerState samplerState = GrSamplerState(GrSamplerState::WrapMode::kClamp, filter);
         uint32_t extraSamplerKey = gpu->getExtraSamplerKeyForProgram(samplerState,
                                                                      proxy->backendFormat());
 
-        fSampler.reset(proxy->textureType(), samplerState, proxy->textureSwizzle(),
+        fSampler.reset(samplerState, proxy->backendFormat(), proxy->textureSwizzle(),
                        extraSamplerKey);
         this->setTextureSamplerCnt(1);
         fInPosition = {"position", kFloat2_GrVertexAttribType, kFloat2_GrSLType};