From 5df7ada451a993efff2b80bb1af2d8c7579ba00b Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Sat, 29 Apr 2023 08:28:40 +0800 Subject: Minor tidyings around d3d usage (#2854) * Remove unused COM annotation * Move SLANG_ENABLE_DXBC_SUPPORT to slang.h * Add DX11 simple compute test * Remove unnecessary COM parameter annotation * Run compute smoke test for DX12 * Ignore d3d11 tests when we do not have fxc * Do not try to find NVAPI on Linux * Add some logs to .gitignore * Minor cleanups in d3d12 headers * Fix tautological comparison (due to integer overflow) * Limit OutputDebugStringA to Windows --- slang.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'slang.h') diff --git a/slang.h b/slang.h index 1fcad0d83..31a98481a 100644 --- a/slang.h +++ b/slang.h @@ -170,21 +170,21 @@ Any platforms not detected by the above logic are now now explicitly zeroed out. #if SLANG_WINDOWS_FAMILY # define SLANG_ENABLE_DIRECTX 1 # define SLANG_ENABLE_DXGI_DEBUG 1 -# define SLANG_ENABLE_FXC 1 +# define SLANG_ENABLE_DXBC_SUPPORT 1 # define SLANG_ENABLE_PIX 1 # define SLANG_ENABLE_DXVK 0 # define SLANG_ENABLE_VKD3D_PROTON 0 #elif SLANG_LINUX_FAMILY # define SLANG_ENABLE_DIRECTX 0 # define SLANG_ENABLE_DXGI_DEBUG 0 -# define SLANG_ENABLE_FXC 0 +# define SLANG_ENABLE_DXBC_SUPPORT 0 # define SLANG_ENABLE_PIX 0 # define SLANG_ENABLE_DXVK 1 # define SLANG_ENABLE_VKD3D_PROTON 1 #else # define SLANG_ENABLE_DIRECTX 0 # define SLANG_ENABLE_DXGI_DEBUG 0 -# define SLANG_ENABLE_FXC 0 +# define SLANG_ENABLE_DXBC_SUPPORT 0 # define SLANG_ENABLE_PIX 0 # define SLANG_ENABLE_DXVK 0 # define SLANG_ENABLE_VKD3D_PROTON 0 -- cgit v1.2.3