Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(360)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/gpu/GrOptDrawState.cpp

Issue 759713002: Make all blending up to GrOptDrawState be handled by the xp/xp factory. (Closed) Base URL: https://skia.googlesource.com/skia.git@xferFactorySolo
Patch Set: Update from review comments Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« src/gpu/GrDrawState.h ('K') | « src/gpu/GrOptDrawState.h ('k') | src/gpu/GrPaint.cpp » ('j') | src/gpu/effects/GrPorterDuffXferProcessor.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrOptDrawState.cpp
diff --git a/src/gpu/GrOptDrawState.cpp b/src/gpu/GrOptDrawState.cpp
index d95bd3b7c42017a2526f4fd3e7fcb662bed8502e..647095f18da547950e5cab4827e80d4200d39365 100644
--- a/src/gpu/GrOptDrawState.cpp
+++ b/src/gpu/GrOptDrawState.cpp
@@ -11,6 +11,7 @@
#include "GrDrawTargetCaps.h"
#include "GrGpu.h"
#include "GrProcOptInfo.h"
+#include "GrXferProcessor.h"
GrOptDrawState::GrOptDrawState(const GrDrawState& drawState,
const GrDrawTargetCaps& caps,
@@ -19,14 +20,35 @@ GrOptDrawState::GrOptDrawState(const GrDrawState& drawState,
GrGpu::DrawType drawType)
: fFinalized(false) {
fDrawType = drawType;
- GrBlendCoeff optSrcCoeff;
- GrBlendCoeff optDstCoeff;
- GrDrawState::BlendOpt blendOpt = drawState.getBlendOpt(false, &optSrcCoeff, &optDstCoeff);
+
+ const GrProcOptInfo& colorPOI = drawState.colorProcInfo();
+ const GrProcOptInfo& coveragePOI = drawState.coverageProcInfo();
+
+ fColor = colorPOI.inputColorToEffectiveStage();
+ fCoverage = drawState.getCoverage();
+
+ // Create XferProcessor from DS's XPFactory
+ SkAutoTUnref<GrXferProcessor> xferProcessor(
+ drawState.getXPFactory()->createXferProcessor(colorPOI, coveragePOI));
+
+ GrXferProcessor::OptFlags optFlags;
+ if (xferProcessor.get()) {
bsalomon 2014/12/08 15:38:51 xferProcessor casts to bool, don't need .get()
egdaniel 2014/12/08 16:24:01 Done.
+ fXferProcessor.reset(xferProcessor.get());
+
+ optFlags = xferProcessor->getOptimizations(colorPOI,
+ coveragePOI,
+ drawState.isCoverageDrawing(),
+ drawState.isColorWriteDisabled(),
+ drawState.getStencil().doesWrite(),
+ &fColor,
+ &fCoverage);
+ }
// When path rendering the stencil settings are not always set on the draw state
// so we must check the draw type. In cases where we will skip drawing we simply return a
// null GrOptDrawState.
- if (GrDrawState::kSkipDraw_BlendOpt == blendOpt && GrGpu::kStencilPath_DrawType != drawType) {
+ if (NULL == xferProcessor.get() || ((GrXferProcessor::kSkipDraw_OptFlag & optFlags) &&
bsalomon 2014/12/08 15:38:51 if (!xferProcessor || ...
egdaniel 2014/12/08 16:24:01 Done.
+ GrGpu::kStencilPath_DrawType != drawType)) {
// Set the fields that don't default init and return. The lack of a render target will
// indicate that this can be skipped.
fFlags = 0;
@@ -42,12 +64,8 @@ GrOptDrawState::GrOptDrawState(const GrDrawState& drawState,
SkASSERT(fRenderTarget);
fScissorState = scissorState;
fViewMatrix = drawState.getViewMatrix();
- fBlendConstant = drawState.getBlendConstant();
fStencilSettings = drawState.getStencil();
fDrawFace = drawState.getDrawFace();
- fSrcBlend = optSrcCoeff;
- fDstBlend = optDstCoeff;
-
// TODO move this out of optDrawState
if (dstCopy) {
fDstCopy = *dstCopy;
@@ -73,10 +91,8 @@ GrOptDrawState::GrOptDrawState(const GrDrawState& drawState,
bool hasLocalCoords = drawState.hasGeometryProcessor() &&
drawState.getGeometryProcessor()->hasLocalCoords();
- const GrProcOptInfo& colorPOI = drawState.colorProcInfo();
int firstColorStageIdx = colorPOI.firstEffectiveStageIndex();
fDescInfo.fInputColorIsUsed = colorPOI.inputColorIsUsed();
- fColor = colorPOI.inputColorToEffectiveStage();
if (colorPOI.removeVertexAttrib()) {
fDescInfo.fHasVertexColor = false;
}
@@ -85,12 +101,18 @@ GrOptDrawState::GrOptDrawState(const GrDrawState& drawState,
// drawState's coverageProcInfo (like color above) to set this initial information.
int firstCoverageStageIdx = 0;
fDescInfo.fInputCoverageIsUsed = true;
- fCoverage = drawState.getCoverage();
- this->adjustProgramForBlendOpt(drawState, blendOpt, &firstColorStageIdx,
- &firstCoverageStageIdx);
- this->getStageStats(drawState, firstColorStageIdx, firstCoverageStageIdx, hasLocalCoords);
+ GrXferProcessor::BlendInfo blendInfo;
+ fXferProcessor->getBlendInfo(&blendInfo);
+ fSrcBlend = blendInfo.fSrcBlend;
+ fDstBlend = blendInfo.fDstBlend;
+ fBlendConstant = blendInfo.fBlendConstant;
+
+ this->adjustProgramFromOptimizations(drawState, optFlags, colorPOI, coveragePOI,
+ &firstColorStageIdx, &firstCoverageStageIdx);
+
+ fDescInfo.fRequiresLocalCoordAttrib = hasLocalCoords;
// Copy GeometryProcesssor from DS or ODS
SkASSERT(GrGpu::IsPathRenderingDrawType(drawType) ||
@@ -98,17 +120,13 @@ GrOptDrawState::GrOptDrawState(const GrDrawState& drawState,
drawState.hasGeometryProcessor());
fGeometryProcessor.reset(drawState.getGeometryProcessor());
- // Create XferProcessor from DS's XPFactory
- const GrXferProcessor* xpProcessor = drawState.getXPFactory()->createXferProcessor();
- fXferProcessor.reset(xpProcessor);
- xpProcessor->unref();
-
// Copy Stages from DS to ODS
for (int i = firstColorStageIdx; i < drawState.numColorStages(); ++i) {
SkNEW_APPEND_TO_TARRAY(&fFragmentStages,
GrPendingFragmentStage,
(drawState.fColorStages[i], hasLocalCoords));
}
+
fNumColorStages = fFragmentStages.count();
for (int i = firstCoverageStageIdx; i < drawState.numCoverageStages(); ++i) {
SkNEW_APPEND_TO_TARRAY(&fFragmentStages,
@@ -116,8 +134,6 @@ GrOptDrawState::GrOptDrawState(const GrDrawState& drawState,
(drawState.fCoverageStages[i], hasLocalCoords));
}
- this->setOutputStateInfo(drawState, blendOpt, caps);
-
// let the GP init the batch tracker
if (drawState.hasGeometryProcessor()) {
GrGeometryProcessor::InitBT init;
@@ -127,10 +143,12 @@ GrOptDrawState::GrOptDrawState(const GrDrawState& drawState,
init.fCoverage = this->getCoverage();
fGeometryProcessor->initBatchTracker(&fBatchTracker, init);
}
+
+ this->setOutputStateInfo(drawState, optFlags, caps);
}
void GrOptDrawState::setOutputStateInfo(const GrDrawState& ds,
- GrDrawState::BlendOpt blendOpt,
+ GrXferProcessor::OptFlags optFlags,
const GrDrawTargetCaps& caps) {
// Set this default and then possibly change our mind if there is coverage.
fDescInfo.fPrimaryOutputType = GrProgramDesc::kModulate_PrimaryOutputType;
@@ -138,8 +156,7 @@ void GrOptDrawState::setOutputStateInfo(const GrDrawState& ds,
// Determine whether we should use dual source blending or shader code to keep coverage
// separate from color.
- bool keepCoverageSeparate = !(GrDrawState::kCoverageAsAlpha_BlendOpt == blendOpt ||
- GrDrawState::kEmitCoverage_BlendOpt == blendOpt);
+ bool keepCoverageSeparate = !(optFlags & GrXferProcessor::kSetCoverageDrawing_OptFlag);
if (keepCoverageSeparate && !ds.hasSolidCoverage()) {
if (caps.dualSourceBlendingSupport()) {
if (kZero_GrBlendCoeff == fDstBlend) {
@@ -163,64 +180,35 @@ void GrOptDrawState::setOutputStateInfo(const GrDrawState& ds,
}
}
-void GrOptDrawState::adjustProgramForBlendOpt(const GrDrawState& ds,
- GrDrawState::BlendOpt blendOpt,
- int* firstColorStageIdx,
- int* firstCoverageStageIdx) {
- switch (blendOpt) {
- case GrDrawState::kNone_BlendOpt:
- case GrDrawState::kSkipDraw_BlendOpt:
- case GrDrawState::kCoverageAsAlpha_BlendOpt:
- break;
- case GrDrawState::kEmitCoverage_BlendOpt:
- fColor = 0xffffffff;
- fDescInfo.fInputColorIsUsed = true;
- *firstColorStageIdx = ds.numColorStages();
- fDescInfo.fHasVertexColor = false;
- break;
- case GrDrawState::kEmitTransBlack_BlendOpt:
- fColor = 0;
- fCoverage = 0xff;
- fDescInfo.fInputColorIsUsed = true;
- fDescInfo.fInputCoverageIsUsed = true;
- *firstColorStageIdx = ds.numColorStages();
- *firstCoverageStageIdx = ds.numCoverageStages();
- fDescInfo.fHasVertexColor = false;
- fDescInfo.fHasVertexCoverage = false;
- break;
- }
-}
-
-static void get_stage_stats(const GrFragmentStage& stage, bool* readsDst, bool* readsFragPosition) {
- if (stage.getProcessor()->willReadDstColor()) {
- *readsDst = true;
- }
- if (stage.getProcessor()->willReadFragmentPosition()) {
- *readsFragPosition = true;
- }
-}
-
-void GrOptDrawState::getStageStats(const GrDrawState& ds, int firstColorStageIdx,
- int firstCoverageStageIdx, bool hasLocalCoords) {
- // We will need a local coord attrib if there is one currently set on the optState and we are
- // actually generating some effect code
- fDescInfo.fRequiresLocalCoordAttrib = hasLocalCoords &&
- ds.numTotalStages() - firstColorStageIdx - firstCoverageStageIdx > 0;
-
+void GrOptDrawState::adjustProgramFromOptimizations(const GrDrawState& ds,
+ GrXferProcessor::OptFlags flags,
+ const GrProcOptInfo& colorPOI,
+ const GrProcOptInfo& coveragePOI,
+ int* firstColorStageIdx,
+ int* firstCoverageStageIdx) {
fDescInfo.fReadsDst = false;
fDescInfo.fReadsFragPosition = false;
- for (int s = firstColorStageIdx; s < ds.numColorStages(); ++s) {
- const GrFragmentStage& stage = ds.getColorStage(s);
- get_stage_stats(stage, &fDescInfo.fReadsDst, &fDescInfo.fReadsFragPosition);
- }
- for (int s = firstCoverageStageIdx; s < ds.numCoverageStages(); ++s) {
- const GrFragmentStage& stage = ds.getCoverageStage(s);
- get_stage_stats(stage, &fDescInfo.fReadsDst, &fDescInfo.fReadsFragPosition);
+ if (flags & GrXferProcessor::kClearColorStages_OptFlag) {
+ fDescInfo.fInputColorIsUsed = true;
+ *firstColorStageIdx = ds.numColorStages();
+ fDescInfo.fHasVertexColor = false;
+ } else {
+ fDescInfo.fReadsDst = colorPOI.readsDst();
+ fDescInfo.fReadsFragPosition = colorPOI.readsFragPosition();
}
- if (ds.hasGeometryProcessor()) {
- const GrGeometryProcessor& gp = *ds.getGeometryProcessor();
- fDescInfo.fReadsFragPosition = fDescInfo.fReadsFragPosition || gp.willReadFragmentPosition();
+
+ if (flags & GrXferProcessor::kClearCoverageStages_OptFlag) {
+ fDescInfo.fInputCoverageIsUsed = true;
+ *firstCoverageStageIdx = ds.numCoverageStages();
+ fDescInfo.fHasVertexCoverage = false;
+ } else {
+ if (coveragePOI.readsDst()) {
+ fDescInfo.fReadsDst = true;
+ }
+ if (coveragePOI.readsFragPosition()) {
+ fDescInfo.fReadsFragPosition = true;
+ }
}
}
« src/gpu/GrDrawState.h ('K') | « src/gpu/GrOptDrawState.h ('k') | src/gpu/GrPaint.cpp » ('j') | src/gpu/effects/GrPorterDuffXferProcessor.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698