commit 75125070501647a0882d8bcb6e0ab2f1c3492ad8
author Chris Dalton <csmartdalton@google.com> Tue Nov 24 09:30:51 2020 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Nov 24 17:38:41 2020 +0000
tree c94d198ada815ab972464aeeab35b8055183200b
parent a6e0d8389912c6824e2eb21849744e64fee21ac1

Add "putBack" analogs to the DrawIndirect buffer pool

Bug: skia:10419
Change-Id: Id5f4fe79c661c3d402411dcb830ffd144d21254a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338008
Reviewed-by: Adlai Holler <adlai@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/mock/GrMockOpTarget.h

diff --git a/src/gpu/mock/GrMockOpTarget.h b/src/gpu/mock/GrMockOpTarget.h
index 33a2c94..4200e35 100644
--- a/src/gpu/mock/GrMockOpTarget.h
+++ b/src/gpu/mock/GrMockOpTarget.h
@@ -35,29 +35,27 @@
     GrLoadOp colorLoadOp() const override { return GrLoadOp::kLoad; }
 
     void* makeVertexSpace(size_t vertexSize, int vertexCount, sk_sp<const GrBuffer>*,
-                          int* startVertex) override {
+                          int* /*startVertex*/) override {
         if (vertexSize * vertexCount > sizeof(fStaticVertexData)) {
             SK_ABORT("FATAL: wanted %zu bytes of static vertex data; only have %zu.\n",
                      vertexSize * vertexCount, sizeof(fStaticVertexData));
         }
-        *startVertex = 0;
         return fStaticVertexData;
     }
 
     void* makeVertexSpaceAtLeast(size_t vertexSize, int minVertexCount, int fallbackVertexCount,
-                                 sk_sp<const GrBuffer>*, int* startVertex,
+                                 sk_sp<const GrBuffer>*, int* /*startVertex*/,
                                  int* actualVertexCount) override {
         if (vertexSize * minVertexCount > sizeof(fStaticVertexData)) {
             SK_ABORT("FATAL: wanted %zu bytes of static vertex data; only have %zu.\n",
                      vertexSize * minVertexCount, sizeof(fStaticVertexData));
         }
-        *startVertex = 0;
         *actualVertexCount = sizeof(fStaticVertexData) / vertexSize;
         return fStaticVertexData;
     }
 
     GrDrawIndirectCommand* makeDrawIndirectSpace(int drawCount, sk_sp<const GrBuffer>* buffer,
-                                                 size_t* offsetInBytes) override {
+                                                 size_t* /*offsetInBytes*/) override {
         int staticBufferCount = (int)SK_ARRAY_COUNT(fStaticDrawIndirectData);
         if (drawCount > staticBufferCount) {
             SK_ABORT("FATAL: wanted %i static drawIndirect elements; only have %i.\n",
@@ -66,8 +64,10 @@
         return fStaticDrawIndirectData;
     }
 
+    void putBackIndirectDraws(int count) override { /* no-op */ }
+
     GrDrawIndexedIndirectCommand* makeDrawIndexedIndirectSpace(
-            int drawCount, sk_sp<const GrBuffer>* buffer, size_t* offsetInBytes) override {
+            int drawCount, sk_sp<const GrBuffer>* buffer, size_t* /*offsetInBytes*/) override {
         int staticBufferCount = (int)SK_ARRAY_COUNT(fStaticDrawIndexedIndirectData);
         if (drawCount > staticBufferCount) {
             SK_ABORT("FATAL: wanted %i static drawIndexedIndirect elements; only have %i.\n",
@@ -76,6 +76,8 @@
         return fStaticDrawIndexedIndirectData;
     }
 
+    void putBackIndexedIndirectDraws(int count) override { /* no-op */ }
+
 #define UNIMPL(...) __VA_ARGS__ override { SK_ABORT("unimplemented."); }
     UNIMPL(void recordDraw(const GrGeometryProcessor*, const GrSimpleMesh[], int,
                            const GrSurfaceProxy* const[], GrPrimitiveType))