| commit | d523a06516d6ce92fa9d81726714672055d8df2e | [log] [tgz] |
|---|---|---|
| author | Stephen White <senorblanco@chromium.org> | Wed Jun 19 13:12:46 2019 -0400 |
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Wed Jun 19 18:56:09 2019 +0000 |
| tree | e40e137e9c9a36e364cac857bbd8f7c5cc6d44b3 | |
| parent | 613282042da1199a3f10fa5e2df69dda5901c871 [diff] [blame] |
Change samplerVariable() to return a const char *. This allows backends to use an expression rather than a variable for sampler access. Change-Id: I2346ac418c8d6277416a4430e2eaf6ab3ffee0a2 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/222036 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.h b/src/gpu/glsl/GrGLSLProgramBuilder.h index 654dcbb..7563a92 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.h +++ b/src/gpu/glsl/GrGLSLProgramBuilder.h
@@ -51,7 +51,7 @@ void appendUniformDecls(GrShaderFlags visibility, SkString*) const; - const GrShaderVar& samplerVariable(SamplerHandle handle) const { + const char* samplerVariable(SamplerHandle handle) const { return this->uniformHandler()->samplerVariable(handle); }