The-Homebrew-Cloud/Cemu
2
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2024-12-01 21:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove CMake hacks

Browse Source
This commit is contained in:
Samuliak 2024-10-09 16:47:15 +02:00
parent 6b784ad949
commit 756470f1a7
No known key found for this signature in database
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -111,7 +111,7 @@ endif()
option(ENABLE_OPENGL "Enables the OpenGL backend" ON) option(ENABLE_OPENGL "Enables the OpenGL backend" ON)
option(ENABLE_VULKAN "Enables the Vulkan 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) option(ENABLE_DISCORD_RPC "Enables the Discord Rich Presence feature" ON)
if (ENABLE_METAL AND NOT APPLE) if (ENABLE_METAL AND NOT APPLE)
@ -202,8 +202,7 @@ if (ENABLE_OPENGL)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
endif() endif()
# TODO: handle this differently? if (ENABLE_METAL)
if (ENABLE_METAL AND APPLE)
include_directories(${CMAKE_SOURCE_DIR}/dependencies/metal-cpp) include_directories(${CMAKE_SOURCE_DIR}/dependencies/metal-cpp)
endif() endif()
@ -232,9 +231,9 @@ if (ENABLE_WXWIDGETS)
endif() endif()
if (ENABLE_CUBEB) if (ENABLE_CUBEB)
#if (NOT ENABLE_VCPKG) if (NOT ENABLE_VCPKG)
#find_package(cubeb) find_package(cubeb)
#endif() endif()
if (NOT cubeb_FOUND) if (NOT cubeb_FOUND)
option(BUILD_TESTS "" OFF) option(BUILD_TESTS "" OFF)
option(BUILD_TOOLS "" OFF) option(BUILD_TOOLS "" OFF)

1
src/Cafe/CafeSystem.cpp
View File

@ -256,6 +256,7 @@ void InfoLog_PrintActiveSettings()
} }
else if (ActiveSettings::GetGraphicsAPI() == GraphicAPI::kMetal) 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"); cemuLog_log(LogType::Force, "Fast math: {}", GetConfig().fast_math.GetValue() ? "true" : "false");
if (!GetConfig().vk_accurate_barriers.GetValue()) if (!GetConfig().vk_accurate_barriers.GetValue())
cemuLog_log(LogType::Force, "Accurate barriers are disabled!"); cemuLog_log(LogType::Force, "Accurate barriers are disabled!");

1
src/Cafe/HW/Latte/Renderer/Metal/LatteToMtl.cpp
View File

@ -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].bytesPerBlock = 2;
MTL_COLOR_FORMAT_TABLE[Latte::E_GX2SURFFMT::R4_G4_UNORM].textureDecoder = TextureDecoder_R4G4_UNORM_To_RG8::getInstance(); 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].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].bytesPerBlock = 4;
MTL_COLOR_FORMAT_TABLE[Latte::E_GX2SURFFMT::R4_G4_B4_A4_UNORM].textureDecoder = TextureDecoder_R4G4B4A4_UNORM_To_RGBA8::getInstance(); MTL_COLOR_FORMAT_TABLE[Latte::E_GX2SURFFMT::R4_G4_B4_A4_UNORM].textureDecoder = TextureDecoder_R4G4B4A4_UNORM_To_RGBA8::getInstance();