Index: src/gpu/batches/GrBatch.cpp |
diff --git a/src/gpu/batches/GrBatch.cpp b/src/gpu/batches/GrBatch.cpp |
index b696d6b95b1585e9745d533801e9f8dfe04f6216..a3a9884b0fd7f6178db1f5465ad51fbf9d2f0531 100644 |
--- a/src/gpu/batches/GrBatch.cpp |
+++ b/src/gpu/batches/GrBatch.cpp |
@@ -6,8 +6,6 @@ |
*/ |
#include "GrBatch.h" |
-#include "GrBatchTarget.h" |
-#include "GrResourceProvider.h" |
#include "GrMemoryPool.h" |
#include "SkSpinlock.h" |
@@ -58,67 +56,3 @@ GrBatch::GrBatch() |
} |
GrBatch::~GrBatch() {} |
- |
-////////////////////////////////////////////////////////////////////////////// |
- |
-GrDrawBatch::GrDrawBatch() : fPipelineInstalled(false) { } |
- |
-GrDrawBatch::~GrDrawBatch() { |
- if (fPipelineInstalled) { |
- this->pipeline()->~GrPipeline(); |
- } |
-} |
- |
-bool GrDrawBatch::installPipeline(const GrPipeline::CreateArgs& args) { |
- GrPipelineOptimizations opts; |
- void* location = fPipelineStorage.get(); |
- if (!GrPipeline::CreateAt(location, args, &opts)) { |
- return false; |
- } |
- this->initBatchTracker(opts); |
- fPipelineInstalled = true; |
- return true; |
-} |
- |
-////////////////////////////////////////////////////////////////////////////// |
- |
-GrVertexBatch::GrVertexBatch() : fNumberOfDraws(0) {} |
- |
-void* GrVertexBatch::InstancedHelper::init(GrBatchTarget* batchTarget, GrPrimitiveType primType, |
- size_t vertexStride, const GrIndexBuffer* indexBuffer, |
- int verticesPerInstance, int indicesPerInstance, |
- int instancesToDraw) { |
- SkASSERT(batchTarget); |
- if (!indexBuffer) { |
- return NULL; |
- } |
- const GrVertexBuffer* vertexBuffer; |
- int firstVertex; |
- int vertexCount = verticesPerInstance * instancesToDraw; |
- void* vertices = batchTarget->makeVertSpace(vertexStride, vertexCount, |
- &vertexBuffer, &firstVertex); |
- if (!vertices) { |
- SkDebugf("Vertices could not be allocated for instanced rendering."); |
- return NULL; |
- } |
- SkASSERT(vertexBuffer); |
- size_t ibSize = indexBuffer->gpuMemorySize(); |
- int maxInstancesPerDraw = static_cast<int>(ibSize / (sizeof(uint16_t) * indicesPerInstance)); |
- |
- fVertices.initInstanced(primType, vertexBuffer, indexBuffer, |
- firstVertex, verticesPerInstance, indicesPerInstance, instancesToDraw, |
- maxInstancesPerDraw); |
- return vertices; |
-} |
- |
-void* GrVertexBatch::QuadHelper::init(GrBatchTarget* batchTarget, size_t vertexStride, |
- int quadsToDraw) { |
- SkAutoTUnref<const GrIndexBuffer> quadIndexBuffer( |
- batchTarget->resourceProvider()->refQuadIndexBuffer()); |
- if (!quadIndexBuffer) { |
- SkDebugf("Could not get quad index buffer."); |
- return NULL; |
- } |
- return this->INHERITED::init(batchTarget, kTriangles_GrPrimitiveType, vertexStride, |
- quadIndexBuffer, kVerticesPerQuad, kIndicesPerQuad, quadsToDraw); |
-} |