move ifdef

impeller/renderer/backend/metal/command_buffer_mtl.mm

@@ -163,8 +163,9 @@ static bool LogMTLCommandBufferErrorIfPresent(id<MTLCommandBuffer> buffer) {
   if (!context) {
     return false;
   }
+#ifdef IMPELLER_DEBUG
   ContextMTL::Cast(*context).GetGPUTracer()->RecordCmdBuffer(buffer_);
-
+#endif  // IMPELLER_DEBUG
   if (callback) {
     [buffer_
         addCompletedHandler:^(id<MTLCommandBuffer> buffer) {
@@ -196,7 +197,9 @@ static bool LogMTLCommandBufferErrorIfPresent(id<MTLCommandBuffer> buffer) {
   auto buffer = buffer_;
   buffer_ = nil;
 
+#ifdef IMPELLER_DEBUG
   ContextMTL::Cast(*context).GetGPUTracer()->RecordCmdBuffer(buffer);
+#endif  // IMPELLER_DEBUG
 
   auto worker_task_runner = ContextMTL::Cast(*context).GetWorkerTaskRunner();
   auto mtl_render_pass = static_cast<RenderPassMTL*>(render_pass.get());

impeller/renderer/backend/metal/context_mtl.h

@@ -94,7 +94,9 @@ class ContextMTL final : public Context,
 
   std::shared_ptr<const fml::SyncSwitch> GetIsGpuDisabledSyncSwitch() const;
 
+#ifdef IMPELLER_DEBUG
   std::shared_ptr<GPUTracerMTL> GetGPUTracer() const;
+#endif  // IMPELLER_DEBUG
 
  private:
   id<MTLDevice> device_ = nullptr;
@@ -106,7 +108,9 @@ class ContextMTL final : public Context,
   std::shared_ptr<const Capabilities> device_capabilities_;
   std::shared_ptr<fml::ConcurrentMessageLoop> raster_message_loop_;
   std::shared_ptr<const fml::SyncSwitch> is_gpu_disabled_sync_switch_;
+#ifdef IMPELLER_DEBUG
   std::shared_ptr<GPUTracerMTL> gpu_tracer_;
+#endif  // IMPELLER_DEBUG
   bool is_valid_ = false;
 
   ContextMTL(

impeller/renderer/backend/metal/context_mtl.mm

@@ -144,7 +144,9 @@ static bool DeviceSupportsComputeSubgroups(id<MTLDevice> device) {
 
   device_capabilities_ =
       InferMetalCapabilities(device_, PixelFormat::kB8G8R8A8UNormInt);
+#ifdef IMPELLER_DEBUG
   gpu_tracer_ = std::make_shared<GPUTracerMTL>();
+#endif  // IMPELLER_DEBUG
   is_valid_ = true;
 }
 
@@ -327,9 +329,11 @@ new ContextMTL(device, command_queue,
   raster_message_loop_.reset();
 }
 
+#ifdef IMPELLER_DEBUG
 std::shared_ptr<GPUTracerMTL> ContextMTL::GetGPUTracer() const {
   return gpu_tracer_;
 }
+#endif  // IMPELLER_DEBUG
 
 const std::shared_ptr<fml::ConcurrentTaskRunner>
 ContextMTL::GetWorkerTaskRunner() const {

impeller/renderer/backend/metal/gpu_tracer_mtl.h

@@ -43,11 +43,9 @@ class GPUTracerMTL : public std::enable_shared_from_this<GPUTracerMTL> {
     size_t pending_buffers = 0;
   };
 
-  [[maybe_unused]] mutable Mutex trace_state_mutex_;
-  [[maybe_unused]] GPUTraceState trace_states_[16] IPLR_GUARDED_BY(
-      trace_state_mutex_);
-  [[maybe_unused]] size_t current_state_ IPLR_GUARDED_BY(trace_state_mutex_) =
-      0u;
+  mutable Mutex trace_state_mutex_;
+  GPUTraceState trace_states_[16] IPLR_GUARDED_BY(trace_state_mutex_);
+  size_t current_state_ IPLR_GUARDED_BY(trace_state_mutex_) = 0u;
 };
 
 }  // namespace impeller

impeller/renderer/backend/metal/gpu_tracer_mtl.mm

@@ -14,16 +14,13 @@
 namespace impeller {
 
 void GPUTracerMTL::MarkFrameEnd() {
-#ifdef IMPELLER_DEBUG
   if (@available(ios 10.3, tvos 10.2, macos 10.15, macCatalyst 13.0, *)) {
     Lock lock(trace_state_mutex_);
     current_state_ = (current_state_ + 1) % 16;
   }
-#endif  // IMPELLER_DEBUG
 }
 
 void GPUTracerMTL::RecordCmdBuffer(id<MTLCommandBuffer> buffer) {
-#ifdef IMPELLER_DEBUG
   if (@available(ios 10.3, tvos 10.2, macos 10.15, macCatalyst 13.0, *)) {
     Lock lock(trace_state_mutex_);
     auto current_state = current_state_;
@@ -54,7 +51,6 @@
       }
     }];
   }
-#endif  // IMPELLER_DEBUG
 }
 
 }  // namespace impeller