commit c5c024791bb7a587223b807e00ffba4a3eb5fdb7
author Robert Phillips <robertphillips@google.com> Thu Dec 12 13:24:36 2019 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Dec 12 13:24:51 2019 +0000
tree 77202dc00cd211e686696b57da16c0576e60382f
parent 51b99659ed826c5009f9f261a17cf36a61c4702a

Revert "Update FragmentProcessor TextureSampler to hold an GrSurfaceProxyView."

This reverts commit acf5929ae0addc5188117142fd3fb39828baa8d5.

Reason for revert: May be blocking Chrome roll
Original change's description:
> 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>

TBR=egdaniel@google.com,michaelludwig@google.com

Change-Id: Ic804a52c5c6d16a13a9cc2d85bb959f305134177
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:9556
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/259433
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/gl/GrGLProgram.cpp

diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index 23442c5..53760e6 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -124,8 +124,7 @@
         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.view().swizzle(),
+            fGpu->bindTexture((*nextTexSamplerIdx)++, sampler.samplerState(), sampler.swizzle(),
                               static_cast<GrGLTexture*>(sampler.peekTexture()));
         }
     }