Chromium Code Reviews| Index: src/gpu/GrDrawTarget.h |
| diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h |
| index 6628e372283a1ed1031903081e3e0d69228e34f9..31ddd38a4e3ed662be3c2b1ae828a5ae84516e77 100644 |
| --- a/src/gpu/GrDrawTarget.h |
| +++ b/src/gpu/GrDrawTarget.h |
| @@ -26,6 +26,7 @@ |
| #include "SkTypes.h" |
| #include "SkXfermode.h" |
| +class GrBatch; |
| class GrClipData; |
| class GrDrawTargetCaps; |
| class GrPath; |
| @@ -259,6 +260,11 @@ public: |
| int vertexCount, |
| const SkRect* devBounds = NULL); |
| + void batchDraw(GrDrawState*, |
|
bsalomon
2015/01/21 21:39:29
drawBatch? Just seems more consistent
|
| + GrBatch*, |
| + GrPrimitiveType, |
| + 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 |
| @@ -524,6 +530,7 @@ public: |
| */ |
| class DrawInfo { |
| public: |
| + DrawInfo() { fDevBounds = NULL; } |
| DrawInfo(const DrawInfo& di) { (*this) = di; } |
| DrawInfo& operator =(const DrawInfo& di); |
| @@ -536,6 +543,15 @@ public: |
| 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 |
| bool isInstanced() const; // this version is longer because of asserts |
| @@ -565,8 +581,6 @@ public: |
| const SkRect* getDevBounds() const { return fDevBounds; } |
| private: |
| - DrawInfo() { fDevBounds = NULL; } |
| - |
| friend class GrDrawTarget; |
| GrPrimitiveType fPrimitiveType; |
| @@ -705,6 +719,11 @@ private: |
| const DrawInfo&, |
| const GrScissorState&, |
| const GrDeviceCoordTexture* dstCopy) = 0; |
| + virtual void onBatchDraw(GrBatch*, |
| + const GrDrawState&, |
| + GrPrimitiveType type, |
| + const GrScissorState&, |
| + const GrDeviceCoordTexture* dstCopy) = 0; |
| // TODO copy in order drawbuffer onDrawRect to here |
| virtual void onDrawRect(GrDrawState*, |
| GrColor color, |