diff options
author | cdalton <cdalton@nvidia.com> | 2016-03-25 12:15:03 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-25 12:15:03 -0700 |
commit | 397536cabe12a9936659870dd220c869789424ba (patch) | |
tree | 0012d79d6f21884a38b7cfe8ecb016a28bc34b70 /src/gpu/batches/GrAAHairLinePathRenderer.cpp | |
parent | dd26a3ba0acdccdbd2f04b9020fdce59e1ed7609 (diff) |
Consolidate GPU buffer implementations
Consolidates all the different buffer implementations into a single
GrBuffer class. This will allow us to add new buffer types, use DSA in
OpenGL, track buffer bindings by unique ID, cache buffers without
respect to the type of data they have been used for previously, etc.
This change is strictly a refactor; it introduces no change in
functionality.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1825393002
Committed: https://skia.googlesource.com/skia/+/8b1bff29675afd25843439eade634a57f68fe16f
Review URL: https://codereview.chromium.org/1825393002
Diffstat (limited to 'src/gpu/batches/GrAAHairLinePathRenderer.cpp')
-rw-r--r-- | src/gpu/batches/GrAAHairLinePathRenderer.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/gpu/batches/GrAAHairLinePathRenderer.cpp b/src/gpu/batches/GrAAHairLinePathRenderer.cpp index 7d45ed71f9..2cc91f9740 100644 --- a/src/gpu/batches/GrAAHairLinePathRenderer.cpp +++ b/src/gpu/batches/GrAAHairLinePathRenderer.cpp @@ -9,15 +9,14 @@ #include "GrBatchFlushState.h" #include "GrBatchTest.h" +#include "GrBuffer.h" #include "GrCaps.h" #include "GrContext.h" #include "GrDefaultGeoProcFactory.h" -#include "GrIndexBuffer.h" #include "GrPathUtils.h" #include "GrPipelineBuilder.h" #include "GrProcessor.h" #include "GrResourceProvider.h" -#include "GrVertexBuffer.h" #include "SkGeometry.h" #include "SkStroke.h" #include "SkTemplates.h" @@ -65,7 +64,7 @@ static const int kQuadNumVertices = 5; static const int kQuadsNumInIdxBuffer = 256; GR_DECLARE_STATIC_UNIQUE_KEY(gQuadsIndexBufferKey); -static const GrIndexBuffer* ref_quads_index_buffer(GrResourceProvider* resourceProvider) { +static const GrBuffer* ref_quads_index_buffer(GrResourceProvider* resourceProvider) { GR_DEFINE_STATIC_UNIQUE_KEY(gQuadsIndexBufferKey); return resourceProvider->findOrCreateInstancedIndexBuffer( kQuadIdxBufPattern, kIdxsPerQuad, kQuadsNumInIdxBuffer, kQuadNumVertices, @@ -99,7 +98,7 @@ static const int kLineSegsNumInIdxBuffer = 256; GR_DECLARE_STATIC_UNIQUE_KEY(gLinesIndexBufferKey); -static const GrIndexBuffer* ref_lines_index_buffer(GrResourceProvider* resourceProvider) { +static const GrBuffer* ref_lines_index_buffer(GrResourceProvider* resourceProvider) { GR_DEFINE_STATIC_UNIQUE_KEY(gLinesIndexBufferKey); return resourceProvider->findOrCreateInstancedIndexBuffer( kLineSegIdxBufPattern, kIdxsPerLineSeg, kLineSegsNumInIdxBuffer, kLineSegNumVertices, @@ -858,11 +857,11 @@ void AAHairlineBatch::onPrepareDraws(Target* target) const { // do lines first if (lineCount) { - SkAutoTUnref<const GrIndexBuffer> linesIndexBuffer( + SkAutoTUnref<const GrBuffer> linesIndexBuffer( ref_lines_index_buffer(target->resourceProvider())); target->initDraw(lineGP); - const GrVertexBuffer* vertexBuffer; + const GrBuffer* vertexBuffer; int firstVertex; size_t vertexStride = lineGP->getVertexStride(); @@ -891,10 +890,10 @@ void AAHairlineBatch::onPrepareDraws(Target* target) const { } if (quadCount || conicCount) { - const GrVertexBuffer* vertexBuffer; + const GrBuffer* vertexBuffer; int firstVertex; - SkAutoTUnref<const GrIndexBuffer> quadsIndexBuffer( + SkAutoTUnref<const GrBuffer> quadsIndexBuffer( ref_quads_index_buffer(target->resourceProvider())); size_t vertexStride = sizeof(BezierVertex); |