move program descriptor generation to flush
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/829e1b80b1020b17f2078020c990e079b70c077c
Review URL: https://codereview.chromium.org/777673003
diff --git a/src/gpu/GrOptDrawState.h b/src/gpu/GrOptDrawState.h
index ac7ec16..25a3a49 100644
--- a/src/gpu/GrOptDrawState.h
+++ b/src/gpu/GrOptDrawState.h
@@ -30,7 +30,7 @@
typedef GrClipMaskManager::ScissorState ScissorState;
- GrOptDrawState(const GrDrawState& drawState, GrGpu*, const ScissorState&,
+ GrOptDrawState(const GrDrawState& drawState, const GrDrawTargetCaps&, const ScissorState&,
const GrDeviceCoordTexture* dstCopy, GrGpu::DrawType);
bool operator== (const GrOptDrawState& that) const;
@@ -180,33 +180,20 @@
///////////////////////////////////////////////////////////////////////////
+ GrGpu::DrawType drawType() const { return fDrawType; }
+
const GrDeviceCoordTexture* getDstCopy() const { return fDstCopy.texture() ? &fDstCopy : NULL; }
- const GrProgramDesc& programDesc() const { return fDesc; }
+ // Finalize *MUST* be called before programDesc()
+ void finalize(GrGpu*);
+
+ const GrProgramDesc& programDesc() const { SkASSERT(fFinalized); return fDesc; }
private:
/**
- * Loops through all the color stage effects to check if the stage will ignore color input or
- * always output a constant color. In the ignore color input case we can ignore all previous
- * stages. In the constant color case, we can ignore all previous stages and
- * the current one and set the state color to the constant color.
- */
- void computeEffectiveColorStages(const GrDrawState& ds, GrProgramDesc::DescInfo*,
- int* firstColorStageIdx, uint8_t* fixFunctionVAToRemove);
-
- /**
- * Loops through all the coverage stage effects to check if the stage will ignore color input.
- * If a coverage stage will ignore input, then we can ignore all coverage stages before it. We
- * loop to determine the first effective coverage stage.
- */
- void computeEffectiveCoverageStages(const GrDrawState& ds, GrProgramDesc::DescInfo* descInfo,
- int* firstCoverageStageIdx);
-
- /**
* Alter the program desc and inputs (attribs and processors) based on the blend optimization.
*/
void adjustProgramForBlendOpt(const GrDrawState& ds, GrDrawState::BlendOpt,
- GrProgramDesc::DescInfo*,
int* firstColorStageIdx, int* firstCoverageStageIdx);
/**
@@ -214,15 +201,14 @@
* shaders they require.
*/
void getStageStats(const GrDrawState& ds, int firstColorStageIdx, int firstCoverageStageIdx,
- bool hasLocalCoords, GrProgramDesc::DescInfo*);
+ bool hasLocalCoords);
/**
* Calculates the primary and secondary output types of the shader. For certain output types
* the function may adjust the blend coefficients. After this function is called the src and dst
* blend coeffs will represent those used by backend API.
*/
- void setOutputStateInfo(const GrDrawState& ds, GrDrawState::BlendOpt, const GrDrawTargetCaps&,
- GrProgramDesc::DescInfo*);
+ void setOutputStateInfo(const GrDrawState& ds, GrDrawState::BlendOpt, const GrDrawTargetCaps&);
enum Flags {
kDither_Flag = 0x1,
@@ -249,6 +235,9 @@
ProgramGeometryProcessor fGeometryProcessor;
ProgramXferProcessor fXferProcessor;
FragmentStageArray fFragmentStages;
+ GrGpu::DrawType fDrawType;
+ GrProgramDesc::DescInfo fDescInfo;
+ bool fFinalized;
// This function is equivalent to the offset into fFragmentStages where coverage stages begin.
int fNumColorStages;