lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-12 13:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added serialisation of WrappedMTL* types via IDs

Browse Source 
Simplify code to get objc bridge from API result to single line instead of using a temporary variable.
Fix missing forward declaration for bool IsObjCBridge(MTL::CPPTYPE *objCWrapped);
This commit is contained in:
Jake Turner
2022-03-18 18:22:55 +00:00
committed by Baldur Karlsson
parent 7a29e6a6bb
commit 065d229607
4 changed files with 80 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/metal/metal_resources.cpp
+14 -1
View File
@@ -23,7 +23,10 @@
******************************************************************************/
#include "metal_resources.h"
#include "metal_command_queue.h"
#include "metal_device.h"
#include "metal_function.h"
#include "metal_library.h"
ResourceId GetResID(WrappedMTLObject *obj)
{
@@ -33,6 +36,16 @@ ResourceId GetResID(WrappedMTLObject *obj)
return obj->id;
}
#define IMPLEMENT_WRAPPED_TYPE_HELPERS(CPPTYPE) \
MTL::CPPTYPE *Unwrap(WrappedMTL##CPPTYPE *obj) { return Unwrap<MTL::CPPTYPE *>(obj); } \
MTL::CPPTYPE *GetObjCBridge(WrappedMTL##CPPTYPE *obj) \
{ \
return GetObjCBridge<MTL::CPPTYPE *>(obj); \
}
METALCPP_WRAPPED_PROTOCOLS(IMPLEMENT_WRAPPED_TYPE_HELPERS)
#undef IMPLEMENT_WRAPPED_TYPE_HELPERS
void WrappedMTLObject::Dealloc()
{
// TODO: call the wrapped object destructor
@@ -45,7 +58,7 @@ MetalResourceManager *WrappedMTLObject::GetResourceManager()
MTL::Device *WrappedMTLObject::GetObjCBridgeMTLDevice()
{
return GetObjCBridge<MTL::Device *>(m_WrappedMTLDevice);
return GetObjCBridge(m_WrappedMTLDevice);
}
MetalResourceRecord::~MetalResourceRecord()
renderdoc/driver/metal/metal_resources.h
+10 -17
View File
@@ -115,24 +115,17 @@ struct UnwrapHelper
{
};
#define UNWRAP_HELPER(CPPTYPE) \
template <> \
struct UnwrapHelper<MTL::CPPTYPE *> \
{ \
typedef CONCAT(WrappedMTL, CPPTYPE) Outer; \
};
#define WRAPPED_TYPE_HELPERS(CPPTYPE) \
template <> \
struct UnwrapHelper<MTL::CPPTYPE *> \
{ \
typedef CONCAT(WrappedMTL, CPPTYPE) Outer; \
}; \
extern MTL::CPPTYPE *Unwrap(WrappedMTL##CPPTYPE *obj); \
extern MTL::CPPTYPE *GetObjCBridge(WrappedMTL##CPPTYPE *obj);
METALCPP_WRAPPED_PROTOCOLS(UNWRAP_HELPER)
#undef UNWRAP_HELPER
#define IMPLEMENT_WRAPPED_TYPE_UNWRAP(CPPTYPE) \
inline MTL::CPPTYPE *Unwrap(WrappedMTL##CPPTYPE *obj) \
{ \
return Unwrap<MTL::CPPTYPE *>((WrappedMTLObject *)obj); \
}
METALCPP_WRAPPED_PROTOCOLS(IMPLEMENT_WRAPPED_TYPE_UNWRAP)
#undef IMPLEMENT_WRAPPED_TYPE_UNWRAP
METALCPP_WRAPPED_PROTOCOLS(WRAPPED_TYPE_HELPERS)
#undef WRAPPED_TYPE_HELPERS
struct MetalResourceRecord : public ResourceRecord
{
renderdoc/driver/metal/metal_types.cpp
+47
View File
@@ -23,11 +23,58 @@
******************************************************************************/
#include "metal_types.h"
#include "metal_command_queue.h"
#include "metal_device.h"
#include "metal_function.h"
#include "metal_library.h"
#include "metal_manager.h"
#include "metal_resources.h"
RDCCOMPILE_ASSERT(sizeof(NS::Integer) == sizeof(std::intptr_t), "NS::Integer size does not match");
RDCCOMPILE_ASSERT(sizeof(NS::UInteger) == sizeof(std::uintptr_t),
"NS::UInteger size does not match");
// serialisation of object handles via IDs.
template <class SerialiserType, class type>
void DoSerialiseViaResourceId(SerialiserType &ser, type &el)
{
MetalResourceManager *rm = (MetalResourceManager *)ser.GetUserData();
ResourceId id;
if(ser.IsWriting() && rm)
id = GetResID(el);
if(ser.IsStructurising() && rm)
id = rm->GetOriginalID(GetResID(el));
DoSerialise(ser, id);
if(ser.IsReading() && rm && !IsStructuredExporting(rm->GetState()))
{
el = NULL;
if(id != ResourceId() && rm)
{
if(rm->HasLiveResource(id))
{
// we leave this wrapped.
el = (type)rm->GetLiveResource(id);
}
}
}
}
#define IMPLEMENT_WRAPPED_TYPE_SERIALISE(CPPTYPE) \
template <class SerialiserType> \
void DoSerialise(SerialiserType &ser, WrappedMTL##CPPTYPE *&el) \
{ \
DoSerialiseViaResourceId(ser, el); \
} \
INSTANTIATE_SERIALISE_TYPE(WrappedMTL##CPPTYPE *);
METALCPP_WRAPPED_PROTOCOLS(IMPLEMENT_WRAPPED_TYPE_SERIALISE);
#undef IMPLEMENT_WRAPPED_TYPE_SERIALISE
template <typename SerialiserType>
void DoSerialise(SerialiserType &ser, NS::String *&el)
{
renderdoc/driver/metal/metal_types.h
+9
View File
@@ -34,6 +34,15 @@
FUNC(Function); \
FUNC(Library);
// These serialise overloads will fetch the ID during capture, serialise the ID
// directly as-if it were the original type, then on replay load up the resource if available.
#define DECLARE_WRAPPED_TYPE_SERIALISE(CPPTYPE) \
class WrappedMTL##CPPTYPE; \
DECLARE_REFLECTION_STRUCT(WrappedMTL##CPPTYPE *)
METALCPP_WRAPPED_PROTOCOLS(DECLARE_WRAPPED_TYPE_SERIALISE);
#undef DECLARE_WRAPPED_TYPE_SERIALISE
#define DECLARE_OBJC_HELPERS(CPPTYPE) \
class WrappedMTL##CPPTYPE; \
extern WrappedMTL##CPPTYPE *GetWrapped(MTL::CPPTYPE *objCWrapped); \