diff --git a/CMakeLists.txt b/CMakeLists.txt index 898f0086..d840ffc9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,7 +111,7 @@ endif() option(ENABLE_OPENGL "Enables the OpenGL backend" ON) option(ENABLE_VULKAN "Enables the Vulkan backend" ON) -option(ENABLE_METAL "Enables the Metal backend" $ENABLE_METAL_DEFAULT) +option(ENABLE_METAL "Enables the Metal backend" ${ENABLE_METAL_DEFAULT}) option(ENABLE_DISCORD_RPC "Enables the Discord Rich Presence feature" ON) if (ENABLE_METAL AND NOT APPLE) @@ -202,8 +202,7 @@ if (ENABLE_OPENGL) find_package(OpenGL REQUIRED) endif() -# TODO: handle this differently? -if (ENABLE_METAL AND APPLE) +if (ENABLE_METAL) include_directories(${CMAKE_SOURCE_DIR}/dependencies/metal-cpp) endif() @@ -232,9 +231,9 @@ if (ENABLE_WXWIDGETS) endif() if (ENABLE_CUBEB) - #if (NOT ENABLE_VCPKG) - #find_package(cubeb) - #endif() + if (NOT ENABLE_VCPKG) + find_package(cubeb) + endif() if (NOT cubeb_FOUND) option(BUILD_TESTS "" OFF) option(BUILD_TOOLS "" OFF) diff --git a/src/Cafe/CafeSystem.cpp b/src/Cafe/CafeSystem.cpp index a6691c3d..1d9ebd06 100644 --- a/src/Cafe/CafeSystem.cpp +++ b/src/Cafe/CafeSystem.cpp @@ -256,6 +256,7 @@ void InfoLog_PrintActiveSettings() } else if (ActiveSettings::GetGraphicsAPI() == GraphicAPI::kMetal) { + cemuLog_log(LogType::Force, "Async compile: {}", GetConfig().async_compile.GetValue() ? "true" : "false"); cemuLog_log(LogType::Force, "Fast math: {}", GetConfig().fast_math.GetValue() ? "true" : "false"); if (!GetConfig().vk_accurate_barriers.GetValue()) cemuLog_log(LogType::Force, "Accurate barriers are disabled!"); diff --git a/src/Cafe/HW/Latte/Renderer/Metal/LatteToMtl.cpp b/src/Cafe/HW/Latte/Renderer/Metal/LatteToMtl.cpp index 8a73da2b..47721335 100644 --- a/src/Cafe/HW/Latte/Renderer/Metal/LatteToMtl.cpp +++ b/src/Cafe/HW/Latte/Renderer/Metal/LatteToMtl.cpp @@ -156,7 +156,6 @@ void CheckForPixelFormatSupport(const MetalPixelFormatSupport& support) MTL_COLOR_FORMAT_TABLE[Latte::E_GX2SURFFMT::R4_G4_UNORM].bytesPerBlock = 2; MTL_COLOR_FORMAT_TABLE[Latte::E_GX2SURFFMT::R4_G4_UNORM].textureDecoder = TextureDecoder_R4G4_UNORM_To_RG8::getInstance(); - // ABGR4Unorm MTL_COLOR_FORMAT_TABLE[Latte::E_GX2SURFFMT::R4_G4_B4_A4_UNORM].pixelFormat = MTL::PixelFormatRGBA8Unorm; MTL_COLOR_FORMAT_TABLE[Latte::E_GX2SURFFMT::R4_G4_B4_A4_UNORM].bytesPerBlock = 4; MTL_COLOR_FORMAT_TABLE[Latte::E_GX2SURFFMT::R4_G4_B4_A4_UNORM].textureDecoder = TextureDecoder_R4G4B4A4_UNORM_To_RGBA8::getInstance();