From 4dffc940c430eec66d4707490eace19c9b3f7904 Mon Sep 17 00:00:00 2001 From: egdaniel Date: Wed, 10 Dec 2014 07:43:49 -0800 Subject: Create xfer processor backend. This includes: -Having an actual XP stage at the end of the gl pipeline. -All Blending work is handled by XP until actually setting GL blend states -GLPrograms test to test XP BUG=skia: Review URL: https://codereview.chromium.org/764643004 --- src/gpu/gl/GrGLProgramDesc.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/gpu/gl/GrGLProgramDesc.cpp') diff --git a/src/gpu/gl/GrGLProgramDesc.cpp b/src/gpu/gl/GrGLProgramDesc.cpp index 068386c3aa..2476c5532c 100644 --- a/src/gpu/gl/GrGLProgramDesc.cpp +++ b/src/gpu/gl/GrGLProgramDesc.cpp @@ -189,13 +189,21 @@ bool GrGLProgramDescBuilder::Build(const GrOptDrawState& optState, const GrFragmentProcessor& fp = *fps.getProcessor(); GrProcessorKeyBuilder b(&desc->fKey); fp.getGLProcessorKey(gpu->glCaps(), &b); - if (!get_meta_key(*fps.getProcessor(), gpu->glCaps(), - gen_transform_key(fps, requiresLocalCoordAttrib), 0, &b)) { + if (!get_meta_key(fp, gpu->glCaps(), + gen_transform_key(fps, requiresLocalCoordAttrib), 0, &b)) { desc->fKey.reset(); return false; } } + const GrXferProcessor& xp = *optState.getXferProcessor(); + GrProcessorKeyBuilder b(&desc->fKey); + xp.getGLProcessorKey(gpu->glCaps(), &b); + if (!get_meta_key(xp, gpu->glCaps(), 0, 0, &b)) { + desc->fKey.reset(); + return false; + } + // --------DO NOT MOVE HEADER ABOVE THIS LINE-------------------------------------------------- // Because header is a pointer into the dynamic array, we can't push any new data into the key // below here. @@ -260,9 +268,6 @@ bool GrGLProgramDescBuilder::Build(const GrOptDrawState& optState, header->fFragPosKey = 0; } - header->fPrimaryOutputType = descInfo.fPrimaryOutputType; - header->fSecondaryOutputType = descInfo.fSecondaryOutputType; - header->fColorEffectCnt = optState.numColorStages(); header->fCoverageEffectCnt = optState.numCoverageStages(); desc->finalize(); -- cgit v1.2.3