From 9d4e044bad6161a593806fc6fb610d41aa8b4b22 Mon Sep 17 00:00:00 2001 From: Yong He Date: Tue, 29 Aug 2023 05:55:49 -0700 Subject: Add more wave intrinsics. (#3162) Co-authored-by: Yong He --- .../autodiff-texture/autodiff-texture.vcxproj | 12 +- .../compiler-core/compiler-core.vcxproj | 12 +- build/visual-studio/core/core.vcxproj | 12 +- .../cpu-com-example/cpu-com-example.vcxproj | 12 +- .../cpu-hello-world/cpu-hello-world.vcxproj | 12 +- .../example-base/example-base.vcxproj | 12 +- .../generate-lookup-tables.vcxproj.filters | 6 - .../gfx-unit-test-tool/gfx-unit-test-tool.vcxproj | 12 +- build/visual-studio/gfx-util/gfx-util.vcxproj | 12 +- build/visual-studio/gfx/gfx.vcxproj | 12 +- .../gpu-printing/gpu-printing.vcxproj | 12 +- .../visual-studio/hello-world/hello-world.vcxproj | 12 +- build/visual-studio/lz4/lz4.vcxproj | 12 +- build/visual-studio/miniz/miniz.vcxproj | 12 +- .../model-viewer/model-viewer.vcxproj | 12 +- build/visual-studio/platform/platform.vcxproj | 12 +- .../ray-tracing-pipeline.vcxproj | 12 +- .../visual-studio/ray-tracing/ray-tracing.vcxproj | 12 +- .../render-test-tool/render-test-tool.vcxproj | 12 +- .../shader-object/shader-object.vcxproj | 12 +- build/visual-studio/shader-toy/shader-toy.vcxproj | 12 +- .../slang-cpp-extractor.vcxproj | 12 +- .../visual-studio/slang-embed/slang-embed.vcxproj | 12 +- .../slang-generate/slang-generate.vcxproj | 12 +- .../slang-lookup-generator.vcxproj | 12 +- .../slang-reflection-test-tool.vcxproj | 12 +- build/visual-studio/slang-rt/slang-rt.vcxproj | 12 +- .../slang-spirv-embed-generator.vcxproj | 12 +- build/visual-studio/slang-test/slang-test.vcxproj | 12 +- .../slang-unit-test-tool.vcxproj | 12 +- build/visual-studio/slang/slang.vcxproj | 12 +- build/visual-studio/slangc/slangc.vcxproj | 12 +- build/visual-studio/slangd/slangd.vcxproj | 12 +- .../test-process/test-process.vcxproj | 12 +- .../visual-studio/test-server/test-server.vcxproj | 12 +- build/visual-studio/triangle/triangle.vcxproj | 12 +- premake5.lua | 4 +- source/slang/hlsl.meta.slang | 382 +++++++++++++++++---- source/slang/slang-ir-inline.cpp | 52 +-- 39 files changed, 551 insertions(+), 313 deletions(-) diff --git a/build/visual-studio/autodiff-texture/autodiff-texture.vcxproj b/build/visual-studio/autodiff-texture/autodiff-texture.vcxproj index 0444b7329..b9b872836 100644 --- a/build/visual-studio/autodiff-texture/autodiff-texture.vcxproj +++ b/build/visual-studio/autodiff-texture/autodiff-texture.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -181,7 +181,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -199,7 +199,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -217,7 +217,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -238,7 +238,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -259,7 +259,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/compiler-core/compiler-core.vcxproj b/build/visual-studio/compiler-core/compiler-core.vcxproj index cb33440f4..e5b9c5fdb 100644 --- a/build/visual-studio/compiler-core/compiler-core.vcxproj +++ b/build/visual-studio/compiler-core/compiler-core.vcxproj @@ -157,7 +157,7 @@ NotUsing Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -174,7 +174,7 @@ NotUsing Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -191,7 +191,7 @@ NotUsing Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -208,7 +208,7 @@ NotUsing Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true @@ -228,7 +228,7 @@ NotUsing Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true @@ -248,7 +248,7 @@ NotUsing Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true diff --git a/build/visual-studio/core/core.vcxproj b/build/visual-studio/core/core.vcxproj index 80a791a13..1f8d95a6f 100644 --- a/build/visual-studio/core/core.vcxproj +++ b/build/visual-studio/core/core.vcxproj @@ -157,7 +157,7 @@ NotUsing Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -174,7 +174,7 @@ NotUsing Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -191,7 +191,7 @@ NotUsing Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -208,7 +208,7 @@ NotUsing Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true @@ -228,7 +228,7 @@ NotUsing Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true @@ -248,7 +248,7 @@ NotUsing Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true diff --git a/build/visual-studio/cpu-com-example/cpu-com-example.vcxproj b/build/visual-studio/cpu-com-example/cpu-com-example.vcxproj index 39eb8068f..1fe629804 100644 --- a/build/visual-studio/cpu-com-example/cpu-com-example.vcxproj +++ b/build/visual-studio/cpu-com-example/cpu-com-example.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -181,7 +181,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -199,7 +199,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -217,7 +217,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -238,7 +238,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -259,7 +259,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj b/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj index c6582cb1f..ddd9e5753 100644 --- a/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj +++ b/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -181,7 +181,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -199,7 +199,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -217,7 +217,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -238,7 +238,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -259,7 +259,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/example-base/example-base.vcxproj b/build/visual-studio/example-base/example-base.vcxproj index 6a7da112a..457922272 100644 --- a/build/visual-studio/example-base/example-base.vcxproj +++ b/build/visual-studio/example-base/example-base.vcxproj @@ -157,7 +157,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -175,7 +175,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -193,7 +193,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -211,7 +211,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -232,7 +232,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -253,7 +253,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/generate-lookup-tables/generate-lookup-tables.vcxproj.filters b/build/visual-studio/generate-lookup-tables/generate-lookup-tables.vcxproj.filters index 8936bc45b..148a8684a 100644 --- a/build/visual-studio/generate-lookup-tables/generate-lookup-tables.vcxproj.filters +++ b/build/visual-studio/generate-lookup-tables/generate-lookup-tables.vcxproj.filters @@ -21,11 +21,5 @@ spirv-headers\include\spirv\unified1 - - spirv-headers\include\spirv\unified1 - - - spirv - \ No newline at end of file diff --git a/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj b/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj index b3aea8f94..5cd61e7fe 100644 --- a/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj +++ b/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -182,7 +182,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -201,7 +201,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -220,7 +220,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true @@ -242,7 +242,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true @@ -264,7 +264,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/gfx-util/gfx-util.vcxproj b/build/visual-studio/gfx-util/gfx-util.vcxproj index 953e93b54..386642e9a 100644 --- a/build/visual-studio/gfx-util/gfx-util.vcxproj +++ b/build/visual-studio/gfx-util/gfx-util.vcxproj @@ -157,7 +157,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\source;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -175,7 +175,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\source;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -193,7 +193,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\source;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -211,7 +211,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\source;%(AdditionalIncludeDirectories) Full true @@ -232,7 +232,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\source;%(AdditionalIncludeDirectories) Full true @@ -253,7 +253,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\source;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/gfx/gfx.vcxproj b/build/visual-studio/gfx/gfx.vcxproj index 3198cd6e1..fbdad5efd 100644 --- a/build/visual-studio/gfx/gfx.vcxproj +++ b/build/visual-studio/gfx/gfx.vcxproj @@ -164,7 +164,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_GFX_DYNAMIC;SLANG_GFX_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_GFX_DYNAMIC;SLANG_GFX_DYNAMIC_EXPORT;%(PreprocessorDefinitions) ..\..\..;..\..\..\external;..\..\..\source;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -188,7 +188,7 @@ IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDi NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_GFX_DYNAMIC;SLANG_GFX_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_GFX_DYNAMIC;SLANG_GFX_DYNAMIC_EXPORT;%(PreprocessorDefinitions) ..\..\..;..\..\..\external;..\..\..\source;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -212,7 +212,7 @@ IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDi NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_GFX_DYNAMIC;SLANG_GFX_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_GFX_DYNAMIC;SLANG_GFX_DYNAMIC_EXPORT;%(PreprocessorDefinitions) ..\..\..;..\..\..\external;..\..\..\source;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -236,7 +236,7 @@ IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDi NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_GFX_DYNAMIC;SLANG_GFX_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_GFX_DYNAMIC;SLANG_GFX_DYNAMIC_EXPORT;%(PreprocessorDefinitions) ..\..\..;..\..\..\external;..\..\..\source;%(AdditionalIncludeDirectories) Full true @@ -263,7 +263,7 @@ IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDi NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_GFX_DYNAMIC;SLANG_GFX_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_GFX_DYNAMIC;SLANG_GFX_DYNAMIC_EXPORT;%(PreprocessorDefinitions) ..\..\..;..\..\..\external;..\..\..\source;%(AdditionalIncludeDirectories) Full true @@ -290,7 +290,7 @@ IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDi NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_GFX_DYNAMIC;SLANG_GFX_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_GFX_DYNAMIC;SLANG_GFX_DYNAMIC_EXPORT;%(PreprocessorDefinitions) ..\..\..;..\..\..\external;..\..\..\source;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/gpu-printing/gpu-printing.vcxproj b/build/visual-studio/gpu-printing/gpu-printing.vcxproj index e2299e882..de098edc5 100644 --- a/build/visual-studio/gpu-printing/gpu-printing.vcxproj +++ b/build/visual-studio/gpu-printing/gpu-printing.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -181,7 +181,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -199,7 +199,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -217,7 +217,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -238,7 +238,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -259,7 +259,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/hello-world/hello-world.vcxproj b/build/visual-studio/hello-world/hello-world.vcxproj index 4d0626fca..6140b7c64 100644 --- a/build/visual-studio/hello-world/hello-world.vcxproj +++ b/build/visual-studio/hello-world/hello-world.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;..\..\..\external\vulkan\include;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -181,7 +181,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;..\..\..\external\vulkan\include;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -199,7 +199,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;..\..\..\external\vulkan\include;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -217,7 +217,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;..\..\..\external\vulkan\include;%(AdditionalIncludeDirectories) Full true @@ -238,7 +238,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;..\..\..\external\vulkan\include;%(AdditionalIncludeDirectories) Full true @@ -259,7 +259,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;..\..\..\external\vulkan\include;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/lz4/lz4.vcxproj b/build/visual-studio/lz4/lz4.vcxproj index d053fc170..c538adb91 100644 --- a/build/visual-studio/lz4/lz4.vcxproj +++ b/build/visual-studio/lz4/lz4.vcxproj @@ -157,7 +157,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -174,7 +174,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -191,7 +191,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -208,7 +208,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true @@ -228,7 +228,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true @@ -248,7 +248,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true diff --git a/build/visual-studio/miniz/miniz.vcxproj b/build/visual-studio/miniz/miniz.vcxproj index de11c3a71..15eb91f8f 100644 --- a/build/visual-studio/miniz/miniz.vcxproj +++ b/build/visual-studio/miniz/miniz.vcxproj @@ -157,7 +157,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -174,7 +174,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -191,7 +191,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -208,7 +208,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true @@ -228,7 +228,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true @@ -248,7 +248,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true diff --git a/build/visual-studio/model-viewer/model-viewer.vcxproj b/build/visual-studio/model-viewer/model-viewer.vcxproj index 9596446a0..52c752282 100644 --- a/build/visual-studio/model-viewer/model-viewer.vcxproj +++ b/build/visual-studio/model-viewer/model-viewer.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -181,7 +181,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -199,7 +199,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -217,7 +217,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -238,7 +238,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -259,7 +259,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/platform/platform.vcxproj b/build/visual-studio/platform/platform.vcxproj index 091ed0745..e4dbafb12 100644 --- a/build/visual-studio/platform/platform.vcxproj +++ b/build/visual-studio/platform/platform.vcxproj @@ -164,7 +164,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_PLATFORM_DYNAMIC;SLANG_PLATFORM_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_PLATFORM_DYNAMIC;SLANG_PLATFORM_DYNAMIC_EXPORT;%(PreprocessorDefinitions) ..\..\..;..\..\..\external;..\..\..\source;..\..\..\external\imgui;..\..\..\tools\gfx;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -183,7 +183,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_PLATFORM_DYNAMIC;SLANG_PLATFORM_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_PLATFORM_DYNAMIC;SLANG_PLATFORM_DYNAMIC_EXPORT;%(PreprocessorDefinitions) ..\..\..;..\..\..\external;..\..\..\source;..\..\..\external\imgui;..\..\..\tools\gfx;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -202,7 +202,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_PLATFORM_DYNAMIC;SLANG_PLATFORM_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_PLATFORM_DYNAMIC;SLANG_PLATFORM_DYNAMIC_EXPORT;%(PreprocessorDefinitions) ..\..\..;..\..\..\external;..\..\..\source;..\..\..\external\imgui;..\..\..\tools\gfx;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -221,7 +221,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_PLATFORM_DYNAMIC;SLANG_PLATFORM_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_PLATFORM_DYNAMIC;SLANG_PLATFORM_DYNAMIC_EXPORT;%(PreprocessorDefinitions) ..\..\..;..\..\..\external;..\..\..\source;..\..\..\external\imgui;..\..\..\tools\gfx;%(AdditionalIncludeDirectories) Full true @@ -243,7 +243,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_PLATFORM_DYNAMIC;SLANG_PLATFORM_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_PLATFORM_DYNAMIC;SLANG_PLATFORM_DYNAMIC_EXPORT;%(PreprocessorDefinitions) ..\..\..;..\..\..\external;..\..\..\source;..\..\..\external\imgui;..\..\..\tools\gfx;%(AdditionalIncludeDirectories) Full true @@ -265,7 +265,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_PLATFORM_DYNAMIC;SLANG_PLATFORM_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_PLATFORM_DYNAMIC;SLANG_PLATFORM_DYNAMIC_EXPORT;%(PreprocessorDefinitions) ..\..\..;..\..\..\external;..\..\..\source;..\..\..\external\imgui;..\..\..\tools\gfx;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/ray-tracing-pipeline/ray-tracing-pipeline.vcxproj b/build/visual-studio/ray-tracing-pipeline/ray-tracing-pipeline.vcxproj index 7ecd1a562..13ef20ac8 100644 --- a/build/visual-studio/ray-tracing-pipeline/ray-tracing-pipeline.vcxproj +++ b/build/visual-studio/ray-tracing-pipeline/ray-tracing-pipeline.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -181,7 +181,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -199,7 +199,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -217,7 +217,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -238,7 +238,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -259,7 +259,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/ray-tracing/ray-tracing.vcxproj b/build/visual-studio/ray-tracing/ray-tracing.vcxproj index cbaf2fa04..819d112c0 100644 --- a/build/visual-studio/ray-tracing/ray-tracing.vcxproj +++ b/build/visual-studio/ray-tracing/ray-tracing.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -181,7 +181,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -199,7 +199,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -217,7 +217,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -238,7 +238,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -259,7 +259,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/render-test-tool/render-test-tool.vcxproj b/build/visual-studio/render-test-tool/render-test-tool.vcxproj index 89a5222f8..9c9578728 100644 --- a/build/visual-studio/render-test-tool/render-test-tool.vcxproj +++ b/build/visual-studio/render-test-tool/render-test-tool.vcxproj @@ -164,7 +164,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;..\..\..\external;..\..\..\source;..\..\..\tools\gfx;..\..\..\tools\platform;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -186,7 +186,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;..\..\..\external;..\..\..\source;..\..\..\tools\gfx;..\..\..\tools\platform;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -208,7 +208,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;..\..\..\external;..\..\..\source;..\..\..\tools\gfx;..\..\..\tools\platform;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -230,7 +230,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;..\..\..\external;..\..\..\source;..\..\..\tools\gfx;..\..\..\tools\platform;%(AdditionalIncludeDirectories) Full true @@ -255,7 +255,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;..\..\..\external;..\..\..\source;..\..\..\tools\gfx;..\..\..\tools\platform;%(AdditionalIncludeDirectories) Full true @@ -280,7 +280,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;..\..\..\external;..\..\..\source;..\..\..\tools\gfx;..\..\..\tools\platform;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/shader-object/shader-object.vcxproj b/build/visual-studio/shader-object/shader-object.vcxproj index 187a5ecb6..71fcd8638 100644 --- a/build/visual-studio/shader-object/shader-object.vcxproj +++ b/build/visual-studio/shader-object/shader-object.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -181,7 +181,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -199,7 +199,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -217,7 +217,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -238,7 +238,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -259,7 +259,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/shader-toy/shader-toy.vcxproj b/build/visual-studio/shader-toy/shader-toy.vcxproj index 5662cfea8..aae117044 100644 --- a/build/visual-studio/shader-toy/shader-toy.vcxproj +++ b/build/visual-studio/shader-toy/shader-toy.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -181,7 +181,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -199,7 +199,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -217,7 +217,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -238,7 +238,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -259,7 +259,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj b/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj index 3ff1e702b..4b0103739 100644 --- a/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj +++ b/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -181,7 +181,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -199,7 +199,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -217,7 +217,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true @@ -238,7 +238,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true @@ -259,7 +259,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/slang-embed/slang-embed.vcxproj b/build/visual-studio/slang-embed/slang-embed.vcxproj index d0625a9d3..3959e28ea 100644 --- a/build/visual-studio/slang-embed/slang-embed.vcxproj +++ b/build/visual-studio/slang-embed/slang-embed.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -180,7 +180,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -197,7 +197,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -214,7 +214,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true @@ -234,7 +234,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true @@ -254,7 +254,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true diff --git a/build/visual-studio/slang-generate/slang-generate.vcxproj b/build/visual-studio/slang-generate/slang-generate.vcxproj index 098e75bee..8aa0c8efa 100644 --- a/build/visual-studio/slang-generate/slang-generate.vcxproj +++ b/build/visual-studio/slang-generate/slang-generate.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -180,7 +180,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -197,7 +197,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -214,7 +214,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true @@ -234,7 +234,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true @@ -254,7 +254,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true diff --git a/build/visual-studio/slang-lookup-generator/slang-lookup-generator.vcxproj b/build/visual-studio/slang-lookup-generator/slang-lookup-generator.vcxproj index 6c8562f80..3f83e727c 100644 --- a/build/visual-studio/slang-lookup-generator/slang-lookup-generator.vcxproj +++ b/build/visual-studio/slang-lookup-generator/slang-lookup-generator.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -181,7 +181,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -199,7 +199,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -217,7 +217,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true @@ -238,7 +238,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true @@ -259,7 +259,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj b/build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj index 6ca0aa3bc..a9bcfc6a3 100644 --- a/build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj +++ b/build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -182,7 +182,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -201,7 +201,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -220,7 +220,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true @@ -242,7 +242,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true @@ -264,7 +264,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/slang-rt/slang-rt.vcxproj b/build/visual-studio/slang-rt/slang-rt.vcxproj index bd972fd6b..35e3ea987 100644 --- a/build/visual-studio/slang-rt/slang-rt.vcxproj +++ b/build/visual-studio/slang-rt/slang-rt.vcxproj @@ -163,7 +163,7 @@ NotUsing Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -181,7 +181,7 @@ NotUsing Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -199,7 +199,7 @@ NotUsing Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -217,7 +217,7 @@ NotUsing Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) Full true true @@ -238,7 +238,7 @@ NotUsing Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) Full true true @@ -259,7 +259,7 @@ NotUsing Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) Full true true diff --git a/build/visual-studio/slang-spirv-embed-generator/slang-spirv-embed-generator.vcxproj b/build/visual-studio/slang-spirv-embed-generator/slang-spirv-embed-generator.vcxproj index 7c2caf64b..9cdeec875 100644 --- a/build/visual-studio/slang-spirv-embed-generator/slang-spirv-embed-generator.vcxproj +++ b/build/visual-studio/slang-spirv-embed-generator/slang-spirv-embed-generator.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -181,7 +181,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -199,7 +199,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -217,7 +217,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true @@ -238,7 +238,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true @@ -259,7 +259,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/slang-test/slang-test.vcxproj b/build/visual-studio/slang-test/slang-test.vcxproj index bd70c6520..496b1b313 100644 --- a/build/visual-studio/slang-test/slang-test.vcxproj +++ b/build/visual-studio/slang-test/slang-test.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -181,7 +181,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -199,7 +199,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -217,7 +217,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true @@ -238,7 +238,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true @@ -259,7 +259,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj b/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj index 53de1e027..e1a07455e 100644 --- a/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj +++ b/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -182,7 +182,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -201,7 +201,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -220,7 +220,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true @@ -242,7 +242,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true @@ -264,7 +264,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/slang/slang.vcxproj b/build/visual-studio/slang/slang.vcxproj index 71ac3fd5f..a7359e001 100644 --- a/build/visual-studio/slang/slang.vcxproj +++ b/build/visual-studio/slang/slang.vcxproj @@ -163,7 +163,7 @@ NotUsing Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_DYNAMIC_EXPORT;SLANG_WITHOUT_EMBEDDED_STD_LIB;SLANG_ENABLE_IR_BREAK_ALLOC=1;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_DYNAMIC_EXPORT;SLANG_WITHOUT_EMBEDDED_STD_LIB;SLANG_ENABLE_IR_BREAK_ALLOC=1;%(PreprocessorDefinitions) ..\..\..\external\spirv-headers\include;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -186,7 +186,7 @@ IF EXIST ..\..\..\external\slang-glslang\bin\windows-x86\release\slang-glslang.d NotUsing Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_DYNAMIC_EXPORT;SLANG_WITHOUT_EMBEDDED_STD_LIB;SLANG_ENABLE_IR_BREAK_ALLOC=1;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_DYNAMIC_EXPORT;SLANG_WITHOUT_EMBEDDED_STD_LIB;SLANG_ENABLE_IR_BREAK_ALLOC=1;%(PreprocessorDefinitions) ..\..\..\external\spirv-headers\include;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -209,7 +209,7 @@ IF EXIST ..\..\..\external\slang-glslang\bin\windows-x64\release\slang-glslang.d NotUsing Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_DYNAMIC_EXPORT;SLANG_WITHOUT_EMBEDDED_STD_LIB;SLANG_ENABLE_IR_BREAK_ALLOC=1;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_DYNAMIC_EXPORT;SLANG_WITHOUT_EMBEDDED_STD_LIB;SLANG_ENABLE_IR_BREAK_ALLOC=1;%(PreprocessorDefinitions) ..\..\..\external\spirv-headers\include;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -232,7 +232,7 @@ IF EXIST ..\..\..\external\slang-glslang\bin\windows-aarch64\release\slang-glsla NotUsing Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_DYNAMIC_EXPORT;SLANG_WITHOUT_EMBEDDED_STD_LIB;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_DYNAMIC_EXPORT;SLANG_WITHOUT_EMBEDDED_STD_LIB;%(PreprocessorDefinitions) ..\..\..\external\spirv-headers\include;%(AdditionalIncludeDirectories) Full true @@ -258,7 +258,7 @@ IF EXIST ..\..\..\external\slang-glslang\bin\windows-x86\release\slang-glslang.d NotUsing Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_DYNAMIC_EXPORT;SLANG_WITHOUT_EMBEDDED_STD_LIB;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_DYNAMIC_EXPORT;SLANG_WITHOUT_EMBEDDED_STD_LIB;%(PreprocessorDefinitions) ..\..\..\external\spirv-headers\include;%(AdditionalIncludeDirectories) Full true @@ -284,7 +284,7 @@ IF EXIST ..\..\..\external\slang-glslang\bin\windows-x64\release\slang-glslang.d NotUsing Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;SLANG_DYNAMIC_EXPORT;SLANG_WITHOUT_EMBEDDED_STD_LIB;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_DYNAMIC_EXPORT;SLANG_WITHOUT_EMBEDDED_STD_LIB;%(PreprocessorDefinitions) ..\..\..\external\spirv-headers\include;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/slangc/slangc.vcxproj b/build/visual-studio/slangc/slangc.vcxproj index d2dda42b7..e8de3b89d 100644 --- a/build/visual-studio/slangc/slangc.vcxproj +++ b/build/visual-studio/slangc/slangc.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -180,7 +180,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -197,7 +197,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ProgramDatabase Disabled false @@ -214,7 +214,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true @@ -234,7 +234,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true @@ -254,7 +254,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) Full true true diff --git a/build/visual-studio/slangd/slangd.vcxproj b/build/visual-studio/slangd/slangd.vcxproj index ea4084447..346e2bca3 100644 --- a/build/visual-studio/slangd/slangd.vcxproj +++ b/build/visual-studio/slangd/slangd.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -181,7 +181,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -199,7 +199,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -217,7 +217,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true @@ -238,7 +238,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true @@ -259,7 +259,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/test-process/test-process.vcxproj b/build/visual-studio/test-process/test-process.vcxproj index 67c36f856..d0819084a 100644 --- a/build/visual-studio/test-process/test-process.vcxproj +++ b/build/visual-studio/test-process/test-process.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -181,7 +181,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -199,7 +199,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -217,7 +217,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true @@ -238,7 +238,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true @@ -259,7 +259,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/test-server/test-server.vcxproj b/build/visual-studio/test-server/test-server.vcxproj index 85af689d9..6c074638c 100644 --- a/build/visual-studio/test-server/test-server.vcxproj +++ b/build/visual-studio/test-server/test-server.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -181,7 +181,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -199,7 +199,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -217,7 +217,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true @@ -238,7 +238,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true @@ -259,7 +259,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;%(AdditionalIncludeDirectories) Full true diff --git a/build/visual-studio/triangle/triangle.vcxproj b/build/visual-studio/triangle/triangle.vcxproj index 57f76d032..8406539df 100644 --- a/build/visual-studio/triangle/triangle.vcxproj +++ b/build/visual-studio/triangle/triangle.vcxproj @@ -163,7 +163,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -181,7 +181,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -199,7 +199,7 @@ NotUsing Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -217,7 +217,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -238,7 +238,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true @@ -259,7 +259,7 @@ NotUsing Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;%(PreprocessorDefinitions) + NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) Full true diff --git a/premake5.lua b/premake5.lua index e7b3774e2..60cd9caf4 100644 --- a/premake5.lua +++ b/premake5.lua @@ -442,7 +442,7 @@ workspace "slang" -- For including windows.h in a way that minimized namespace pollution. -- Although we define these here, we still set them manually in any header -- files which may be included by another project - defines { "WIN32_LEAN_AND_MEAN", "VC_EXTRALEAN", "NOMINMAX" } + defines { "WIN32_LEAN_AND_MEAN", "VC_EXTRALEAN", "NOMINMAX", "_ITERATOR_DEBUG_LEVEL=0" } if dxOnVk then defines { "SLANG_CONFIG_DX_ON_VK" } @@ -1582,7 +1582,7 @@ standardProject("slang", "source/slang") links { "core", "compiler-core", "miniz", "lz4"} warnings "Extra" pic "On" - + -- The way that we currently configure things through `slang.h`, -- we need to set a preprocessor definitions to ensure that -- we declare the Slang API functions for *export* and not *import*. diff --git a/source/slang/hlsl.meta.slang b/source/slang/hlsl.meta.slang index 1255e43e0..3c966bb4a 100644 --- a/source/slang/hlsl.meta.slang +++ b/source/slang/hlsl.meta.slang @@ -4936,6 +4936,7 @@ __generic __glsl_extension(GL_KHR_shader_subgroup_vote) __spirv_version(1.3) __cuda_sm_version(7.0) +__spirv_capability(GroupNonUniformVote) bool WaveMaskAllEqual(WaveMask mask, vector value) { __target_switch @@ -4967,17 +4968,59 @@ bool WaveMaskAllEqual(WaveMask mask, matrix value); __generic __glsl_extension(GL_KHR_shader_subgroup_arithmetic) __spirv_version(1.3) -__target_intrinsic(glsl, "subgroupExclusiveMul($1)") -__target_intrinsic(cuda, "_wavePrefixProduct($0, $1)") -__target_intrinsic(hlsl, "WavePrefixProduct($1)") -T WaveMaskPrefixProduct(WaveMask mask, T expr); +__spirv_capability(GroupNonUniformArithmetic) +T WaveMaskPrefixProduct(WaveMask mask, T expr) +{ + __target_switch + { + case glsl: __intrinsic_asm "subgroupExclusiveMul($1)"; + case cuda: __intrinsic_asm "_wavePrefixProduct($0, $1)"; + case hlsl: __intrinsic_asm "WavePrefixProduct($1)"; + case spirv: + if (__isFloat()) + return spirv_asm {OpGroupNonUniformFMul $$T result Subgroup ExclusiveScan $expr}; + else if (__isSignedInt()) + { + return spirv_asm + { + // TODO: use the correct integer width + OpBitcast $$uint %uvalue $expr; + OpGroupNonUniformIMul $$uint %mulResult Subgroup ExclusiveScan %uvalue; + OpBitcast $$T result %mulResult + }; + } + else if (__isUnsignedInt()) + return spirv_asm {OpGroupNonUniformIMul $$T result Subgroup ExclusiveScan $expr}; + } +} __generic __glsl_extension(GL_KHR_shader_subgroup_arithmetic) __spirv_version(1.3) -__target_intrinsic(glsl, "subgroupExclusiveMul($1)") -__target_intrinsic(cuda, "_wavePrefixProductMultiple($0, $1)") -__target_intrinsic(hlsl, "WavePrefixProduct($1)") -vector WaveMaskPrefixProduct(WaveMask mask, vector expr); +__spirv_capability(GroupNonUniformArithmetic) +vector WaveMaskPrefixProduct(WaveMask mask, vector expr) +{ + __target_switch + { + case glsl: __intrinsic_asm "subgroupExclusiveMul($1)"; + case cuda: __intrinsic_asm "_wavePrefixProductMultiple($0, $1)"; + case hlsl: __intrinsic_asm "WavePrefixProduct($1)"; + case spirv: + if (__isFloat()) + return spirv_asm {OpGroupNonUniformFMul $$vector result Subgroup ExclusiveScan $expr}; + else if (__isSignedInt()) + { + return spirv_asm + { + // TODO: use the correct integer width + OpBitcast $$uint %uvalue $expr; + OpGroupNonUniformIMul $$vector %mulResult Subgroup ExclusiveScan %uvalue; + OpBitcast $$T result %mulResult + }; + } + else if (__isUnsignedInt()) + return spirv_asm {OpGroupNonUniformIMul $$vector result Subgroup ExclusiveScan $expr}; + } +} __generic __target_intrinsic(cuda, "_wavePrefixProductMultiple($0, $1)") __target_intrinsic(hlsl, "WavePrefixProduct($1)") @@ -4986,17 +5029,60 @@ matrix WaveMaskPrefixProduct(WaveMask mask, matrix expr); __generic __glsl_extension(GL_KHR_shader_subgroup_arithmetic) __spirv_version(1.3) -__target_intrinsic(glsl, "subgroupExclusiveAdd($1)") -__target_intrinsic(cuda, "_wavePrefixSum($0, $1)") -__target_intrinsic(hlsl, "WavePrefixSum($1)") -T WaveMaskPrefixSum(WaveMask mask, T expr); +__spirv_capability(GroupNonUniformArithmetic) +T WaveMaskPrefixSum(WaveMask mask, T expr) +{ + __target_switch + { + case glsl: __intrinsic_asm "subgroupExclusiveAdd($1)"; + case cuda: __intrinsic_asm "_wavePrefixSum($0, $1)"; + case hlsl: __intrinsic_asm "WavePrefixSum($1)"; + case spirv: + if (__isFloat()) + return spirv_asm {OpGroupNonUniformFAdd $$T result Subgroup ExclusiveScan $expr}; + else if (__isSignedInt()) + { + return spirv_asm + { + // TODO: use the correct integer width + %uvalue:$$uint = OpBitcast $expr; + %mulResult:$$uint = OpGroupNonUniformIAdd Subgroup ExclusiveScan %uvalue; + result:$$T = OpBitcast %mulResult + }; + } + else if (__isUnsignedInt()) + return spirv_asm {OpGroupNonUniformIAdd $$T result Subgroup ExclusiveScan $expr}; + } +} + __generic __glsl_extension(GL_KHR_shader_subgroup_arithmetic) __spirv_version(1.3) -__target_intrinsic(glsl, "subgroupExclusiveAdd($1)") -__target_intrinsic(cuda, "_wavePrefixSumMultiple($0, $1)") -__target_intrinsic(hlsl, "WavePrefixSum($1)") -vector WaveMaskPrefixSum(WaveMask mask, vector expr); +__spirv_capability(GroupNonUniformArithmetic) +vector WaveMaskPrefixSum(WaveMask mask, vector expr) +{ + __target_switch + { + case glsl: __intrinsic_asm "subgroupExclusiveAdd($1)"; + case cuda: __intrinsic_asm "_wavePrefixSumMultiple($0, $1)"; + case hlsl: __intrinsic_asm "WavePrefixSum($1)"; + case spirv: + if (__isFloat()) + return spirv_asm {OpGroupNonUniformFAdd $$vector result Subgroup ExclusiveScan $expr}; + else if (__isSignedInt()) + { + return spirv_asm + { + // TODO: use the correct integer width + %uvalue: $$uint = OpBitcast $expr; + %mulResult: $$vector = OpGroupNonUniformIAdd Subgroup ExclusiveScan %uvalue; + result: $$T = OpBitcast %mulResult + }; + } + else if (__isUnsignedInt()) + return spirv_asm {OpGroupNonUniformIAdd $$vector result Subgroup ExclusiveScan $expr}; + } +} __generic __target_intrinsic(cuda, "_wavePrefixSumMultiple($0, $1)") __target_intrinsic(hlsl, "WavePrefixSum($1)") @@ -5005,15 +5091,34 @@ matrix WaveMaskPrefixSum(WaveMask mask, matrix expr); __generic __glsl_extension(GL_KHR_shader_subgroup_ballot) __spirv_version(1.3) -__target_intrinsic(glsl, "subgroupBroadcastFirst($1)") -__target_intrinsic(cuda, "_waveReadFirst($0, $1)") -T WaveMaskReadLaneFirst(WaveMask mask, T expr); +__spirv_capability(GroupNonUniformBallot) +T WaveMaskReadLaneFirst(WaveMask mask, T expr) +{ + __target_switch + { + case glsl: __intrinsic_asm "subgroupBroadcastFirst($1)"; + case cuda: __intrinsic_asm "_waveReadFirst($0, $1)"; + case hlsl: __intrinsic_asm "WaveReadLaneFirst($1)"; + case spirv: + return spirv_asm {OpGroupNonUniformBroadcastFirst $$T result Subgroup $expr}; + } +} __generic __glsl_extension(GL_KHR_shader_subgroup_ballot) __spirv_version(1.3) -__target_intrinsic(glsl, "subgroupBroadcastFirst($1)") -__target_intrinsic(cuda, "_waveReadFirstMultiple($0, $1)") -vector WaveMaskReadLaneFirst(WaveMask mask, vector expr); +__spirv_capability(GroupNonUniformBallot) +vector WaveMaskReadLaneFirst(WaveMask mask, vector expr) +{ + __target_switch + { + case glsl: __intrinsic_asm "subgroupBroadcastFirst($1)"; + case cuda: __intrinsic_asm "_waveReadFirstMultiple($0, $1)"; + case hlsl: __intrinsic_asm "WaveReadLaneFirst($1)"; + case spirv: + return spirv_asm {OpGroupNonUniformBroadcastFirst $$vector result Subgroup $expr}; + } +} + __generic __target_intrinsic(cuda, "_waveReadFirstMultiple($0, $1)") matrix WaveMaskReadLaneFirst(WaveMask mask, matrix expr); @@ -5023,21 +5128,38 @@ matrix WaveMaskReadLaneFirst(WaveMask mask, matrix expr); // TODO(JS): On HLSL it only works for 32 bits or less __generic -__target_intrinsic(hlsl, "WaveMatch($1).x") __glsl_extension(GL_NV_shader_subgroup_partitioned) __spirv_version(1.3) -__target_intrinsic(glsl, "subgroupPartitionNV($1).x") __cuda_sm_version(7.0) -__target_intrinsic(cuda, "_waveMatchScalar($0, $1).x") -WaveMask WaveMaskMatch(WaveMask mask, T value); +__spirv_capability(GroupNonUniformPartitionedNV) +WaveMask WaveMaskMatch(WaveMask mask, T value) +{ + __target_switch + { + case glsl: __intrinsic_asm "subgroupPartitionNV($1).x"; + case cuda: __intrinsic_asm "_waveMatchScalar($0, $1).x"; + case hlsl: __intrinsic_asm "WaveMatch($1).x"; + case spirv: + return (spirv_asm {OpGroupNonUniformPartitionNV $$uint4 result $value}).x; + } +} __generic -__target_intrinsic(hlsl, "WaveMatch($1).x") __glsl_extension(GL_NV_shader_subgroup_partitioned) __spirv_version(1.3) -__target_intrinsic(glsl, "subgroupPartitionNV($1).x") __cuda_sm_version(7.0) -__target_intrinsic(cuda, "_waveMatchMultiple($0, $1)") -WaveMask WaveMaskMatch(WaveMask mask, vector value); +__spirv_capability(GroupNonUniformPartitionedNV) +WaveMask WaveMaskMatch(WaveMask mask, vector value) +{ + __target_switch + { + case glsl: __intrinsic_asm "subgroupPartitionNV($1).x"; + case cuda: __intrinsic_asm "_waveMatchMultiple($0, $1).x"; + case hlsl: __intrinsic_asm "WaveMatch($1).x"; + case spirv: + return (spirv_asm {OpGroupNonUniformPartitionNV $$uint4 result $value}).x; + } +} + __generic __target_intrinsic(hlsl, "WaveMatch($1).x") __glsl_extension(GL_NV_shader_subgroup_partitioned) @@ -5048,57 +5170,111 @@ __target_intrinsic(cuda, "_waveMatchMultiple($0, $1)") WaveMask WaveMaskMatch(WaveMask mask, matrix value); __generic -__target_intrinsic(hlsl, "WaveMultiPrefixBitAnd($1, uint4($0, 0, 0, 0))") __glsl_extension(GL_KHR_shader_subgroup_arithmetic) __spirv_version(1.3) -//__target_intrinsic(glsl, "subgroupExclusiveAnd($1)") -__target_intrinsic(cuda, "_wavePrefixAnd($0, $1)") -T WaveMaskPrefixBitAnd(WaveMask mask, T expr); -__target_intrinsic(hlsl, "WaveMultiPrefixBitAnd($1, uint4($0, 0, 0, 0))") +__spirv_capability(GroupNonUniformArithmetic) +T WaveMaskPrefixBitAnd(WaveMask mask, T expr) +{ + __target_switch + { + case glsl: __intrinsic_asm "subgroupExclusiveAnd($1)"; + case cuda: __intrinsic_asm "_wavePrefixAnd($0, $1)"; + case hlsl: __intrinsic_asm "WaveMultiPrefixBitAnd($1, uint4($0, 0, 0, 0))"; + case spirv: + return spirv_asm {OpGroupNonUniformBitwiseAnd $$T result Subgroup ExclusiveScan $expr}; + } +} + +__generic __glsl_extension(GL_KHR_shader_subgroup_arithmetic) __spirv_version(1.3) -__target_intrinsic(glsl, "subgroupExclusiveAnd($1)") -__target_intrinsic(cuda, "_wavePrefixAndMultiple($0, $1)") -__generic -vector WaveMaskPrefixBitAnd(WaveMask mask, vector expr); +__spirv_capability(GroupNonUniformArithmetic) +vector WaveMaskPrefixBitAnd(WaveMask mask, vector expr) +{ + __target_switch + { + case glsl: __intrinsic_asm "subgroupExclusiveAnd($1)"; + case cuda: __intrinsic_asm "_wavePrefixAndMultiple($0, $1)"; + case hlsl: __intrinsic_asm "WaveMultiPrefixBitAnd($1, uint4($0, 0, 0, 0))"; + case spirv: + return spirv_asm {OpGroupNonUniformBitwiseAnd $$vector result Subgroup ExclusiveScan $expr}; + } +} + __generic __target_intrinsic(hlsl, "WaveMultiPrefixBitAnd($1, uint4($0, 0, 0, 0))") __target_intrinsic(cuda, "_wavePrefixAndMultiple(_getMultiPrefixMask($0, $1)") matrix WaveMaskPrefixBitAnd(WaveMask mask, matrix expr); __generic -__target_intrinsic(hlsl, "WaveMultiPrefixBitOr($1, uint4($0, 0, 0, 0))") __glsl_extension(GL_KHR_shader_subgroup_arithmetic) __spirv_version(1.3) -//__target_intrinsic(glsl, "subgroupExclusiveOr($1)") -__target_intrinsic(cuda, "_wavePrefixOr($0, $1)") -T WaveMaskPrefixBitOr(WaveMask mask, T expr); +__spirv_capability(GroupNonUniformArithmetic) +T WaveMaskPrefixBitOr(WaveMask mask, T expr) +{ + __target_switch + { + case glsl: __intrinsic_asm "subgroupExclusiveOr($1)"; + case cuda: __intrinsic_asm "_wavePrefixOr($0, $1)"; + case hlsl: __intrinsic_asm "WaveMultiPrefixBitOr($1, uint4($0, 0, 0, 0))"; + case spirv: + return spirv_asm {OpGroupNonUniformBitwiseAnd $$T result Subgroup ExclusiveScan $expr}; + } +} + __generic -__target_intrinsic(hlsl, "WaveMultiPrefixBitOr($1, uint4($0, 0, 0, 0))") __glsl_extension(GL_KHR_shader_subgroup_arithmetic) __spirv_version(1.3) -//__target_intrinsic(glsl, "subgroupExclusiveOr($1)") -__target_intrinsic(cuda, "_wavePrefixOrMultiple($0, $1)") -vector WaveMaskPrefixBitOr(WaveMask mask, vector expr); +__spirv_capability(GroupNonUniformArithmetic) +vector WaveMaskPrefixBitOr(WaveMask mask, vector expr) +{ + __target_switch + { + case glsl: __intrinsic_asm "subgroupExclusiveOr($1)"; + case cuda: __intrinsic_asm "_wavePrefixOrMultiple($0, $1)"; + case hlsl: __intrinsic_asm "WaveMultiPrefixBitOr($1, uint4($0, 0, 0, 0))"; + case spirv: + return spirv_asm {OpGroupNonUniformBitwiseOr $$vector result Subgroup ExclusiveScan $expr}; + } +} + __generic __target_intrinsic(hlsl, "WaveMultiPrefixBitOr($1, uint4($0, 0, 0, 0))") __target_intrinsic(cuda, "_wavePrefixOrMultiple($0, $1)") matrix WaveMaskPrefixBitOr(WaveMask mask, matrix expr); __generic -__target_intrinsic(hlsl, "WaveMultiPrefixBitXor($1, uint4($0, 0, 0, 0))") __glsl_extension(GL_KHR_shader_subgroup_arithmetic) __spirv_version(1.3) -__target_intrinsic(glsl, "subgroupExclusiveXor($1)") -__target_intrinsic(cuda, "_wavePrefixXor($0, $1)") -T WaveMaskPrefixBitXor(WaveMask mask, T expr); +__spirv_capability(GroupNonUniformArithmetic) +T WaveMaskPrefixBitXor(WaveMask mask, T expr) +{ + __target_switch + { + case glsl: __intrinsic_asm "subgroupExclusiveXor($1)"; + case cuda: __intrinsic_asm "_wavePrefixXor($0, $1)"; + case hlsl: __intrinsic_asm "WaveMultiPrefixBitXor($1, uint4($0, 0, 0, 0))"; + case spirv: + return spirv_asm {OpGroupNonUniformBitwiseXor $$T result Subgroup ExclusiveScan $expr}; + } +} + __generic -__target_intrinsic(hlsl, "WaveMultiPrefixBitXor($1, uint4($0, 0, 0, 0))") __glsl_extension(GL_KHR_shader_subgroup_arithmetic) __spirv_version(1.3) -__target_intrinsic(glsl, "subgroupExclusiveXor($1)") -__target_intrinsic(cuda, "_wavePrefixXorMultiple($0, $1)") -vector WaveMaskPrefixBitXor(WaveMask mask, vector expr); +__spirv_capability(GroupNonUniformArithmetic) +vector WaveMaskPrefixBitXor(WaveMask mask, vector expr) +{ + __target_switch + { + case glsl: __intrinsic_asm "subgroupExclusiveXor($1)"; + case cuda: __intrinsic_asm "_wavePrefixXorMultiple($0, $1)"; + case hlsl: __intrinsic_asm "WaveMultiPrefixBitXor($1, uint4($0, 0, 0, 0))"; + case spirv: + return spirv_asm {OpGroupNonUniformBitwiseXor $$vector result Subgroup ExclusiveScan $expr}; + } +} + __generic __target_intrinsic(hlsl, "WaveMultiPrefixBitXor($1, uint4($0, 0, 0, 0))") __target_intrinsic(cuda, "_wavePrefixXorMultiple($0, $1)") @@ -5129,21 +5305,35 @@ __generic matrix QuadReadAcr __generic __glsl_extension(GL_KHR_shader_subgroup_arithmetic) __spirv_version(1.3) -__target_intrinsic(glsl, "subgroupAnd($0)") -__target_intrinsic(hlsl) +__spirv_capability(GroupNonUniformArithmetic) T WaveActiveBitAnd(T expr) { - return WaveMaskBitAnd(WaveGetActiveMask(), expr); + __target_switch + { + case glsl: __intrinsic_asm "subgroupAnd($0)"; + case hlsl: __intrinsic_asm "WaveActiveBitAnd"; + case spirv: + return spirv_asm {OpGroupNonUniformBitwiseAnd $$T result Subgroup Reduce $expr}; + default: + return WaveMaskBitAnd(WaveGetActiveMask(), expr); + } } __generic __glsl_extension(GL_KHR_shader_subgroup_arithmetic) __spirv_version(1.3) -__target_intrinsic(glsl, "subgroupAnd($0)") -__target_intrinsic(hlsl) +__spirv_capability(GroupNonUniformArithmetic) vector WaveActiveBitAnd(vector expr) { - return WaveMaskBitAnd(WaveGetActiveMask(), expr); + __target_switch + { + case glsl: __intrinsic_asm "subgroupAnd($0)"; + case hlsl: __intrinsic_asm "WaveActiveBitAnd"; + case spirv: + return spirv_asm {OpGroupNonUniformBitwiseAnd $$vector result Subgroup Reduce $expr}; + default: + return WaveMaskBitAnd(WaveGetActiveMask(), expr); + } } __generic @@ -5156,21 +5346,35 @@ matrix WaveActiveBitAnd(matrix expr) __generic __glsl_extension(GL_KHR_shader_subgroup_arithmetic) __spirv_version(1.3) -__target_intrinsic(glsl, "subgroupOr($0)") -__target_intrinsic(hlsl) +__spirv_capability(GroupNonUniformArithmetic) T WaveActiveBitOr(T expr) { - return WaveMaskBitOr(WaveGetActiveMask(), expr); + __target_switch + { + case glsl: __intrinsic_asm "subgroupOr($0)"; + case hlsl: __intrinsic_asm "WaveActiveBitOr"; + case spirv: + return spirv_asm {OpGroupNonUniformBitwiseOr $$T result Subgroup Reduce $expr}; + default: + return WaveMaskBitOr(WaveGetActiveMask(), expr); + } } __generic __glsl_extension(GL_KHR_shader_subgroup_arithmetic) __spirv_version(1.3) -__target_intrinsic(glsl, "subgroupOr($0)") -__target_intrinsic(hlsl) +__spirv_capability(GroupNonUniformArithmetic) vector WaveActiveBitOr(vector expr) { - return WaveMaskBitOr(WaveGetActiveMask(), expr); + __target_switch + { + case glsl: __intrinsic_asm "subgroupOr($0)"; + case hlsl: __intrinsic_asm "WaveActiveBitOr"; + case spirv: + return spirv_asm {OpGroupNonUniformBitwiseOr $$vector result Subgroup Reduce $expr}; + default: + return WaveMaskBitOr(WaveGetActiveMask(), expr); + } } __generic @@ -5183,21 +5387,35 @@ matrix WaveActiveBitOr(matrix expr) __generic __glsl_extension(GL_KHR_shader_subgroup_arithmetic) __spirv_version(1.3) -__target_intrinsic(glsl, "subgroupXor($0)") -__target_intrinsic(hlsl) +__spirv_capability(GroupNonUniformArithmetic) T WaveActiveBitXor(T expr) { - return WaveMaskBitXor(WaveGetActiveMask(), expr); + __target_switch + { + case glsl: __intrinsic_asm "subgroupXor($0)"; + case hlsl: __intrinsic_asm "WaveActiveBitXor"; + case spirv: + return spirv_asm {OpGroupNonUniformBitwiseXor $$T result Subgroup Reduce $expr}; + default: + return WaveMaskBitXor(WaveGetActiveMask(), expr); + } } __generic __glsl_extension(GL_KHR_shader_subgroup_arithmetic) __spirv_version(1.3) -__target_intrinsic(glsl, "subgroupXor($0)") -__target_intrinsic(hlsl) +__spirv_capability(GroupNonUniformArithmetic) vector WaveActiveBitXor(vector expr) { - return WaveMaskBitXor(WaveGetActiveMask(), expr); + __target_switch + { + case glsl: __intrinsic_asm "subgroupXor($0)"; + case hlsl: __intrinsic_asm "WaveActiveBitXor"; + case spirv: + return spirv_asm {OpGroupNonUniformBitwiseXor $$vector result Subgroup Reduce $expr}; + default: + return WaveMaskBitXor(WaveGetActiveMask(), expr); + } } __generic @@ -5452,7 +5670,23 @@ __glsl_extension(GL_KHR_shader_subgroup_basic) __spirv_version(1.3) __target_intrinsic(glsl, "(gl_SubgroupInvocationID)") __target_intrinsic(cuda, "_getLaneId()") -uint WaveGetLaneIndex(); +uint WaveGetLaneIndex() +{ + __target_switch + { + case glsl: __intrinsic_asm "(gl_SubgroupInvocationID)"; + case cuda: __intrinsic_asm "_getLaneId()"; + case hlsl: __intrinsic_asm "WaveGetLaneIndex()"; + /* + case spirv: + let _scope = 3u; // subgroup + return spirv_asm + { + OpSubgroupLocalInvocationId $$uint result $_scope + }; + */ + } +} __glsl_extension(GL_KHR_shader_subgroup_basic) __spirv_capability(GroupNonUniformBallot) diff --git a/source/slang/slang-ir-inline.cpp b/source/slang/slang-ir-inline.cpp index f3fa213da..e171e2dd3 100644 --- a/source/slang/slang-ir-inline.cpp +++ b/source/slang/slang-ir-inline.cpp @@ -173,6 +173,19 @@ struct InliningPassBase return false; } + static bool hasGenericAsmInst(IRInst* func) + { + auto f = as(getResolvedInstForDecorations(func)); + if (!f) + return false; + for (auto b : f->getBlocks()) + { + if (as(b->getTerminator())) + return true; + } + return false; + } + /// Determine whether `call` can be inlined, and if so write information about it to `outCallSite` bool canInline(IRCall* call, CallSiteInfo& outCallSite) { @@ -236,6 +249,24 @@ struct InliningPassBase if (callee->findDecoration()) return true; + // We cannot inline a function that is defined by a generic asm inst. + if (hasGenericAsmInst(callee)) + return false; + + for (auto decor : callee->getDecorations()) + { + switch (decor->getOp()) + { + case kIROp_IntrinsicOpDecoration: + return true; + case kIROp_RequireSPIRVCapabilityDecoration: + case kIROp_RequireSPIRVVersionDecoration: + case kIROp_RequireGLSLExtensionDecoration: + case kIROp_RequireGLSLVersionDecoration: + return false; + } + } + // At this point the `CallSiteInfo` is complete and // could be used for inlining, but we have additional // checks to make. @@ -654,19 +685,6 @@ struct InliningPassBase }; -static bool hasGenericAsmInst(IRInst* func) -{ - auto f = as(getResolvedInstForDecorations(func)); - if (!f) - return false; - for (auto b : f->getBlocks()) - { - if (as(b->getTerminator())) - return true; - } - return false; -} - /// An inlining pass that inlines calls to `[unsafeForceInlineEarly]` functions struct MandatoryEarlyInliningPass : InliningPassBase { @@ -681,10 +699,6 @@ struct MandatoryEarlyInliningPass : InliningPassBase if (info.callee->findDecoration()) return true; - // Never inline a callee that has genericASM instruction. - if (hasGenericAsmInst(info.callee)) - return false; - if(info.callee->findDecoration()) return true; return false; @@ -800,10 +814,6 @@ struct ForceInliningPass : InliningPassBase bool shouldInline(CallSiteInfo const& info) { - // Never inline a callee that has genericASM instruction. - if (hasGenericAsmInst(info.callee)) - return false; - if (info.callee->findDecoration() || info.callee->findDecoration()|| info.callee->findDecoration()) -- cgit v1.2.3