diff options
author | 2014-12-03 06:24:10 -0800 | |
---|---|---|
committer | 2014-12-03 06:24:10 -0800 | |
commit | 2dd1ae016d7f297b433c3ea3a771ef8e01657c1f (patch) | |
tree | 96aa03d4b4b1802490cb5b769627b75f3de4a470 /src/gpu/GrOptDrawState.h | |
parent | 960fb50a1a7ac76fd51e22983812f26bfffa6d1e (diff) |
First step to moving vertex attributes to the geometryProcessor
BUG=skia:
Review URL: https://codereview.chromium.org/761563002
Diffstat (limited to 'src/gpu/GrOptDrawState.h')
-rw-r--r-- | src/gpu/GrOptDrawState.h | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/src/gpu/GrOptDrawState.h b/src/gpu/GrOptDrawState.h index bf4f78e5ef..542172fd64 100644 --- a/src/gpu/GrOptDrawState.h +++ b/src/gpu/GrOptDrawState.h @@ -36,19 +36,6 @@ public: bool operator== (const GrOptDrawState& that) const; bool operator!= (const GrOptDrawState& that) const { return !(*this == that); } - /////////////////////////////////////////////////////////////////////////// - /// @name Vertex Attributes - //// - - enum { - kMaxVertexAttribCnt = kLast_GrVertexAttribBinding + 4, - }; - - const GrVertexAttrib* getVertexAttribs() const { return fVAPtr; } - int getVertexAttribCount() const { return fVACount; } - - size_t getVertexStride() const { return fVAStride; } - /// @} /////////////////////////////////////////////////////////////////////////// @@ -213,26 +200,18 @@ private: int* firstCoverageStageIdx); /** - * This function takes in a flag and removes the corresponding fixed function vertex attributes. - * The flags are in the same order as GrVertexAttribBinding array. If bit i of removeVAFlags is - * set, then vertex attributes with binding (GrVertexAttribute)i will be removed. - */ - void removeFixedFunctionVertexAttribs(uint8_t removeVAFlags, GrProgramDesc::DescInfo*); - - /** * 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, - uint8_t* fixedFunctionVAToRemove); + int* firstColorStageIdx, int* firstCoverageStageIdx); /** * Loop over the effect stages to determine various info like what data they will read and what * shaders they require. */ void getStageStats(const GrDrawState& ds, int firstColorStageIdx, int firstCoverageStageIdx, - GrProgramDesc::DescInfo*); + bool hasLocalCoords, GrProgramDesc::DescInfo*); /** * Calculates the primary and secondary output types of the shader. For certain output types @@ -256,9 +235,6 @@ private: GrColor fColor; SkMatrix fViewMatrix; GrColor fBlendConstant; - const GrVertexAttrib* fVAPtr; - int fVACount; - size_t fVAStride; GrStencilSettings fStencilSettings; uint8_t fCoverage; GrDrawState::DrawFace fDrawFace; @@ -272,8 +248,6 @@ private: // This function is equivalent to the offset into fFragmentStages where coverage stages begin. int fNumColorStages; - SkAutoSTArray<4, GrVertexAttrib> fOptVA; - GrProgramDesc fDesc; typedef SkRefCnt INHERITED; |