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

WrappedMTLObject rename member variables

Browse Source 
objcBridge -> m_ObjcBridge
real -> m_Real
id -> m_ID
record -> m_Record

MetalResourceRecord rename member variable
Resource -> m_Resource
resType -> m_Type
This commit is contained in:
Jake Turner
2022-04-14 07:01:21 +01:00
committed by Baldur Karlsson
parent 1201d47db4
commit 4e240a4153
10 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/metal/metal_command_buffer.cpp
+2 -2
View File
@@ -31,7 +31,7 @@ WrappedMTLCommandBuffer::WrappedMTLCommandBuffer(MTL::CommandBuffer *realMTLComm
ResourceId objId, WrappedMTLDevice *wrappedMTLDevice)
: WrappedMTLObject(realMTLCommandBuffer, objId, wrappedMTLDevice, wrappedMTLDevice->GetStateRef())
{
objcBridge = AllocateObjCBridge(this);
m_ObjcBridge = AllocateObjCBridge(this);
}
template <typename SerialiserType>
@@ -104,7 +104,7 @@ void WrappedMTLCommandBuffer::commit()
bool capframe = IsActiveCapturing(m_State);
if(capframe)
{
record->AddRef();
bufferRecord->AddRef();
bufferRecord->MarkResourceFrameReferenced(GetResID(m_WrappedMTLCommandQueue), eFrameRef_Read);
// pull in frame refs from this command buffer
bufferRecord->AddResourceReferences(GetResourceManager());
renderdoc/driver/metal/metal_command_queue.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ WrappedMTLCommandQueue::WrappedMTLCommandQueue(MTL::CommandQueue *realMTLCommand
ResourceId objId, WrappedMTLDevice *wrappedMTLDevice)
: WrappedMTLObject(realMTLCommandQueue, objId, wrappedMTLDevice, wrappedMTLDevice->GetStateRef())
{
objcBridge = AllocateObjCBridge(this);
m_ObjcBridge = AllocateObjCBridge(this);
}
template <typename SerialiserType>
renderdoc/driver/metal/metal_device.cpp
+1 -1
View File
@@ -31,7 +31,7 @@
WrappedMTLDevice::WrappedMTLDevice(MTL::Device *realMTLDevice, ResourceId objId)
: WrappedMTLObject(realMTLDevice, objId, this, GetStateRef())
{
objcBridge = AllocateObjCBridge(this);
m_ObjcBridge = AllocateObjCBridge(this);
m_WrappedMTLDevice = this;
threadSerialiserTLSSlot = Threading::AllocateTLSSlot();
renderdoc/driver/metal/metal_function.cpp
+1 -1
View File
@@ -29,5 +29,5 @@ WrappedMTLFunction::WrappedMTLFunction(MTL::Function *realMTLFunction, ResourceI
WrappedMTLDevice *wrappedMTLDevice)
: WrappedMTLObject(realMTLFunction, objId, wrappedMTLDevice, wrappedMTLDevice->GetStateRef())
{
objcBridge = AllocateObjCBridge(this);
m_ObjcBridge = AllocateObjCBridge(this);
}
renderdoc/driver/metal/metal_init_state.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ bool WrappedMTLDevice::Prepare_InitialState(WrappedMTLObject *res)
{
ResourceId id = GetResourceManager()->GetID(res);
MetalResourceType type = res->record->resType;
MetalResourceType type = res->m_Record->m_Type;
{
RDCERR("Unhandled resource type %d", type);
}
renderdoc/driver/metal/metal_library.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ WrappedMTLLibrary::WrappedMTLLibrary(MTL::Library *realMTLLibrary, ResourceId ob
WrappedMTLDevice *wrappedMTLDevice)
: WrappedMTLObject(realMTLLibrary, objId, wrappedMTLDevice, wrappedMTLDevice->GetStateRef())
{
objcBridge = AllocateObjCBridge(this);
m_ObjcBridge = AllocateObjCBridge(this);
}
template <typename SerialiserType>
renderdoc/driver/metal/metal_manager.h
+5 -5
View File
@@ -95,7 +95,7 @@ public:
if(res == NULL)
return ResourceId();
return res->id;
return res->m_ID;
}
// ResourceManager interface
@@ -108,7 +108,7 @@ public:
ResourceId id = ResourceIDGen::GetNewUniqueID();
using WrappedType = typename UnwrapHelper<realtype>::Outer;
wrapped = new WrappedType(obj, id, m_WrappedMTLDevice);
wrapped->real = obj;
wrapped->m_Real = obj;
AddCurrentResource(id, wrapped);
// TODO: implement RD MTL replay
@@ -122,10 +122,10 @@ public:
template <typename wrappedtype>
MetalResourceRecord *AddResourceRecord(wrappedtype *wrapped)
{
MetalResourceRecord *ret = wrapped->record = ResourceManager::AddResourceRecord(wrapped->id);
MetalResourceRecord *ret = wrapped->m_Record = ResourceManager::AddResourceRecord(wrapped->m_ID);
ret->Resource = (WrappedMTLObject *)wrapped;
ret->resType = (MetalResourceType)wrappedtype::TypeEnum;
ret->m_Resource = (WrappedMTLObject *)wrapped;
ret->m_Type = (MetalResourceType)wrappedtype::TypeEnum;
return ret;
}
renderdoc/driver/metal/metal_resources.cpp
+2 -2
View File
@@ -34,7 +34,7 @@ ResourceId GetResID(WrappedMTLObject *obj)
if(obj == NULL)
return ResourceId();
return obj->id;
return obj->m_ID;
}
#define IMPLEMENT_WRAPPED_TYPE_HELPERS(CPPTYPE) \
@@ -64,6 +64,6 @@ MTL::Device *WrappedMTLObject::GetObjCBridgeMTLDevice()
MetalResourceRecord::~MetalResourceRecord()
{
if(resType == eResCommandBuffer)
if(m_Type == eResCommandBuffer)
SAFE_DELETE(cmdInfo);
}
renderdoc/driver/metal/metal_resources.h
+17 -17
View File
@@ -48,19 +48,19 @@ struct WrappedMTLObject
{
WrappedMTLObject() = delete;
WrappedMTLObject(WrappedMTLDevice *wrappedMTLDevice, CaptureState &captureState)
: objcBridge(NULL),
real(NULL),
record(NULL),
: m_ObjcBridge(NULL),
m_Real(NULL),
m_Record(NULL),
m_WrappedMTLDevice(wrappedMTLDevice),
m_State(captureState)
{
}
WrappedMTLObject(void *mtlObject, ResourceId objId, WrappedMTLDevice *wrappedMTLDevice,
CaptureState &captureState)
: objcBridge(NULL),
real(mtlObject),
id(objId),
record(NULL),
: m_ObjcBridge(NULL),
m_Real(mtlObject),
m_ID(objId),
m_Record(NULL),
m_WrappedMTLDevice(wrappedMTLDevice),
m_State(captureState)
{
@@ -73,10 +73,10 @@ struct WrappedMTLObject
MetalResourceManager *GetResourceManager();
void *objcBridge;
void *real;
ResourceId id;
MetalResourceRecord *record;
void *m_ObjcBridge;
void *m_Real;
ResourceId m_ID;
MetalResourceRecord *m_Record;
WrappedMTLDevice *m_WrappedMTLDevice;
CaptureState &m_State;
};
@@ -89,7 +89,7 @@ MetalResourceRecord *GetRecord(WrappedType *obj)
if(obj == NULL)
return NULL;
return obj->record;
return obj->m_Record;
}
template <typename RealType>
@@ -98,7 +98,7 @@ RealType Unwrap(WrappedMTLObject *obj)
if(obj == NULL)
return RealType();
return (RealType)obj->real;
return (RealType)obj->m_Real;
}
template <typename RealType>
@@ -107,7 +107,7 @@ RealType GetObjCBridge(WrappedMTLObject *obj)
if(obj == NULL)
return RealType();
return (RealType)obj->objcBridge;
return (RealType)obj->m_ObjcBridge;
}
// template magic voodoo to unwrap types
@@ -158,12 +158,12 @@ public:
};
MetalResourceRecord(ResourceId id)
: ResourceRecord(id, true), Resource(NULL), resType(eResUnknown), ptrUnion(NULL)
: ResourceRecord(id, true), m_Resource(NULL), m_Type(eResUnknown), ptrUnion(NULL)
{
}
~MetalResourceRecord();
WrappedMTLObject *Resource;
MetalResourceType resType;
WrappedMTLObject *m_Resource;
MetalResourceType m_Type;
// Each entry is only used by specific record types
union
renderdoc/driver/metal/metal_types_bridge.mm
+1 -1
View File
@@ -67,7 +67,7 @@
{ \
return ResourceId(); \
} \
return wrappedCPP->id; \
return wrappedCPP->m_ID; \
} \
\
MTL::CPPTYPE *AllocateObjCBridge(WrappedMTL##CPPTYPE *wrappedCPP) \