commit acf5929ae0addc5188117142fd3fb39828baa8d5
author Greg Daniel <egdaniel@google.com> Wed Dec 11 13:45:17 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Dec 11 23:17:15 2019 +0000
tree ae58cf180b05b03c5a86790063edb3b315cd4d89
parent 1031994219b118007dcbce4d1da085da64be8b68

Update FragmentProcessor TextureSampler to hold an GrSurfaceProxyView.

In future CLs I will update the Ops that create the TextureSamplers to pass
the GrSurfaceProxyView in.

Bug: skia:9556
Change-Id: I550dab64974d32e4c3047188063efa2d0832328e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/259164
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>

src/gpu/gl/GrGLProgram.cpp

diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index 53760e6..23442c5 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -124,7 +124,8 @@
         glslIter->setData(fProgramDataManager, *fpIter);
         for (int i = 0; i < fpIter->numTextureSamplers(); ++i) {
             const GrFragmentProcessor::TextureSampler& sampler = fpIter->textureSampler(i);
-            fGpu->bindTexture((*nextTexSamplerIdx)++, sampler.samplerState(), sampler.swizzle(),
+            fGpu->bindTexture((*nextTexSamplerIdx)++, sampler.samplerState(),
+                              sampler.view().swizzle(),
                               static_cast<GrGLTexture*>(sampler.peekTexture()));
         }
     }