lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-24 14:45:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use objc_constructInstance in AllocateObjCBridge

Browse Source 
This constructs in-place the ObjC bridge class.
This fixes a bug where the reference count of the ObjC bridge class was not guaranteed to be initialized on construction.
This commit is contained in:
Jake Turner
2022-07-04 10:15:25 +01:00
committed by Baldur Karlsson
parent 02103a9669
commit c7dae679c1
1 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/metal/metal_types.cpp
+25 -21
View File
@@ -40,27 +40,31 @@ RDCCOMPILE_ASSERT(sizeof(NS::Integer) == sizeof(std::intptr_t), "NS::Integer siz
RDCCOMPILE_ASSERT(sizeof(NS::UInteger) == sizeof(std::uintptr_t),
"NS::UInteger size does not match");
#define DEFINE_OBJC_HELPERS(CPPTYPE) \
void AllocateObjCBridge(WrappedMTL##CPPTYPE *wrappedCPP) \
{ \
RDCCOMPILE_ASSERT((offsetof(WrappedMTL##CPPTYPE, m_ObjcBridge) == 0), \
"m_ObjcBridge must be at offsetof 0"); \
const char *const className = "ObjCBridgeMTL" #CPPTYPE; \
static Class klass = objc_lookUpClass(className); \
static size_t classSize = class_getInstanceSize(klass); \
if(classSize != sizeof(wrappedCPP->m_ObjcBridge)) \
{ \
RDCFATAL("'%s' classSize != sizeof(m_ObjcBridge) %lu != %lu", className, classSize, \
sizeof(wrappedCPP->m_ObjcBridge)); \
} \
wrappedCPP->m_ObjcBridge = klass; \
MTL::CPPTYPE *real = (MTL::CPPTYPE *)wrappedCPP->m_Real; \
if(real) \
{ \
id objc = (id)&wrappedCPP->m_ObjcBridge; \
objc_setAssociatedObject((id)real, objc, objc, OBJC_ASSOCIATION_RETAIN); \
((MTL::CPPTYPE *)objc)->release(); \
} \
#define DEFINE_OBJC_HELPERS(CPPTYPE) \
void AllocateObjCBridge(WrappedMTL##CPPTYPE *wrappedCPP) \
{ \
RDCCOMPILE_ASSERT((offsetof(WrappedMTL##CPPTYPE, m_ObjcBridge) == 0), \
"m_ObjcBridge must be at offsetof 0"); \
const char *const className = "ObjCBridgeMTL" #CPPTYPE; \
static Class klass = objc_lookUpClass(className); \
static size_t classSize = class_getInstanceSize(klass); \
if(classSize != sizeof(wrappedCPP->m_ObjcBridge)) \
{ \
RDCFATAL("'%s' classSize != sizeof(m_ObjcBridge) %lu != %lu", className, classSize, \
sizeof(wrappedCPP->m_ObjcBridge)); \
} \
id objc = objc_constructInstance(klass, &wrappedCPP->m_ObjcBridge); \
if(objc != (id)&wrappedCPP->m_ObjcBridge) \
{ \
RDCFATAL("'%s' objc != m_ObjcBridge %p != %p", className, objc, &wrappedCPP->m_ObjcBridge); \
} \
MTL::CPPTYPE *real = (MTL::CPPTYPE *)wrappedCPP->m_Real; \
if(real) \
{ \
objc_setAssociatedObject((id)real, objc, objc, OBJC_ASSOCIATION_RETAIN); \
((MTL::CPPTYPE *)objc)->release(); \
} \
} \
}
METALCPP_WRAPPED_PROTOCOLS(DEFINE_OBJC_HELPERS)