From 5adecbe837d27cf4e0a554ae13a0338743a8cb4b Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Sat, 29 Apr 2023 11:32:53 +0800 Subject: vkd3d and dxvk integration (#2823) * Add d3d sources for linux builds * Return NOT_IMPLEMENTED for shared handle support on Linux * Enable DirectX api on Linux * Do not report DX11 support without FXC * Initial version of SynchAPI emulation * Neaten dx library name handling * Neaten and use posix-synchapi * Add premake option for DirectX on Vulkan * s/SLANG_ENABLE_VKD3D_PROTON/SLANG_ENABLE_VKD3D * Skip failing tests on vkd3d * Regenerate vs projects * Silence unused var warning --- tools/gfx/d3d11/d3d11-device.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'tools/gfx/d3d11/d3d11-device.cpp') diff --git a/tools/gfx/d3d11/d3d11-device.cpp b/tools/gfx/d3d11/d3d11-device.cpp index 4ab26725e..c10a608dc 100644 --- a/tools/gfx/d3d11/d3d11-device.cpp +++ b/tools/gfx/d3d11/d3d11-device.cpp @@ -47,11 +47,7 @@ SlangResult DeviceImpl::initialize(const Desc& desc) // Rather than statically link against D3D, we load it dynamically. SharedLibrary::Handle d3dModule; -#if SLANG_ENABLE_DXVK - const char* libName = "dxvk_d3d11"; -#else - const char* libName = "d3d11"; -#endif + const char* libName = SLANG_ENABLE_DXVK ? "dxvk_d3d11" : "d3d11"; if (SLANG_FAILED(SharedLibrary::load(libName, d3dModule))) { fprintf(stderr, "error: failed to load '%s'\n", libName); -- cgit v1.2.3