| Index: src/gpu/GrInOrderDrawBuffer.h
|
| diff --git a/src/gpu/GrInOrderDrawBuffer.h b/src/gpu/GrInOrderDrawBuffer.h
|
| index ac1b79cd55f02c59eb3d011a2db8866d2940a7f0..11558f8ffc8baa2eca8e95185a9e5f51ba232711 100644
|
| --- a/src/gpu/GrInOrderDrawBuffer.h
|
| +++ b/src/gpu/GrInOrderDrawBuffer.h
|
| @@ -50,10 +50,6 @@ public:
|
| void discard(GrRenderTarget*) override;
|
|
|
| protected:
|
| - void willReserveVertexAndIndexSpace(int vertexCount,
|
| - size_t vertexStride,
|
| - int indexCount) override;
|
| -
|
| void appendIndicesAndTransforms(const void* indexValues, PathIndexType indexType,
|
| const float* transformValues, PathTransformType transformType,
|
| int count, char** indicesLocation, float** xformsLocation) {
|
| @@ -74,21 +70,6 @@ protected:
|
| }
|
| }
|
|
|
| - bool canConcatToIndexBuffer(const GrIndexBuffer** ib) {
|
| - const GrDrawTarget::GeometrySrcState& geomSrc = this->getGeomSrc();
|
| -
|
| - // we only attempt to concat when reserved verts are used with a client-specified
|
| - // index buffer. To make this work with client-specified VBs we'd need to know if the VB
|
| - // was updated between draws.
|
| - if (kReserved_GeometrySrcType != geomSrc.fVertexSrc ||
|
| - kBuffer_GeometrySrcType != geomSrc.fIndexSrc) {
|
| - return false;
|
| - }
|
| -
|
| - *ib = geomSrc.fIndexBuffer;
|
| - return true;
|
| - }
|
| -
|
| private:
|
| friend class GrTargetCommands;
|
|
|
| @@ -96,7 +77,6 @@ private:
|
| void onFlush() override;
|
|
|
| // overrides from GrDrawTarget
|
| - void onDraw(const GrGeometryProcessor*, const DrawInfo&, const PipelineInfo&) override;
|
| void onDrawBatch(GrBatch*, const PipelineInfo&) override;
|
| void onDrawRect(GrPipelineBuilder*,
|
| GrColor,
|
| @@ -132,10 +112,6 @@ private:
|
| const SkIRect& srcRect,
|
| const SkIPoint& dstPoint) override;
|
|
|
| - // Attempts to concat instances from info onto the previous draw. info must represent an
|
| - // instanced draw. The caller must have already recorded a new draw state and clip if necessary.
|
| - int concatInstancedDraw(const DrawInfo&);
|
| -
|
| // We lazily record clip changes in order to skip clips that have no effect.
|
| void recordClipIfNecessary();
|
| // Records any trace markers for a command
|
|
|