diff --git a/renderdoc/driver/metal/CMakeLists.txt b/renderdoc/driver/metal/CMakeLists.txt index 30577cad1..a325542ac 100644 --- a/renderdoc/driver/metal/CMakeLists.txt +++ b/renderdoc/driver/metal/CMakeLists.txt @@ -11,6 +11,7 @@ set(sources metal_resources.h metal_types_bridge.mm metal_types_bridge.h + metal_types.cpp metal_types.h metal_library.cpp metal_library.h diff --git a/renderdoc/driver/metal/metal_types.cpp b/renderdoc/driver/metal/metal_types.cpp new file mode 100644 index 000000000..e3d015994 --- /dev/null +++ b/renderdoc/driver/metal/metal_types.cpp @@ -0,0 +1,47 @@ +/****************************************************************************** + * The MIT License (MIT) + * + * Copyright (c) 2022 Baldur Karlsson + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + ******************************************************************************/ + +#include "metal_types.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"); + +template +void DoSerialise(SerialiserType &ser, NS::String *&el) +{ + rdcstr rdcStr; + if(el) + { + rdcStr = el->utf8String(); + } + DoSerialise(ser, rdcStr); + + if(ser.IsReading()) + { + el = NS::String::string(rdcStr.data(), NS::UTF8StringEncoding); + } +} + +INSTANTIATE_SERIALISE_TYPE(NS::String *); diff --git a/renderdoc/driver/metal/metal_types.h b/renderdoc/driver/metal/metal_types.h index 3627cbffe..8af84d7ac 100644 --- a/renderdoc/driver/metal/metal_types.h +++ b/renderdoc/driver/metal/metal_types.h @@ -37,3 +37,11 @@ METALCPP_WRAPPED_PROTOCOLS(DECLARE_OBJC_HELPERS) #undef DECLARE_OBJC_HELPERS + +template <> +inline rdcliteral TypeName() +{ + return "NSString"_lit; +} +template +void DoSerialise(SerialiserType &ser, NS::String *&el);