diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/compiler-core/slang-dxc-compiler.cpp | 8 | ||||
| -rw-r--r-- | source/compiler-core/slang-fxc-compiler.cpp | 6 | ||||
| -rw-r--r-- | source/compiler-core/windows/slang-win-visual-studio-util.cpp | 7 | ||||
| -rw-r--r-- | source/core/slang-io.cpp | 5 | ||||
| -rw-r--r-- | source/core/slang-platform.cpp | 6 | ||||
| -rw-r--r-- | source/core/slang-render-api-util.cpp | 49 | ||||
| -rw-r--r-- | source/core/slang-shared-library.cpp | 3 | ||||
| -rw-r--r-- | source/core/windows/slang-win-process.cpp | 7 | ||||
| -rw-r--r-- | source/slang-glslang/slang-glslang.cpp | 2 | ||||
| -rw-r--r-- | source/slang-rt/slang-rt.cpp | 2 |
10 files changed, 28 insertions, 67 deletions
diff --git a/source/compiler-core/slang-dxc-compiler.cpp b/source/compiler-core/slang-dxc-compiler.cpp index a275143f8..832c5809c 100644 --- a/source/compiler-core/slang-dxc-compiler.cpp +++ b/source/compiler-core/slang-dxc-compiler.cpp @@ -34,13 +34,9 @@ #if SLANG_ENABLE_DXIL_SUPPORT # ifdef _WIN32 -# define WIN32_LEAN_AND_MEAN -# define NOMINMAX -# include <Windows.h> -# include <Unknwn.h> +# include <windows.h> +# include <unknwn.h> # include "../../external/dxc/dxcapi.h" -# undef WIN32_LEAN_AND_MEAN -# undef NOMINMAX # else # include "../../external/dxc/dxcapi.h" diff --git a/source/compiler-core/slang-fxc-compiler.cpp b/source/compiler-core/slang-fxc-compiler.cpp index de6f5d2bc..9d547e673 100644 --- a/source/compiler-core/slang-fxc-compiler.cpp +++ b/source/compiler-core/slang-fxc-compiler.cpp @@ -26,11 +26,7 @@ // Enable calling through to `fxc` or `dxc` to // generate code on Windows. #ifdef _WIN32 -# define WIN32_LEAN_AND_MEAN -# define NOMINMAX -# include <Windows.h> -# undef WIN32_LEAN_AND_MEAN -# undef NOMINMAX +# include <windows.h> # include <d3dcompiler.h> # ifndef SLANG_ENABLE_DXBC_SUPPORT diff --git a/source/compiler-core/windows/slang-win-visual-studio-util.cpp b/source/compiler-core/windows/slang-win-visual-studio-util.cpp index d4c72e100..cb784b426 100644 --- a/source/compiler-core/windows/slang-win-visual-studio-util.cpp +++ b/source/compiler-core/windows/slang-win-visual-studio-util.cpp @@ -10,12 +10,7 @@ #include "../slang-visual-studio-compiler-util.h" #ifdef _WIN32 -# define WIN32_LEAN_AND_MEAN -# define NOMINMAX -# include <Windows.h> -# undef WIN32_LEAN_AND_MEAN -# undef NOMINMAX - +# include <windows.h> # include <Shlobj.h> #pragma comment(lib, "advapi32") #pragma comment(lib, "Shell32") diff --git a/source/core/slang-io.cpp b/source/core/slang-io.cpp index 5c57a4b3a..30ba41d0f 100644 --- a/source/core/slang-io.cpp +++ b/source/core/slang-io.cpp @@ -16,10 +16,7 @@ #ifdef _WIN32 # include <direct.h> - -# define WIN32_LEAN_AND_MEAN -# define VC_EXTRALEAN -# include <Windows.h> +# include <windows.h> #endif #if defined(__linux__) || defined(__CYGWIN__) || SLANG_APPLE_FAMILY diff --git a/source/core/slang-platform.cpp b/source/core/slang-platform.cpp index bb612932c..4f9b0698c 100644 --- a/source/core/slang-platform.cpp +++ b/source/core/slang-platform.cpp @@ -8,11 +8,7 @@ #include "slang-io.h" #ifdef _WIN32 - #define WIN32_LEAN_AND_MEAN - #define NOMINMAX - #include <Windows.h> - #undef WIN32_LEAN_AND_MEAN - #undef NOMINMAX + #include <windows.h> #else #include "slang-string.h" #include <dlfcn.h> diff --git a/source/core/slang-render-api-util.cpp b/source/core/slang-render-api-util.cpp index bc15a8164..fa39f46ee 100644 --- a/source/core/slang-render-api-util.cpp +++ b/source/core/slang-render-api-util.cpp @@ -261,41 +261,28 @@ static bool _canLoadSharedLibrary(const char* libName) /* static */bool RenderApiUtil::calcHasApi(RenderApiType type) { -#if SLANG_WINDOWS_FAMILY switch (type) { - case RenderApiType::OpenGl: return _canLoadSharedLibrary("opengl32"); - case RenderApiType::Vulkan: return _canLoadSharedLibrary("vulkan-1") || _canLoadSharedLibrary("vk_swiftshader"); - case RenderApiType::D3D11: return _canLoadSharedLibrary("d3d11"); - case RenderApiType::D3D12: return _canLoadSharedLibrary("d3d12"); - case RenderApiType::CPU: return true; - case RenderApiType::CUDA: - { - // We'll assume it's available, and if not trying to create it will detect it - return true; - } - default: break; - } +#if SLANG_WINDOWS_FAMILY + case RenderApiType::OpenGl: return _canLoadSharedLibrary("opengl32"); + case RenderApiType::Vulkan: return _canLoadSharedLibrary("vulkan-1") || _canLoadSharedLibrary("vk_swiftshader"); + case RenderApiType::D3D11: return _canLoadSharedLibrary("d3d11"); + case RenderApiType::D3D12: return _canLoadSharedLibrary("d3d12"); #elif SLANG_UNIX_FAMILY - // Assume on unix target we never have D3D - switch (type) - { - case RenderApiType::OpenGl: - case RenderApiType::Vulkan: - { - return true; - } - case RenderApiType::CPU: - { - return true; - } - case RenderApiType::CUDA: - { - return true; - } - default: break; - } + case RenderApiType::D3D11: return false; + case RenderApiType::D3D12: return false; + // The below can be used once they're confirmed working with gfx + // case RenderApiType::D3D11: return _canLoadSharedLibrary("dxvk_d3d11"); + // case RenderApiType::D3D12: return _canLoadSharedLibrary("vkd3d-proton-d3d12"); + + case RenderApiType::OpenGl: return true; + case RenderApiType::Vulkan: return true; #endif + case RenderApiType::CPU: return true; + // We'll assume CUDA is available, and if not, trying to create it will detect it + case RenderApiType::CUDA: return true; + default: break; + } return false; } diff --git a/source/core/slang-shared-library.cpp b/source/core/slang-shared-library.cpp index e0fe82012..c3991ad06 100644 --- a/source/core/slang-shared-library.cpp +++ b/source/core/slang-shared-library.cpp @@ -6,8 +6,7 @@ #include "slang-string-util.h" #if defined(_WIN32) -#define WIN32_LEAN_AND_MEAN -#include <Windows.h> +#include <windows.h> #elif defined(__linux__) || defined(SLANG_OSX) #include <dlfcn.h> #endif diff --git a/source/core/windows/slang-win-process.cpp b/source/core/windows/slang-win-process.cpp index 215904938..93bff3eb3 100644 --- a/source/core/windows/slang-win-process.cpp +++ b/source/core/windows/slang-win-process.cpp @@ -9,15 +9,10 @@ #include "../../../slang-com-helper.h" #ifdef _WIN32 -// Include Windows header in a way that minimized namespace pollution. // TODO: We could try to avoid including this at all, but it would // mean trying to hide certain struct layouts, which would add // more dynamic allocation. -# define WIN32_LEAN_AND_MEAN -# define NOMINMAX -# include <Windows.h> -# undef WIN32_LEAN_AND_MEAN -# undef NOMINMAX +# include <windows.h> #endif #include <stdio.h> diff --git a/source/slang-glslang/slang-glslang.cpp b/source/slang-glslang/slang-glslang.cpp index 6b5ed03f0..489294d99 100644 --- a/source/slang-glslang/slang-glslang.cpp +++ b/source/slang-glslang/slang-glslang.cpp @@ -19,7 +19,7 @@ #include "spirv-tools/libspirv.h" #ifdef _WIN32 -# include <Windows.h> +# include <windows.h> #endif #include <memory> diff --git a/source/slang-rt/slang-rt.cpp b/source/slang-rt/slang-rt.cpp index 49d4f2c9a..75997aeaa 100644 --- a/source/slang-rt/slang-rt.cpp +++ b/source/slang-rt/slang-rt.cpp @@ -3,7 +3,7 @@ #include "../core/slang-shared-library.h" #if SLANG_WINDOWS_FAMILY -# include <Windows.h> +# include <windows.h> #endif using namespace Slang; |