commit af87483873f0b370b90ebe956301a13cc8662cbe
author Brian Salomon <bsalomon@google.com> Fri Aug 03 11:53:40 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Aug 03 17:24:05 2018 +0000
tree 9284af57721c6be1e4699a1c376df8eb84b79d74
parent cdfa16d086b8ace59b53b9932854db905c25c72b

Move GrGeometryProcessor's textures out of classes and into
GrPipeline::FixedDynamicState.

This will allow specification of different textures for different
GrMeshes using GrPipeline::DynamicStateArrays in a future change.

Change-Id: I4a7897df33a84e4072151149e5d586dca074393f
Reviewed-on: https://skia-review.googlesource.com/145264
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/glsl/GrGLSLProgramBuilder.cpp

diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/src/gpu/glsl/GrGLSLProgramBuilder.cpp
index b0cf816..66e333a 100644
--- a/src/gpu/glsl/GrGLSLProgramBuilder.cpp
+++ b/src/gpu/glsl/GrGLSLProgramBuilder.cpp
@@ -101,9 +101,8 @@
         SkString name;
         name.printf("TextureSampler_%d", i);
         const auto& sampler = proc.textureSampler(i);
-        GrTextureType textureType = sampler.peekTexture()->texturePriv().textureType();
-        texSamplers[i] = this->emitSampler(textureType, sampler.peekTexture()->config(),
-                                           name.c_str(), sampler.visibility());
+        texSamplers[i] = this->emitSampler(sampler.textureType(), sampler.config(), name.c_str(),
+                                           sampler.visibility());
     }
 
     GrGLSLPrimitiveProcessor::FPCoordTransformHandler transformHandler(fPipeline,