commit 2795a353adbd17260ef4a0549f0f353853e509ac
author Jim Van Verth <jvanverth@google.com> Thu Sep 22 10:52:13 2022 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Thu Sep 22 15:37:20 2022 +0000
tree b5f4a5af52cb87642a7561b6f470d6347a9591c8
parent 270eba387b1ce4d0ae20bd212541711e805458b3

[graphite] Expose capture methods through ContextPriv.

Allows the methods to be used to capture in tests and GMs.

Change-Id: I56c70bd18365607560013c8f6dcf0119c1802970
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/583778
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/graphite/ContextPriv.h

diff --git a/src/gpu/graphite/ContextPriv.h b/src/gpu/graphite/ContextPriv.h
index 8b0da8f..d0d3350 100644
--- a/src/gpu/graphite/ContextPriv.h
+++ b/src/gpu/graphite/ContextPriv.h
@@ -9,6 +9,7 @@
 #define skgpu_graphite_ContextPriv_DEFINED
 
 #include "include/gpu/graphite/Context.h"
+#include "src/gpu/graphite/QueueManager.h"
 #include "src/gpu/graphite/SharedContext.h"
 
 class SkShaderCodeDictionary;
@@ -33,6 +34,13 @@
     SkShaderCodeDictionary* shaderCodeDictionary() {
         return fContext->fSharedContext->shaderCodeDictionary();
     }
+
+    void startCapture() {
+        fContext->fQueueManager->startCapture();
+    }
+    void endCapture() {
+        fContext->fQueueManager->endCapture();
+    }
 #endif
 
 private:

src/gpu/graphite/QueueManager.h

diff --git a/src/gpu/graphite/QueueManager.h b/src/gpu/graphite/QueueManager.h
index fcb35de..0f552a0 100644
--- a/src/gpu/graphite/QueueManager.h
+++ b/src/gpu/graphite/QueueManager.h
@@ -31,8 +31,8 @@
     void checkForFinishedWork(SyncToCpu);
 
 #if GRAPHITE_TEST_UTILS
-    virtual void testingOnly_startCapture() {}
-    virtual void testingOnly_endCapture() {}
+    virtual void startCapture() {}
+    virtual void endCapture() {}
 #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 4469942..d88c9b4 100644
--- a/src/gpu/graphite/mtl/MtlQueueManager.h
+++ b/src/gpu/graphite/mtl/MtlQueueManager.h
@@ -34,8 +34,8 @@
     OutstandingSubmission onSubmitToGpu() override;
 
 #if GRAPHITE_TEST_UTILS
-    void testingOnly_startCapture() override;
-    void testingOnly_endCapture() override;
+    void startCapture() override;
+    void endCapture() 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 d1b8296..351947e 100644
--- a/src/gpu/graphite/mtl/MtlQueueManager.mm
+++ b/src/gpu/graphite/mtl/MtlQueueManager.mm
@@ -68,7 +68,7 @@
 }
 
 #if GRAPHITE_TEST_UTILS
-void MtlQueueManager::testingOnly_startCapture() {
+void MtlQueueManager::startCapture() {
     if (@available(macOS 10.13, iOS 11.0, *)) {
         // TODO: add newer Metal interface as well
         MTLCaptureManager* captureManager = [MTLCaptureManager sharedCaptureManager];
@@ -90,7 +90,7 @@
      }
 }
 
-void MtlQueueManager::testingOnly_endCapture() {
+void MtlQueueManager::endCapture() {
     if (@available(macOS 10.13, iOS 11.0, *)) {
         MTLCaptureManager* captureManager = [MTLCaptureManager sharedCaptureManager];
         if (captureManager.isCapturing) {