diff options
| author | Ellie Hermaszewska <ellieh@nvidia.com> | 2023-04-29 11:32:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-29 11:32:53 +0800 |
| commit | 5adecbe837d27cf4e0a554ae13a0338743a8cb4b (patch) | |
| tree | c1e791427a2b57165f950f5df264bbaca551ccaf /tools/gfx/d3d11 | |
| parent | 5df7ada451a993efff2b80bb1af2d8c7579ba00b (diff) | |
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
Diffstat (limited to 'tools/gfx/d3d11')
| -rw-r--r-- | tools/gfx/d3d11/d3d11-device.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
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); |