diff options
author | Brian Salomon <bsalomon@google.com> | 2018-06-23 15:17:27 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-25 17:55:45 +0000 |
commit | ff168d9258e0101826a8072b4ee077c3d2aa7258 (patch) | |
tree | c8338ce3ffb83b18575785a3bd98b2607e59bb1a /src/gpu/ccpr | |
parent | 721e63727f38b9c7664a173ab475d7c7a58cd8a8 (diff) |
Put GrPrimitiveProcessor/GrGeometryProcessor before GrPipeline in param lists.
We were inconsistent about which order these were in. Having the processor first
will make the parameter order more logical for an upcoming change. Also, the primitive
processor comes logically before the pipeline.
Change-Id: I3968c5e4e6dff01f9c4ad311eb1795b3c7580ff5
Reviewed-on: https://skia-review.googlesource.com/137228
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/ccpr')
-rw-r--r-- | src/gpu/ccpr/GrCCCoverageProcessor.cpp | 4 | ||||
-rw-r--r-- | src/gpu/ccpr/GrCCPathProcessor.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/ccpr/GrCCCoverageProcessor.cpp b/src/gpu/ccpr/GrCCCoverageProcessor.cpp index 75d0667b09..94b027abe9 100644 --- a/src/gpu/ccpr/GrCCCoverageProcessor.cpp +++ b/src/gpu/ccpr/GrCCCoverageProcessor.cpp @@ -228,12 +228,12 @@ void GrCCCoverageProcessor::draw(GrOpFlushState* flushState, const GrPipeline& p const GrPipeline::DynamicState dynamicStates[], int meshCount, const SkRect& drawBounds) const { GrGpuRTCommandBuffer* cmdBuff = flushState->rtCommandBuffer(); - cmdBuff->draw(pipeline, *this, meshes, dynamicStates, meshCount, drawBounds); + cmdBuff->draw(*this, pipeline, meshes, dynamicStates, meshCount, drawBounds); // Geometry shader backend draws primitives in two subpasses. if (Impl::kGeometryShader == fImpl) { SkASSERT(GSSubpass::kHulls == fGSSubpass); GrCCCoverageProcessor cornerProc(*this, GSSubpass::kCorners); - cmdBuff->draw(pipeline, cornerProc, meshes, dynamicStates, meshCount, drawBounds); + cmdBuff->draw(cornerProc, pipeline, meshes, dynamicStates, meshCount, drawBounds); } } diff --git a/src/gpu/ccpr/GrCCPathProcessor.cpp b/src/gpu/ccpr/GrCCPathProcessor.cpp index e180724f8a..e1a508619a 100644 --- a/src/gpu/ccpr/GrCCPathProcessor.cpp +++ b/src/gpu/ccpr/GrCCPathProcessor.cpp @@ -147,7 +147,7 @@ void GrCCPathProcessor::drawPaths(GrOpFlushState* flushState, const GrPipeline& enablePrimitiveRestart); mesh.setVertexData(resources.vertexBuffer()); - flushState->rtCommandBuffer()->draw(pipeline, *this, &mesh, nullptr, 1, bounds); + flushState->rtCommandBuffer()->draw(*this, pipeline, &mesh, nullptr, 1, bounds); } void GLSLPathProcessor::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { |