diff --git a/src/gpu/GrOpsRenderPass.cpp b/src/gpu/GrOpsRenderPass.cpp
index 8c6b559..486a9f1 100644
--- a/src/gpu/GrOpsRenderPass.cpp
+++ b/src/gpu/GrOpsRenderPass.cpp
@@ -34,9 +34,7 @@
 
 void GrOpsRenderPass::end() {
     this->onEnd();
-    fActiveIndexBuffer.reset();
-    fActiveInstanceBuffer.reset();
-    fActiveVertexBuffer.reset();
+    this->resetActiveBuffers();
 }
 
 void GrOpsRenderPass::clear(const GrFixedClip& clip, const SkPMColor4f& color) {
@@ -86,6 +84,8 @@
     programInfo.checkMSAAAndMIPSAreResolved();
 #endif
 
+    this->resetActiveBuffers();
+
     if (programInfo.primProc().numVertexAttributes() > this->gpu()->caps()->maxVertexAttributes()) {
         fDrawPipelineStatus = DrawPipelineStatus::kFailedToBind;
         return;