diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-11-21 13:41:08 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-21 19:13:43 +0000 |
| commit | 99938a8ef24e2dd5b39f78638742e9b50ab6d9bf (patch) | |
| tree | e3842210db20a4574e9cec37ae7f049aaff27b65 /src/gpu/effects/GrBicubicEffect.cpp | |
| parent | d728f0c1a94fe926b59d8ebc9ae174019ccd3606 (diff) | |
Merge GrGLSLShaderVar and GrShaderVar
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5087
Change-Id: Ib8943a1da1ea495554feaf5b0992b94fbb9539ab
Reviewed-on: https://skia-review.googlesource.com/5087
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/gpu/effects/GrBicubicEffect.cpp')
| -rw-r--r-- | src/gpu/effects/GrBicubicEffect.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/gpu/effects/GrBicubicEffect.cpp b/src/gpu/effects/GrBicubicEffect.cpp index 4ea358ea10..ce7f344c17 100644 --- a/src/gpu/effects/GrBicubicEffect.cpp +++ b/src/gpu/effects/GrBicubicEffect.cpp @@ -7,6 +7,7 @@ #include "GrBicubicEffect.h" #include "GrInvariantOutput.h" +#include "glsl/GrGLSL.h" #include "glsl/GrGLSLColorSpaceXformHelper.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" @@ -66,13 +67,13 @@ void GrGLBicubicEffect::emitCode(EmitArgs& args) { SkString cubicBlendName; - static const GrGLSLShaderVar gCubicBlendArgs[] = { - GrGLSLShaderVar("coefficients", kMat44f_GrSLType), - GrGLSLShaderVar("t", kFloat_GrSLType), - GrGLSLShaderVar("c0", kVec4f_GrSLType), - GrGLSLShaderVar("c1", kVec4f_GrSLType), - GrGLSLShaderVar("c2", kVec4f_GrSLType), - GrGLSLShaderVar("c3", kVec4f_GrSLType), + static const GrShaderVar gCubicBlendArgs[] = { + GrShaderVar("coefficients", kMat44f_GrSLType), + GrShaderVar("t", kFloat_GrSLType), + GrShaderVar("c0", kVec4f_GrSLType), + GrShaderVar("c1", kVec4f_GrSLType), + GrShaderVar("c2", kVec4f_GrSLType), + GrShaderVar("c3", kVec4f_GrSLType), }; GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder; SkString coords2D = fragBuilder->ensureCoords2D(args.fTransformedCoords[0]); |