commit 4b3e23315293b57908e80e418c9fcf7b179bca22
author Jim Van Verth <jvanverth@google.com> Thu Sep 22 16:36:36 2022 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Thu Sep 22 21:34:27 2022 +0000
tree 1d4a1ee0a5119f52321bad432fc4bbeacf4a6a8c
parent b13b89a8ce276d6bee6323d3e4b9ddc7e5af6566

Clean up capture interface.

Start/end is a little odd, changed to start/stop.

Change-Id: I91a4b74013133de27c87f6c79e992eb10851def0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/583956
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>

src/gpu/ganesh/GrGpu.h

diff --git a/src/gpu/ganesh/GrGpu.h b/src/gpu/ganesh/GrGpu.h
index 24088fc..4467a70 100644
--- a/src/gpu/ganesh/GrGpu.h
+++ b/src/gpu/ganesh/GrGpu.h
@@ -643,7 +643,7 @@
      * Currently only works with the Metal backend.
      */
     virtual void testingOnly_startCapture() {}
-    virtual void testingOnly_endCapture() {}
+    virtual void testingOnly_stopCapture() {}
 #endif
 
     // width and height may be larger than rt (if underlying API allows it).

src/gpu/ganesh/d3d/GrD3DGpu.cpp

diff --git a/src/gpu/ganesh/d3d/GrD3DGpu.cpp b/src/gpu/ganesh/d3d/GrD3DGpu.cpp
index 8ef1806..d733f30 100644
--- a/src/gpu/ganesh/d3d/GrD3DGpu.cpp
+++ b/src/gpu/ganesh/d3d/GrD3DGpu.cpp
@@ -1675,7 +1675,7 @@
     }
 }
 
-void GrD3DGpu::testingOnly_endCapture() {
+void GrD3DGpu::testingOnly_stopCapture() {
     if (fGraphicsAnalysis) {
         fGraphicsAnalysis->EndCapture();
     }

src/gpu/ganesh/d3d/GrD3DGpu.h

diff --git a/src/gpu/ganesh/d3d/GrD3DGpu.h b/src/gpu/ganesh/d3d/GrD3DGpu.h
index c747658..36ab6e97 100644
--- a/src/gpu/ganesh/d3d/GrD3DGpu.h
+++ b/src/gpu/ganesh/d3d/GrD3DGpu.h
@@ -69,7 +69,7 @@
     void deleteTestingOnlyBackendRenderTarget(const GrBackendRenderTarget&) override;
 
     void testingOnly_startCapture() override;
-    void testingOnly_endCapture() override;
+    void testingOnly_stopCapture() override;
 
     void resetShaderCacheForTesting() const override {
         fResourceProvider.resetShaderCacheForTesting();

src/gpu/ganesh/mtl/GrMtlGpu.h

diff --git a/src/gpu/ganesh/mtl/GrMtlGpu.h b/src/gpu/ganesh/mtl/GrMtlGpu.h
index 82a8ebd..07cb51e 100644
--- a/src/gpu/ganesh/mtl/GrMtlGpu.h
+++ b/src/gpu/ganesh/mtl/GrMtlGpu.h
@@ -296,7 +296,7 @@
 
 #if GR_TEST_UTILS
     void testingOnly_startCapture() override;
-    void testingOnly_endCapture() override;
+    void testingOnly_stopCapture() override;
 #endif
 
 #ifdef SK_ENABLE_DUMP_GPU

src/gpu/ganesh/mtl/GrMtlGpu.mm

diff --git a/src/gpu/ganesh/mtl/GrMtlGpu.mm b/src/gpu/ganesh/mtl/GrMtlGpu.mm
index f08d48b..1176b0b 100644
--- a/src/gpu/ganesh/mtl/GrMtlGpu.mm
+++ b/src/gpu/ganesh/mtl/GrMtlGpu.mm
@@ -229,7 +229,7 @@
     this->checkForFinishedCommandBuffers();
 
 #if GR_METAL_CAPTURE_COMMANDBUFFER
-    this->testingOnly_endCapture();
+    this->testingOnly_stopCapture();
 #endif
     return didCommit;
 }
@@ -1770,7 +1770,7 @@
      }
 }
 
-void GrMtlGpu::testingOnly_endCapture() {
+void GrMtlGpu::testingOnly_stopCapture() {
     if (@available(macOS 10.13, iOS 11.0, *)) {
         MTLCaptureManager* captureManager = [MTLCaptureManager sharedCaptureManager];
         if (captureManager.isCapturing) {

src/gpu/graphite/ContextPriv.h

diff --git a/src/gpu/graphite/ContextPriv.h b/src/gpu/graphite/ContextPriv.h
index d0d3350..93f22b42 100644
--- a/src/gpu/graphite/ContextPriv.h
+++ b/src/gpu/graphite/ContextPriv.h
@@ -38,8 +38,8 @@
     void startCapture() {
         fContext->fQueueManager->startCapture();
     }
-    void endCapture() {
-        fContext->fQueueManager->endCapture();
+    void stopCapture() {
+        fContext->fQueueManager->stopCapture();
     }
 #endif
 

src/gpu/graphite/QueueManager.h

diff --git a/src/gpu/graphite/QueueManager.h b/src/gpu/graphite/QueueManager.h
index 0f552a0..cc2ebcf 100644
--- a/src/gpu/graphite/QueueManager.h
+++ b/src/gpu/graphite/QueueManager.h
@@ -32,7 +32,7 @@
 
 #if GRAPHITE_TEST_UTILS
     virtual void startCapture() {}
-    virtual void endCapture() {}
+    virtual void stopCapture() {}
 #endif
 
 protected:

src/gpu/graphite/mtl/MtlQueueManager.h

diff --git a/src/gpu/graphite/mtl/MtlQueueManager.h b/src/gpu/graphite/mtl/MtlQueueManager.h
index d88c9b4..eaae2dcf 100644
--- a/src/gpu/graphite/mtl/MtlQueueManager.h
+++ b/src/gpu/graphite/mtl/MtlQueueManager.h
@@ -35,7 +35,7 @@
 
 #if GRAPHITE_TEST_UTILS
     void startCapture() override;
-    void endCapture() override;
+    void stopCapture() override;
 #endif
 
     sk_cfp<id<MTLCommandQueue>> fQueue;

src/gpu/graphite/mtl/MtlQueueManager.mm

diff --git a/src/gpu/graphite/mtl/MtlQueueManager.mm b/src/gpu/graphite/mtl/MtlQueueManager.mm
index 351947e..6e40b29 100644
--- a/src/gpu/graphite/mtl/MtlQueueManager.mm
+++ b/src/gpu/graphite/mtl/MtlQueueManager.mm
@@ -90,7 +90,7 @@
      }
 }
 
-void MtlQueueManager::endCapture() {
+void MtlQueueManager::stopCapture() {
     if (@available(macOS 10.13, iOS 11.0, *)) {
         MTLCaptureManager* captureManager = [MTLCaptureManager sharedCaptureManager];
         if (captureManager.isCapturing) {