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

Unified Diff: src/gpu/GrDrawTarget.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/GrDefaultGeoProcFactory.cpp ('k') | src/gpu/GrDrawTarget.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrDrawTarget.h
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index 18265c8fb7dde9c67650965962bbf09b587c24e3..b66f1c6bd304bf368ca717d5ecf6d94898cc0084 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -26,7 +26,6 @@
#include "SkTypes.h"
#include "SkXfermode.h"
-class GrBatch;
class GrClipData;
class GrDrawTargetCaps;
class GrPath;
@@ -260,11 +259,6 @@
int vertexCount,
const SkRect* devBounds = NULL);
- // TODO devbounds should live on the batch
- void drawBatch(GrPipelineBuilder*,
- GrBatch*,
- const SkRect* devBounds = NULL);
-
/**
* Draws path into the stencil buffer. The fill must be either even/odd or
* winding (not inverse or hairline). It will respect the HW antialias flag
@@ -316,14 +310,14 @@
* that rectangle before it is input to GrCoordTransforms that read local
* coordinates
*/
- void drawRect(GrPipelineBuilder* pipelineBuilder,
+ void drawRect(GrPipelineBuilder* ds,
GrColor color,
const SkMatrix& viewMatrix,
const SkRect& rect,
const SkRect* localRect,
const SkMatrix* localMatrix) {
AutoGeometryPush agp(this);
- this->onDrawRect(pipelineBuilder, color, viewMatrix, rect, localRect, localMatrix);
+ this->onDrawRect(ds, color, viewMatrix, rect, localRect, localMatrix);
}
/**
@@ -533,7 +527,6 @@
*/
class DrawInfo {
public:
- DrawInfo() { fDevBounds = NULL; }
DrawInfo(const DrawInfo& di) { (*this) = di; }
DrawInfo& operator =(const DrawInfo& di);
@@ -545,15 +538,6 @@
int verticesPerInstance() const { return fVerticesPerInstance; }
int indicesPerInstance() const { return fIndicesPerInstance; }
int instanceCount() const { return fInstanceCount; }
-
- void setPrimitiveType(GrPrimitiveType type) { fPrimitiveType = type; }
- void setStartVertex(int startVertex) { fStartVertex = startVertex; }
- void setStartIndex(int startIndex) { fStartIndex = startIndex; }
- void setVertexCount(int vertexCount) { fVertexCount = vertexCount; }
- void setIndexCount(int indexCount) { fIndexCount = indexCount; }
- void setVerticesPerInstance(int verticesPerI) { fVerticesPerInstance = verticesPerI; }
- void setIndicesPerInstance(int indicesPerI) { fIndicesPerInstance = indicesPerI; }
- void setInstanceCount(int instanceCount) { fInstanceCount = instanceCount; }
bool isIndexed() const { return fIndexCount > 0; }
#ifdef SK_DEBUG
@@ -584,6 +568,8 @@
const SkRect* getDevBounds() const { return fDevBounds; }
private:
+ DrawInfo() { fDevBounds = NULL; }
+
friend class GrDrawTarget;
GrPrimitiveType fPrimitiveType;
@@ -722,10 +708,6 @@
const DrawInfo&,
const GrScissorState&,
const GrDeviceCoordTexture* dstCopy) = 0;
- virtual void onDrawBatch(GrBatch*,
- const GrPipelineBuilder&,
- const GrScissorState&,
- const GrDeviceCoordTexture* dstCopy) = 0;
// TODO copy in order drawbuffer onDrawRect to here
virtual void onDrawRect(GrPipelineBuilder*,
GrColor color,
« no previous file with comments | « src/gpu/GrDefaultGeoProcFactory.cpp ('k') | src/gpu/GrDrawTarget.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698