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

Use Unwrap() instead of class method GetReal()

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:25:54 +00:00
committed by Baldur Karlsson
parent 065d229607
commit a4d5bbe801
11 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/metal/metal_command_queue.h
-1
View File
@@ -32,7 +32,6 @@ public:
WrappedMTLCommandQueue(MTL::CommandQueue *realMTLCommandQueue, ResourceId objId,
WrappedMTLDevice *wrappedMTLDevice);
MTL::CommandQueue *GetReal() { return (MTL::CommandQueue *)real; }
enum
{
TypeEnum = eResCommandQueue
renderdoc/driver/metal/metal_command_queue_bridge.mm
+1 -2
View File
@@ -31,8 +31,7 @@
// ObjCBridgeMTLCommandQueue specific
- (id<MTLCommandQueue>)real
{
MTL::CommandQueue *real = self.wrappedCPP->GetReal();
return id<MTLCommandQueue>(real);
return id<MTLCommandQueue>(Unwrap(self.wrappedCPP));
}
// Use the real MTLCommandQueue to find methods from messages
renderdoc/driver/metal/metal_device.cpp
+3 -3
View File
@@ -65,7 +65,7 @@ bool WrappedMTLDevice::Serialise_newCommandQueue(SerialiserType &ser, WrappedMTL
WrappedMTLCommandQueue *WrappedMTLDevice::newCommandQueue()
{
MTL::CommandQueue *realMTLCommandQueue;
SERIALISE_TIME_CALL(realMTLCommandQueue = GetReal()->newCommandQueue());
SERIALISE_TIME_CALL(realMTLCommandQueue = Unwrap(this)->newCommandQueue());
WrappedMTLCommandQueue *wrappedMTLCommandQueue;
ResourceId id = GetResourceManager()->WrapResource(realMTLCommandQueue, wrappedMTLCommandQueue);
if(IsCaptureMode(m_State))
@@ -113,7 +113,7 @@ WrappedMTLLibrary *WrappedMTLDevice::newDefaultLibrary()
{
MTL::Library *realMTLLibrary;
SERIALISE_TIME_CALL(realMTLLibrary = GetReal()->newDefaultLibrary());
SERIALISE_TIME_CALL(realMTLLibrary = Unwrap(this)->newDefaultLibrary());
WrappedMTLLibrary *wrappedMTLLibrary;
ResourceId id = GetResourceManager()->WrapResource(realMTLLibrary, wrappedMTLLibrary);
if(IsCaptureMode(m_State))
@@ -160,7 +160,7 @@ WrappedMTLLibrary *WrappedMTLDevice::newLibraryWithSource(NS::String *source,
NS::Error **error)
{
MTL::Library *realMTLLibrary;
SERIALISE_TIME_CALL(realMTLLibrary = GetReal()->newLibrary(source, options, error));
SERIALISE_TIME_CALL(realMTLLibrary = Unwrap(this)->newLibrary(source, options, error));
WrappedMTLLibrary *wrappedMTLLibrary;
ResourceId id = GetResourceManager()->WrapResource(realMTLLibrary, wrappedMTLLibrary);
if(IsCaptureMode(m_State))
renderdoc/driver/metal/metal_device.h
-1
View File
@@ -34,7 +34,6 @@ class WrappedMTLDevice : public WrappedMTLObject
public:
WrappedMTLDevice(MTL::Device *realMTLDevice, ResourceId objId);
~WrappedMTLDevice() {}
MTL::Device *GetReal() { return (MTL::Device *)real; }
static WrappedMTLDevice *MTLCreateSystemDefaultDevice(MTL::Device *realMTLDevice);
DECLARE_FUNCTION_WITH_RETURN_SERIALISED(WrappedMTLCommandQueue *, newCommandQueue);
renderdoc/driver/metal/metal_device_bridge.mm
+5 -12
View File
@@ -39,8 +39,7 @@
// ObjCBridgeMTLDevice specific
- (id<MTLDevice>)real
{
MTL::Device *real = self.wrappedCPP->GetReal();
return id<MTLDevice>(real);
return id<MTLDevice>(Unwrap(self.wrappedCPP));
}
// Use the real MTLDevice to find methods from messages
@@ -183,9 +182,7 @@
- (nullable id<MTLCommandQueue>)newCommandQueue
{
WrappedMTLCommandQueue *wrapped = self.wrappedCPP->newCommandQueue();
MTL::CommandQueue *objc = GetObjCBridge<MTL::CommandQueue *>(wrapped);
return id<MTLCommandQueue>(objc);
return id<MTLCommandQueue>(GetObjCBridge(self.wrappedCPP->newCommandQueue()));
}
- (nullable id<MTLCommandQueue>)newCommandQueueWithMaxCommandBufferCount:(NSUInteger)maxCommandBufferCount
@@ -287,9 +284,7 @@
- (nullable id<MTLLibrary>)newDefaultLibrary
{
WrappedMTLLibrary *wrapped = self.wrappedCPP->newDefaultLibrary();
MTL::Library *objc = GetObjCBridge<MTL::Library *>(wrapped);
return id<MTLLibrary>(objc);
return id<MTLLibrary>(GetObjCBridge(self.wrappedCPP->newDefaultLibrary()));
}
- (nullable id<MTLLibrary>)newDefaultLibraryWithBundle:(NSBundle *)bundle
@@ -326,10 +321,8 @@
options:(nullable MTLCompileOptions *)options
error:(__autoreleasing NSError **)error
{
WrappedMTLLibrary *wrapped = self.wrappedCPP->newLibraryWithSource(
(NS::String *)source, (MTL::CompileOptions *)options, (NS::Error **)error);
MTL::Library *objc = GetObjCBridge<MTL::Library *>(wrapped);
return (id<MTLLibrary>)(objc);
return (id<MTLLibrary>)(GetObjCBridge(self.wrappedCPP->newLibraryWithSource(
(NS::String *)source, (MTL::CompileOptions *)options, (NS::Error **)error)));
}
- (void)newLibraryWithSource:(NSString *)source
renderdoc/driver/metal/metal_function.h
-1
View File
@@ -32,7 +32,6 @@ public:
WrappedMTLFunction(MTL::Function *realMTLFunction, ResourceId objId,
WrappedMTLDevice *wrappedMTLDevice);
MTL::Function *GetReal() { return (MTL::Function *)real; }
enum
{
TypeEnum = eResFunction
renderdoc/driver/metal/metal_function_bridge.mm
+1 -2
View File
@@ -31,8 +31,7 @@
// ObjCBrdigeMTLFunction specific
- (id<MTLFunction>)real
{
MTL::Function *real = self.wrappedCPP->GetReal();
return id<MTLFunction>(real);
return id<MTLFunction>(Unwrap(self.wrappedCPP));
}
- (void)dealloc
renderdoc/driver/metal/metal_hook_bridge.mm
+2 -2
View File
@@ -54,8 +54,8 @@ id<MTLDevice> METAL_EXPORT_NAME(MTLCreateSystemDefaultDevice)(void)
}
id<MTLDevice> device = METAL.MTLCreateSystemDefaultDevice();
WrappedMTLDevice *wrapped = WrappedMTLDevice::MTLCreateSystemDefaultDevice((MTL::Device *)device);
return id<MTLDevice>(GetObjCBridge<MTL::Device *>(wrapped));
return id<MTLDevice>(
GetObjCBridge(WrappedMTLDevice::MTLCreateSystemDefaultDevice((MTL::Device *)device)));
}
/*
renderdoc/driver/metal/metal_library.h
-1
View File
@@ -32,7 +32,6 @@ public:
WrappedMTLLibrary(MTL::Library *realMTLLibrary, ResourceId objId,
WrappedMTLDevice *wrappedMTLDevice);
MTL::Library *GetReal() { return (MTL::Library *)real; }
enum
{
TypeEnum = eResLibrary
renderdoc/driver/metal/metal_library_bridge.mm
+1 -2
View File
@@ -31,8 +31,7 @@
// ObjCBridgeMTLLibrary specific
- (id<MTLLibrary>)real
{
MTL::Library *real = self.wrappedCPP->GetReal();
return id<MTLLibrary>(real);
return id<MTLLibrary>(Unwrap(self.wrappedCPP));
}
// Use the real MTLLibrary to find methods from messages
renderdoc/driver/metal/metal_types.h
+1 -1
View File
@@ -47,7 +47,7 @@ METALCPP_WRAPPED_PROTOCOLS(DECLARE_WRAPPED_TYPE_SERIALISE);
class WrappedMTL##CPPTYPE; \
extern WrappedMTL##CPPTYPE *GetWrapped(MTL::CPPTYPE *objCWrapped); \
extern MTL::CPPTYPE *GetReal(MTL::CPPTYPE *objCWrapped); \
extern bool IsObjCWrapped(MTL::CPPTYPE *objCWrapped); \
extern bool IsObjCBridge(MTL::CPPTYPE *objCWrapped); \
extern ResourceId GetResID(MTL::CPPTYPE *objCWrapped); \
extern MTL::CPPTYPE *AllocateObjCBridge(WrappedMTL##CPPTYPE *wrapped);