diff --git a/UnleashedRecomp/CMakeLists.txt b/UnleashedRecomp/CMakeLists.txt index 0b1673f3..36de7756 100644 --- a/UnleashedRecomp/CMakeLists.txt +++ b/UnleashedRecomp/CMakeLists.txt @@ -122,7 +122,7 @@ find_package(zstd CONFIG REQUIRED) find_package(Stb REQUIRED) find_package(unofficial-concurrentqueue REQUIRED) find_package(imgui CONFIG REQUIRED) -find_path(CONJURE_ENUM_INCLUDE_DIRS "conjure_enum.hpp") +find_package(magic_enum CONFIG REQUIRED) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/D3D12) add_custom_command(TARGET UnleashedRecomp POST_BUILD @@ -158,6 +158,7 @@ target_link_libraries(UnleashedRecomp PRIVATE unofficial::concurrentqueue::concurrentqueue Synchronization imgui::imgui + magic_enum::magic_enum ) target_include_directories(UnleashedRecomp PRIVATE @@ -165,7 +166,6 @@ target_include_directories(UnleashedRecomp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/api ${SWA_THIRDPARTY_ROOT}/ddspp ${Stb_INCLUDE_DIR} - ${CONJURE_ENUM_INCLUDE_DIRS} ) target_precompile_headers(UnleashedRecomp PUBLIC ${SWA_PRECOMPILED_HEADERS}) diff --git a/UnleashedRecomp/gpu/video.cpp b/UnleashedRecomp/gpu/video.cpp index 0a521bf6..66492945 100644 --- a/UnleashedRecomp/gpu/video.cpp +++ b/UnleashedRecomp/gpu/video.cpp @@ -36,6 +36,10 @@ #include "shader/resolve_msaa_depth_8x.hlsl.dxil.h" #include "shader/resolve_msaa_depth_8x.hlsl.spirv.h" +#ifdef ASYNC_PSO_DEBUG +#include +#endif + extern "C" { __declspec(dllexport) unsigned long NvOptimusEnablement = 0x00000001; @@ -2743,11 +2747,6 @@ static RenderPipeline* CreateGraphicsPipelineInRenderThread(PipelineState pipeli pipeline->setName(std::format("{} {} {:X}", pipelineState.vertexShader->name, pipelineState.pixelShader != nullptr ? pipelineState.pixelShader->name : "", hash)); - auto enumToString = [](T value) - { - return FIX8::conjure_enum::enum_to_string(value); - }; - std::lock_guard lock(g_debugMutex); g_pipelineDebugText = std::format( "PipelineState {:X}:\n" @@ -2784,25 +2783,25 @@ static RenderPipeline* CreateGraphicsPipelineInRenderThread(PipelineState pipeli pipelineState.instancing, pipelineState.zEnable, pipelineState.zWriteEnable, - enumToString(pipelineState.srcBlend), - enumToString(pipelineState.destBlend), - enumToString(pipelineState.cullMode), - enumToString(pipelineState.zFunc), + magic_enum::enum_name(pipelineState.srcBlend), + magic_enum::enum_name(pipelineState.destBlend), + magic_enum::enum_name(pipelineState.cullMode), + magic_enum::enum_name(pipelineState.zFunc), pipelineState.alphaBlendEnable, - enumToString(pipelineState.blendOp), + magic_enum::enum_name(pipelineState.blendOp), pipelineState.slopeScaledDepthBias, pipelineState.depthBias, - enumToString(pipelineState.srcBlendAlpha), - enumToString(pipelineState.destBlendAlpha), - enumToString(pipelineState.blendOpAlpha), + magic_enum::enum_name(pipelineState.srcBlendAlpha), + magic_enum::enum_name(pipelineState.destBlendAlpha), + magic_enum::enum_name(pipelineState.blendOpAlpha), pipelineState.colorWriteEnable, - enumToString(pipelineState.primitiveTopology), + magic_enum::enum_name(pipelineState.primitiveTopology), pipelineState.vertexStrides[0], pipelineState.vertexStrides[1], pipelineState.vertexStrides[2], pipelineState.vertexStrides[3], - enumToString(pipelineState.renderTargetFormat), - enumToString(pipelineState.depthStencilFormat), + magic_enum::enum_name(pipelineState.renderTargetFormat), + magic_enum::enum_name(pipelineState.depthStencilFormat), pipelineState.sampleCount, pipelineState.enableAlphaToCoverage, pipelineState.specConstants) diff --git a/UnleashedRecomp/stdafx.h b/UnleashedRecomp/stdafx.h index b244781b..a4fc08f1 100644 --- a/UnleashedRecomp/stdafx.h +++ b/UnleashedRecomp/stdafx.h @@ -30,7 +30,6 @@ #include #include #include -#include using Microsoft::WRL::ComPtr; diff --git a/vcpkg.json b/vcpkg.json index 6cd72992..85e32c2d 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -20,6 +20,6 @@ "name": "imgui", "features": [ "sdl2-binding" ] }, - "conjure-enum" + "magic-enum" ] }