fix for msan

BUG=skia:

Review URL: https://codereview.chromium.org/958433004

diff --git a/src/gpu/GrBatchTarget.cpp b/src/gpu/GrBatchTarget.cpp
index 7a2d14e..21658d2 100644 (file)
--- a/src/gpu/GrBatchTarget.cpp
+++ b/src/gpu/GrBatchTarget.cpp
@@ -7,7 +7,6 @@
 
 #include "GrBatchTarget.h"
 
-#include "GrBufferAllocPool.h"
 #include "GrPipeline.h"
 
 /*

diff --git a/src/gpu/GrBatchTarget.h b/src/gpu/GrBatchTarget.h
index 51dd8ca..ae046c1 100644 (file)
--- a/src/gpu/GrBatchTarget.h
+++ b/src/gpu/GrBatchTarget.h
@@ -8,6 +8,7 @@
 #ifndef GrBatchBuffer_DEFINED
 #define GrBatchBuffer_DEFINED
 
+#include "GrBufferAllocPool.h"
 #include "GrPendingProgramElement.h"
 #include "GrPipeline.h"
 #include "GrGpu.h"
@@ -82,6 +83,13 @@ public:
 
     const GrIndexBuffer* quadIndexBuffer() const { return fGpu->getQuadIndexBuffer(); }
 
+    // A helper for draws which overallocate and then return data to the pool
+    void putBackIndices(size_t indices) { fIndexPool->putBack(indices * sizeof(uint16_t)); }
+
+    void putBackVertices(size_t vertices, size_t vertexStride) {
+        fVertexPool->putBack(vertices * vertexStride);
+    }
+
 private:
     GrGpu* fGpu;
     GrVertexBufferAllocPool* fVertexPool;

diff --git a/src/gpu/GrDefaultPathRenderer.cpp b/src/gpu/GrDefaultPathRenderer.cpp
index 131b518..302aad7 100644 (file)
--- a/src/gpu/GrDefaultPathRenderer.cpp
+++ b/src/gpu/GrDefaultPathRenderer.cpp
@@ -372,6 +372,10 @@ public:
             drawInfo.setIndexCount(0);
         }
         batchTarget->draw(drawInfo);
+
+        // put back reserves
+        batchTarget->putBackIndices((size_t)(maxIndices - indexOffset));
+        batchTarget->putBackVertices((size_t)(maxVertices - vertexOffset), (size_t)vertexStride);
     }
 
     SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }