diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-11-29 13:43:05 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-29 19:32:31 +0000 |
| commit | 94efbf51f5a88d9e8aa961d3fbe38c5e335d6108 (patch) | |
| tree | 2723f6ec5bfc291d4a52adf961165e3e74a098ca /src/gpu/GrRenderTargetContext.cpp | |
| parent | e11b614795bbe707d131ad599ead5be452e7c06f (diff) | |
Merge GrGLSLCaps into GrShaderCaps
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5121
Change-Id: If8d13638f80f42161cbc766a2666c5789e5772c8
Reviewed-on: https://skia-review.googlesource.com/5121
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrRenderTargetContext.cpp')
| -rw-r--r-- | src/gpu/GrRenderTargetContext.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp index 8cc6dd9c49..4cba6b9a70 100644 --- a/src/gpu/GrRenderTargetContext.cpp +++ b/src/gpu/GrRenderTargetContext.cpp @@ -891,7 +891,7 @@ void GrRenderTargetContext::drawRRect(const GrClip& origClip, } if (should_apply_coverage_aa(paint, fRenderTargetProxy.get(), &useHWAA)) { - GrShaderCaps* shaderCaps = fContext->caps()->shaderCaps(); + const GrShaderCaps* shaderCaps = fContext->caps()->shaderCaps(); sk_sp<GrDrawBatch> batch(GrOvalRenderer::CreateRRectBatch(paint.getColor(), paint.usesDistanceVectorField(), viewMatrix, @@ -948,7 +948,7 @@ void GrRenderTargetContext::drawShadowRRect(const GrClip& clip, //} if (should_apply_coverage_aa(paint, fRenderTargetProxy.get(), &useHWAA)) { - GrShaderCaps* shaderCaps = fContext->caps()->shaderCaps(); + const GrShaderCaps* shaderCaps = fContext->caps()->shaderCaps(); sk_sp<GrDrawBatch> batch(CreateShadowRRectBatch( paint.getColor(), viewMatrix, @@ -1134,7 +1134,7 @@ void GrRenderTargetContext::drawOval(const GrClip& clip, } if (should_apply_coverage_aa(paint, fRenderTargetProxy.get(), &useHWAA)) { - GrShaderCaps* shaderCaps = fContext->caps()->shaderCaps(); + const GrShaderCaps* shaderCaps = fContext->caps()->shaderCaps(); sk_sp<GrDrawBatch> batch(GrOvalRenderer::CreateOvalBatch(paint.getColor(), viewMatrix, oval, @@ -1163,7 +1163,7 @@ void GrRenderTargetContext::drawArc(const GrClip& clip, const GrStyle& style) { bool useHWAA; if (should_apply_coverage_aa(paint, fRenderTargetProxy.get(), &useHWAA)) { - GrShaderCaps* shaderCaps = fContext->caps()->shaderCaps(); + const GrShaderCaps* shaderCaps = fContext->caps()->shaderCaps(); sk_sp<GrDrawBatch> batch(GrOvalRenderer::CreateArcBatch(paint.getColor(), viewMatrix, oval, @@ -1377,7 +1377,7 @@ void GrRenderTargetContext::drawPath(const GrClip& clip, bool isOval = path.isOval(&ovalRect); if (isOval && !path.isInverseFillType()) { - GrShaderCaps* shaderCaps = fContext->caps()->shaderCaps(); + const GrShaderCaps* shaderCaps = fContext->caps()->shaderCaps(); sk_sp<GrDrawBatch> batch(GrOvalRenderer::CreateOvalBatch(paint.getColor(), viewMatrix, ovalRect, |