diff options
| author |  bsalomon <bsalomon@google.com> | 2015-12-21 13:12:54 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-21 13:12:55 -0800 |
| commit | 2047b7855546b21f7956c398592c070b3f91a9db (patch) | |
| tree | 1d1c46f1e3248373f58c0d72b897077621b6ea00 /src/gpu/gl | |
| parent | bada1885da479d948f065182d6dfa85a1140bda5 (diff) | |
Don't ref/unref the static src-over xp
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1540363002
bug=chromium:570301
Review URL: https://codereview.chromium.org/1540363002
Diffstat (limited to 'src/gpu/gl')
| -rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLProgram.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLProgramDesc.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/gl/builders/GrGLProgramBuilder.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 32242c5015..f5c646c86f 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -1495,7 +1495,7 @@ void GrGLGpu::flushScissor(const GrScissorState& scissorState, bool GrGLGpu::flushGLState(const DrawArgs& args) { GrXferProcessor::BlendInfo blendInfo; const GrPipeline& pipeline = *args.fPipeline; - args.fPipeline->getXferProcessor()->getBlendInfo(&blendInfo); + args.fPipeline->getXferProcessor().getBlendInfo(&blendInfo); this->flushColorWrite(blendInfo.fWriteColor); this->flushDrawFace(pipeline.getDrawFace()); diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp index 3cf9e4dd7c..c1f5b37b07 100644 --- a/src/gpu/gl/GrGLProgram.cpp +++ b/src/gpu/gl/GrGLProgram.cpp @@ -89,7 +89,7 @@ void GrGLProgram::setData(const GrPrimitiveProcessor& primProc, this->setFragmentData(primProc, pipeline, textureBindings); - const GrXferProcessor& xp = *pipeline.getXferProcessor(); + const GrXferProcessor& xp = pipeline.getXferProcessor(); fXferProcessor->fGLProc->setData(fProgramDataManager, xp); append_texture_bindings(fXferProcessor.get(), xp, textureBindings); } diff --git a/src/gpu/gl/GrGLProgramDesc.cpp b/src/gpu/gl/GrGLProgramDesc.cpp index e3d292c062..81f92eb243 100644 --- a/src/gpu/gl/GrGLProgramDesc.cpp +++ b/src/gpu/gl/GrGLProgramDesc.cpp @@ -125,7 +125,7 @@ bool GrGLProgramDescBuilder::Build(GrProgramDesc* desc, } } - const GrXferProcessor& xp = *pipeline.getXferProcessor(); + const GrXferProcessor& xp = pipeline.getXferProcessor(); xp.getGLSLProcessorKey(*gpu->glCaps().glslCaps(), &b); //**** use glslCaps here? if (!gen_meta_key(xp, gpu->glCaps(), 0, &b)) { diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index dc9393db07..97fcce59b7 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -93,7 +93,7 @@ bool GrGLProgramBuilder::emitAndInstallProcs(GrGLSLExpr4* inputColor, GrGLSLExpr this->emitAndInstallFragProcs(0, this->pipeline().numColorFragmentProcessors(), inputColor); this->emitAndInstallFragProcs(this->pipeline().numColorFragmentProcessors(), numProcs, inputCoverage); - this->emitAndInstallXferProc(*this->pipeline().getXferProcessor(), *inputColor, *inputCoverage, + this->emitAndInstallXferProc(this->pipeline().getXferProcessor(), *inputColor, *inputCoverage, this->pipeline().ignoresCoverage()); return true; } |