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

Unified Diff: src/gpu/GrPipeline.h

Issue 862823004: Revert of GrBatchPrototype (Closed) Base URL: https://skia.googlesource.com/skia.git@lc2
Patch Set: Created 5 years, 11 months 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
« no previous file with comments | « src/gpu/GrOvalRenderer.cpp ('k') | src/gpu/GrPipeline.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrPipeline.h
diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h
index 24d0b627951b6fb128bfab83fa45a09b19f75a60..df654ba407758f04a615f4833c8b7e333cf0ed19 100644
--- a/src/gpu/GrPipeline.h
+++ b/src/gpu/GrPipeline.h
@@ -17,8 +17,8 @@
#include "SkMatrix.h"
#include "SkRefCnt.h"
-class GrBatch;
class GrDeviceCoordTexture;
+class GrPathProcessor;
class GrPipelineBuilder;
/**
@@ -29,13 +29,9 @@
public:
SK_DECLARE_INST_COUNT(GrPipeline)
- // TODO get rid of this version of the constructor when we use batch everywhere
GrPipeline(const GrPipelineBuilder& pipelineBuilder, const GrPrimitiveProcessor*,
const GrDrawTargetCaps&, const GrScissorState&,
const GrDeviceCoordTexture* dstCopy);
-
- GrPipeline(GrBatch*, const GrPipelineBuilder&, const GrDrawTargetCaps&,
- const GrScissorState&, const GrDeviceCoordTexture* dstCopy);
/*
* Returns true if it is possible to combine the two GrPipelines and it will update 'this'
@@ -136,17 +132,9 @@
const GrProgramDesc::DescInfo& descInfo() const { return fDescInfo; }
- const GrPipelineInfo& getInitBatchTracker() const { return fInitBT; }
+ const GrGeometryProcessor::InitBT& getInitBatchTracker() const { return fInitBT; }
private:
- // TODO we can have one constructor once GrBatch is complete
- void internalConstructor(const GrPipelineBuilder&,
- const GrProcOptInfo& colorPOI,
- const GrProcOptInfo& coveragePOI,
- const GrDrawTargetCaps&,
- const GrScissorState&,
- const GrDeviceCoordTexture* dstCopy);
-
/**
* Alter the program desc and inputs (attribs and processors) based on the blend optimization.
*/
@@ -176,13 +164,13 @@
RenderTarget fRenderTarget;
GrScissorState fScissorState;
GrStencilSettings fStencilSettings;
- GrPipelineBuilder::DrawFace fDrawFace;
+ GrPipelineBuilder::DrawFace fDrawFace;
GrDeviceCoordTexture fDstCopy;
uint32_t fFlags;
ProgramXferProcessor fXferProcessor;
FragmentStageArray fFragmentStages;
GrProgramDesc::DescInfo fDescInfo;
- GrPipelineInfo fInitBT;
+ GrGeometryProcessor::InitBT fInitBT;
// This function is equivalent to the offset into fFragmentStages where coverage stages begin.
int fNumColorStages;
« no previous file with comments | « src/gpu/GrOvalRenderer.cpp ('k') | src/gpu/GrPipeline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698