From 424f910bfc3f72759c48e9fc942d8fd1c104d6db Mon Sep 17 00:00:00 2001 From: Jake Turner Date: Thu, 11 Aug 2022 06:10:31 +0100 Subject: [PATCH] WrappedMTLObject::AddEven() & AddAction() Trampoline calls to m_Device->AddEvent() & AddAction() WrappedMTLDevice::AddAction() & AddAction() are currently empty stubs --- renderdoc/driver/metal/metal_core.cpp | 10 ++++++++++ renderdoc/driver/metal/metal_device.h | 3 +++ renderdoc/driver/metal/metal_resources.cpp | 10 ++++++++++ renderdoc/driver/metal/metal_resources.h | 2 ++ 4 files changed, 25 insertions(+) diff --git a/renderdoc/driver/metal/metal_core.cpp b/renderdoc/driver/metal/metal_core.cpp index c14d56e2d..52c43df5d 100644 --- a/renderdoc/driver/metal/metal_core.cpp +++ b/renderdoc/driver/metal/metal_core.cpp @@ -57,6 +57,16 @@ WriteSerialiser &WrappedMTLDevice::GetThreadSerialiser() return *ser; } +void WrappedMTLDevice::AddAction(const ActionDescription &a) +{ + METAL_NOT_IMPLEMENTED(); +} + +void WrappedMTLDevice::AddEvent() +{ + METAL_NOT_IMPLEMENTED(); +} + void WrappedMTLDevice::WaitForGPU() { MTL::CommandBuffer *mtlCommandBuffer = m_mtlCommandQueue->commandBuffer(); diff --git a/renderdoc/driver/metal/metal_device.h b/renderdoc/driver/metal/metal_device.h index c802f9e09..ed51e7571 100644 --- a/renderdoc/driver/metal/metal_device.h +++ b/renderdoc/driver/metal/metal_device.h @@ -130,6 +130,9 @@ public: void RegisterMetalLayer(CA::MetalLayer *mtlLayer); void UnregisterMetalLayer(CA::MetalLayer *mtlLayer); + void AddEvent(); + void AddAction(const ActionDescription &a); + enum { TypeEnum = eResDevice diff --git a/renderdoc/driver/metal/metal_resources.cpp b/renderdoc/driver/metal/metal_resources.cpp index 01b5c0e7a..0132a5faf 100644 --- a/renderdoc/driver/metal/metal_resources.cpp +++ b/renderdoc/driver/metal/metal_resources.cpp @@ -57,3 +57,13 @@ MetalResourceRecord::~MetalResourceRecord() if(m_Type == eResCommandBuffer) SAFE_DELETE(cmdInfo); } + +void WrappedMTLObject::AddEvent() +{ + m_Device->AddEvent(); +} + +void WrappedMTLObject::AddAction(const ActionDescription &a) +{ + m_Device->AddAction(a); +} diff --git a/renderdoc/driver/metal/metal_resources.h b/renderdoc/driver/metal/metal_resources.h index ffea08a3b..cb321b861 100644 --- a/renderdoc/driver/metal/metal_resources.h +++ b/renderdoc/driver/metal/metal_resources.h @@ -66,6 +66,8 @@ struct WrappedMTLObject MTL::Device *GetDevice() { return (MTL::Device *)m_Device; } MetalResourceManager *GetResourceManager(); + void AddEvent(); + void AddAction(const ActionDescription &a); void *m_ObjcBridge = NULL; void *m_Real;