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/batches | |
| 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/batches')
| -rw-r--r-- | src/gpu/batches/GrPLSPathRenderer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/batches/GrPLSPathRenderer.cpp b/src/gpu/batches/GrPLSPathRenderer.cpp index e73f7f5722..1aedccb5f9 100644 --- a/src/gpu/batches/GrPLSPathRenderer.cpp +++ b/src/gpu/batches/GrPLSPathRenderer.cpp @@ -521,9 +521,9 @@ public: SkAssertResult(fsBuilder->enableFeature( GrGLSLFragmentShaderBuilder::kPixelLocalStorage_GLSLFeature)); static const int QUAD_ARGS = 2; - GrGLSLShaderVar inQuadArgs[QUAD_ARGS] = { - GrGLSLShaderVar("dot", kFloat_GrSLType, 0, kHigh_GrSLPrecision), - GrGLSLShaderVar("uv", kVec2f_GrSLType, 0, kHigh_GrSLPrecision) + GrShaderVar inQuadArgs[QUAD_ARGS] = { + GrShaderVar("dot", kFloat_GrSLType, 0, kHigh_GrSLPrecision), + GrShaderVar("uv", kVec2f_GrSLType, 0, kHigh_GrSLPrecision) }; SkString inQuadName; |