From 333968af7344bcf0ef77818d076efcf88acd159d Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 27 Mar 2023 17:48:46 +0800 Subject: Use c++17 standard (#2686) * Use c++17 standard * regenerate VS projects * Switch to using std::invoke --- .../autodiff-texture/autodiff-texture.vcxproj | 618 +++++++++++---------- .../autodiff-texture.vcxproj.filters | 64 +-- .../compiler-core/compiler-core.vcxproj | 6 + build/visual-studio/core/core.vcxproj | 6 + .../cpu-com-example/cpu-com-example.vcxproj | 6 + .../cpu-hello-world/cpu-hello-world.vcxproj | 6 + .../example-base/example-base.vcxproj | 6 + .../gfx-unit-test-tool/gfx-unit-test-tool.vcxproj | 6 + build/visual-studio/gfx-util/gfx-util.vcxproj | 6 + build/visual-studio/gfx/gfx.vcxproj | 6 + .../gpu-printing/gpu-printing.vcxproj | 6 + .../visual-studio/hello-world/hello-world.vcxproj | 6 + build/visual-studio/lz4/lz4.vcxproj | 6 + build/visual-studio/miniz/miniz.vcxproj | 6 + .../model-viewer/model-viewer.vcxproj | 6 + build/visual-studio/platform/platform.vcxproj | 6 + .../ray-tracing-pipeline.vcxproj | 6 + .../visual-studio/ray-tracing/ray-tracing.vcxproj | 6 + .../render-test-tool/render-test-tool.vcxproj | 6 + .../shader-object/shader-object.vcxproj | 6 + build/visual-studio/shader-toy/shader-toy.vcxproj | 6 + .../slang-cpp-extractor.vcxproj | 6 + .../visual-studio/slang-embed/slang-embed.vcxproj | 6 + .../slang-generate/slang-generate.vcxproj | 6 + .../slang-lookup-generator.vcxproj | 6 + .../slang-reflection-test-tool.vcxproj | 6 + build/visual-studio/slang-rt/slang-rt.vcxproj | 6 + build/visual-studio/slang-test/slang-test.vcxproj | 6 + .../slang-unit-test-tool.vcxproj | 6 + build/visual-studio/slang/slang.vcxproj | 6 + build/visual-studio/slangc/slangc.vcxproj | 6 + build/visual-studio/slangd/slangd.vcxproj | 6 + .../test-process/test-process.vcxproj | 6 + .../visual-studio/test-server/test-server.vcxproj | 6 + build/visual-studio/triangle/triangle.vcxproj | 6 + premake5.lua | 3 +- source/slang/slang-ir.h | 4 +- 37 files changed, 544 insertions(+), 343 deletions(-) diff --git a/build/visual-studio/autodiff-texture/autodiff-texture.vcxproj b/build/visual-studio/autodiff-texture/autodiff-texture.vcxproj index c8bac6e9d..8f8baa042 100644 --- a/build/visual-studio/autodiff-texture/autodiff-texture.vcxproj +++ b/build/visual-studio/autodiff-texture/autodiff-texture.vcxproj @@ -1,307 +1,313 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Debug - ARM64 - - - Debug aarch64 - Win32 - - - Debug aarch64 - x64 - - - Debug aarch64 - ARM64 - - - Release - Win32 - - - Release - x64 - - - Release - ARM64 - - - Release aarch64 - Win32 - - - Release aarch64 - x64 - - - Release aarch64 - ARM64 - - - - {2F0A3884-1B72-FE51-84DD-12687064153E} - true - Win32Proj - autodiff-texture - - - - Application - true - Unicode - v142 - - - Application - true - Unicode - v142 - - - Application - true - Unicode - v142 - true - - - Application - false - Unicode - v142 - - - Application - false - Unicode - v142 - - - Application - false - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - - - - - - - true - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\autodiff-texture\ - autodiff-texture - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\autodiff-texture\ - autodiff-texture - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\autodiff-texture\ - autodiff-texture - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\autodiff-texture\ - autodiff-texture - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\autodiff-texture\ - autodiff-texture - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\autodiff-texture\ - autodiff-texture - .exe - - - - NotUsing - Level3 - _DEBUG;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - - - Windows - true - - - - - NotUsing - Level3 - NDEBUG;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - - - Windows - true - true - - - - - - - - - - - - - - - - {37BED5B5-23FA-D81F-8C0C-F1167867813A} - - - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} - - - {222F7498-B40C-4F3F-A704-DDEB91A4484A} - - - {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B} - - - {3565FE5E-4FA3-11EB-AE93-0242AC130002} - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Debug + ARM64 + + + Debug aarch64 + Win32 + + + Debug aarch64 + x64 + + + Debug aarch64 + ARM64 + + + Release + Win32 + + + Release + x64 + + + Release + ARM64 + + + Release aarch64 + Win32 + + + Release aarch64 + x64 + + + Release aarch64 + ARM64 + + + + {2F0A3884-1B72-FE51-84DD-12687064153E} + true + Win32Proj + autodiff-texture + + + + Application + true + Unicode + v142 + + + Application + true + Unicode + v142 + + + Application + true + Unicode + v142 + true + + + Application + false + Unicode + v142 + + + Application + false + Unicode + v142 + + + Application + false + Unicode + v142 + true + + + + + + + + + + + + + + + + + + + + + + + + + true + ..\..\..\bin\windows-x86\debug\ + ..\..\..\intermediate\windows-x86\debug\autodiff-texture\ + autodiff-texture + .exe + + + true + ..\..\..\bin\windows-x64\debug\ + ..\..\..\intermediate\windows-x64\debug\autodiff-texture\ + autodiff-texture + .exe + + + true + ..\..\..\bin\windows-aarch64\debug\ + ..\..\..\intermediate\windows-aarch64\debug\autodiff-texture\ + autodiff-texture + .exe + + + false + ..\..\..\bin\windows-x86\release\ + ..\..\..\intermediate\windows-x86\release\autodiff-texture\ + autodiff-texture + .exe + + + false + ..\..\..\bin\windows-x64\release\ + ..\..\..\intermediate\windows-x64\release\autodiff-texture\ + autodiff-texture + .exe + + + false + ..\..\..\bin\windows-aarch64\release\ + ..\..\..\intermediate\windows-aarch64\release\autodiff-texture\ + autodiff-texture + .exe + + + + NotUsing + Level3 + _DEBUG;%(PreprocessorDefinitions) + ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) + ProgramDatabase + Disabled + false + MultiThreadedDebug + true + stdcpp17 + + + Windows + true + + + + + NotUsing + Level3 + _DEBUG;%(PreprocessorDefinitions) + ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) + ProgramDatabase + Disabled + false + MultiThreadedDebug + true + stdcpp17 + + + Windows + true + + + + + NotUsing + Level3 + _DEBUG;%(PreprocessorDefinitions) + ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) + ProgramDatabase + Disabled + false + MultiThreadedDebug + true + stdcpp17 + + + Windows + true + + + + + NotUsing + Level3 + NDEBUG;%(PreprocessorDefinitions) + ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) + Full + true + true + false + true + MultiThreaded + true + stdcpp17 + + + Windows + true + true + + + + + NotUsing + Level3 + NDEBUG;%(PreprocessorDefinitions) + ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) + Full + true + true + false + true + MultiThreaded + true + stdcpp17 + + + Windows + true + true + + + + + NotUsing + Level3 + NDEBUG;%(PreprocessorDefinitions) + ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) + Full + true + true + false + true + MultiThreaded + true + stdcpp17 + + + Windows + true + true + + + + + + + + + + + + + + + + {37BED5B5-23FA-D81F-8C0C-F1167867813A} + + + {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} + + + {222F7498-B40C-4F3F-A704-DDEB91A4484A} + + + {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B} + + + {3565FE5E-4FA3-11EB-AE93-0242AC130002} + + + {F9BE7957-8399-899E-0C49-E714FDDD4B65} + + + + + \ No newline at end of file diff --git a/build/visual-studio/autodiff-texture/autodiff-texture.vcxproj.filters b/build/visual-studio/autodiff-texture/autodiff-texture.vcxproj.filters index 17045ac96..cf46bc257 100644 --- a/build/visual-studio/autodiff-texture/autodiff-texture.vcxproj.filters +++ b/build/visual-studio/autodiff-texture/autodiff-texture.vcxproj.filters @@ -1,33 +1,33 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - + + + + + {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} + + + + + Source Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/build/visual-studio/compiler-core/compiler-core.vcxproj b/build/visual-studio/compiler-core/compiler-core.vcxproj index 34c1e7b9a..4dfbdd085 100644 --- a/build/visual-studio/compiler-core/compiler-core.vcxproj +++ b/build/visual-studio/compiler-core/compiler-core.vcxproj @@ -163,6 +163,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -179,6 +180,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -195,6 +197,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -213,6 +216,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -232,6 +236,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -251,6 +256,7 @@ true MultiThreaded true + stdcpp17 Windows diff --git a/build/visual-studio/core/core.vcxproj b/build/visual-studio/core/core.vcxproj index 32a416e80..d67dc94d9 100644 --- a/build/visual-studio/core/core.vcxproj +++ b/build/visual-studio/core/core.vcxproj @@ -163,6 +163,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -179,6 +180,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -195,6 +197,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -213,6 +216,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -232,6 +236,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -251,6 +256,7 @@ true MultiThreaded true + stdcpp17 Windows 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 56ca77d6d..da6091c78 100644 --- a/build/visual-studio/cpu-com-example/cpu-com-example.vcxproj +++ b/build/visual-studio/cpu-com-example/cpu-com-example.vcxproj @@ -170,6 +170,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -187,6 +188,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -204,6 +206,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -223,6 +226,7 @@ true MultiThreaded true + stdcpp17 Console @@ -243,6 +247,7 @@ true MultiThreaded true + stdcpp17 Console @@ -263,6 +268,7 @@ true MultiThreaded true + stdcpp17 Console 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 eef861b2e..6e4942fa1 100644 --- a/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj +++ b/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj @@ -170,6 +170,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -187,6 +188,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -204,6 +206,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -223,6 +226,7 @@ true MultiThreaded true + stdcpp17 Console @@ -243,6 +247,7 @@ true MultiThreaded true + stdcpp17 Console @@ -263,6 +268,7 @@ true MultiThreaded true + stdcpp17 Console diff --git a/build/visual-studio/example-base/example-base.vcxproj b/build/visual-studio/example-base/example-base.vcxproj index e6d1ea555..92765a015 100644 --- a/build/visual-studio/example-base/example-base.vcxproj +++ b/build/visual-studio/example-base/example-base.vcxproj @@ -164,6 +164,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -181,6 +182,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -198,6 +200,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -217,6 +220,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -237,6 +241,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -257,6 +262,7 @@ true MultiThreaded true + stdcpp17 Windows 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 869b0fd27..4691b1277 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 @@ -170,6 +170,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -188,6 +189,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -206,6 +208,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -226,6 +229,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -247,6 +251,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -268,6 +273,7 @@ true MultiThreaded true + stdcpp17 Windows diff --git a/build/visual-studio/gfx-util/gfx-util.vcxproj b/build/visual-studio/gfx-util/gfx-util.vcxproj index c503aa5c8..014756883 100644 --- a/build/visual-studio/gfx-util/gfx-util.vcxproj +++ b/build/visual-studio/gfx-util/gfx-util.vcxproj @@ -164,6 +164,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -181,6 +182,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -198,6 +200,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -217,6 +220,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -237,6 +241,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -257,6 +262,7 @@ true MultiThreaded true + stdcpp17 Windows diff --git a/build/visual-studio/gfx/gfx.vcxproj b/build/visual-studio/gfx/gfx.vcxproj index 53067b297..19ee1b314 100644 --- a/build/visual-studio/gfx/gfx.vcxproj +++ b/build/visual-studio/gfx/gfx.vcxproj @@ -171,6 +171,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -194,6 +195,7 @@ IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDi false MultiThreadedDebug true + stdcpp17 Windows @@ -217,6 +219,7 @@ IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDi false MultiThreadedDebug true + stdcpp17 Windows @@ -242,6 +245,7 @@ IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDi true MultiThreaded true + stdcpp17 Windows @@ -268,6 +272,7 @@ IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDi true MultiThreaded true + stdcpp17 Windows @@ -294,6 +299,7 @@ IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDi true MultiThreaded true + stdcpp17 Windows diff --git a/build/visual-studio/gpu-printing/gpu-printing.vcxproj b/build/visual-studio/gpu-printing/gpu-printing.vcxproj index 066dabb1e..29220bb64 100644 --- a/build/visual-studio/gpu-printing/gpu-printing.vcxproj +++ b/build/visual-studio/gpu-printing/gpu-printing.vcxproj @@ -170,6 +170,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -187,6 +188,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -204,6 +206,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -223,6 +226,7 @@ true MultiThreaded true + stdcpp17 Console @@ -243,6 +247,7 @@ true MultiThreaded true + stdcpp17 Console @@ -263,6 +268,7 @@ true MultiThreaded true + stdcpp17 Console diff --git a/build/visual-studio/hello-world/hello-world.vcxproj b/build/visual-studio/hello-world/hello-world.vcxproj index 7d7d8fb0f..48444f8d2 100644 --- a/build/visual-studio/hello-world/hello-world.vcxproj +++ b/build/visual-studio/hello-world/hello-world.vcxproj @@ -170,6 +170,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -187,6 +188,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -204,6 +206,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -223,6 +226,7 @@ true MultiThreaded true + stdcpp17 Console @@ -243,6 +247,7 @@ true MultiThreaded true + stdcpp17 Console @@ -263,6 +268,7 @@ true MultiThreaded true + stdcpp17 Console diff --git a/build/visual-studio/lz4/lz4.vcxproj b/build/visual-studio/lz4/lz4.vcxproj index 0a7a2f8f7..d4df56803 100644 --- a/build/visual-studio/lz4/lz4.vcxproj +++ b/build/visual-studio/lz4/lz4.vcxproj @@ -163,6 +163,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -179,6 +180,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -195,6 +197,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -213,6 +216,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -232,6 +236,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -251,6 +256,7 @@ true MultiThreaded true + stdcpp17 Windows diff --git a/build/visual-studio/miniz/miniz.vcxproj b/build/visual-studio/miniz/miniz.vcxproj index aae6d422c..4fe61732c 100644 --- a/build/visual-studio/miniz/miniz.vcxproj +++ b/build/visual-studio/miniz/miniz.vcxproj @@ -163,6 +163,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -179,6 +180,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -195,6 +197,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -213,6 +216,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -232,6 +236,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -251,6 +256,7 @@ true MultiThreaded true + stdcpp17 Windows diff --git a/build/visual-studio/model-viewer/model-viewer.vcxproj b/build/visual-studio/model-viewer/model-viewer.vcxproj index f4bd46bc0..894bbdc4c 100644 --- a/build/visual-studio/model-viewer/model-viewer.vcxproj +++ b/build/visual-studio/model-viewer/model-viewer.vcxproj @@ -170,6 +170,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -187,6 +188,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -204,6 +206,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -223,6 +226,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -243,6 +247,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -263,6 +268,7 @@ true MultiThreaded true + stdcpp17 Windows diff --git a/build/visual-studio/platform/platform.vcxproj b/build/visual-studio/platform/platform.vcxproj index 273427514..bf4cd1ffc 100644 --- a/build/visual-studio/platform/platform.vcxproj +++ b/build/visual-studio/platform/platform.vcxproj @@ -171,6 +171,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -189,6 +190,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -207,6 +209,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -227,6 +230,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -248,6 +252,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -269,6 +274,7 @@ true MultiThreaded true + stdcpp17 Windows 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 414beec69..40c4ccecb 100644 --- a/build/visual-studio/ray-tracing-pipeline/ray-tracing-pipeline.vcxproj +++ b/build/visual-studio/ray-tracing-pipeline/ray-tracing-pipeline.vcxproj @@ -170,6 +170,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -187,6 +188,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -204,6 +206,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -223,6 +226,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -243,6 +247,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -263,6 +268,7 @@ true MultiThreaded true + stdcpp17 Windows diff --git a/build/visual-studio/ray-tracing/ray-tracing.vcxproj b/build/visual-studio/ray-tracing/ray-tracing.vcxproj index 35d9e0a3f..dc866bd68 100644 --- a/build/visual-studio/ray-tracing/ray-tracing.vcxproj +++ b/build/visual-studio/ray-tracing/ray-tracing.vcxproj @@ -170,6 +170,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -187,6 +188,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -204,6 +206,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -223,6 +226,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -243,6 +247,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -263,6 +268,7 @@ true MultiThreaded true + stdcpp17 Windows 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 b1c5f553f..7f9d3dfc1 100644 --- a/build/visual-studio/render-test-tool/render-test-tool.vcxproj +++ b/build/visual-studio/render-test-tool/render-test-tool.vcxproj @@ -171,6 +171,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -192,6 +193,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -213,6 +215,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -236,6 +239,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -260,6 +264,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -284,6 +289,7 @@ true MultiThreaded true + stdcpp17 Windows diff --git a/build/visual-studio/shader-object/shader-object.vcxproj b/build/visual-studio/shader-object/shader-object.vcxproj index 07dadea70..b110e8c20 100644 --- a/build/visual-studio/shader-object/shader-object.vcxproj +++ b/build/visual-studio/shader-object/shader-object.vcxproj @@ -170,6 +170,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -187,6 +188,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -204,6 +206,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -223,6 +226,7 @@ true MultiThreaded true + stdcpp17 Console @@ -243,6 +247,7 @@ true MultiThreaded true + stdcpp17 Console @@ -263,6 +268,7 @@ true MultiThreaded true + stdcpp17 Console diff --git a/build/visual-studio/shader-toy/shader-toy.vcxproj b/build/visual-studio/shader-toy/shader-toy.vcxproj index 1bdfdc31a..c829f4562 100644 --- a/build/visual-studio/shader-toy/shader-toy.vcxproj +++ b/build/visual-studio/shader-toy/shader-toy.vcxproj @@ -170,6 +170,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -187,6 +188,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -204,6 +206,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -223,6 +226,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -243,6 +247,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -263,6 +268,7 @@ true MultiThreaded true + stdcpp17 Windows 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 665419354..61619f77a 100644 --- a/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj +++ b/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj @@ -170,6 +170,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -187,6 +188,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -204,6 +206,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -223,6 +226,7 @@ true MultiThreaded true + stdcpp17 Console @@ -243,6 +247,7 @@ true MultiThreaded true + stdcpp17 Console @@ -263,6 +268,7 @@ true MultiThreaded true + stdcpp17 Console diff --git a/build/visual-studio/slang-embed/slang-embed.vcxproj b/build/visual-studio/slang-embed/slang-embed.vcxproj index 0197f624f..f855bb5ef 100644 --- a/build/visual-studio/slang-embed/slang-embed.vcxproj +++ b/build/visual-studio/slang-embed/slang-embed.vcxproj @@ -169,6 +169,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -185,6 +186,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -201,6 +203,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -219,6 +222,7 @@ true MultiThreaded true + stdcpp17 Console @@ -238,6 +242,7 @@ true MultiThreaded true + stdcpp17 Console @@ -257,6 +262,7 @@ true MultiThreaded true + stdcpp17 Console diff --git a/build/visual-studio/slang-generate/slang-generate.vcxproj b/build/visual-studio/slang-generate/slang-generate.vcxproj index 2b81cc871..0cee678b8 100644 --- a/build/visual-studio/slang-generate/slang-generate.vcxproj +++ b/build/visual-studio/slang-generate/slang-generate.vcxproj @@ -169,6 +169,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -185,6 +186,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -201,6 +203,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -219,6 +222,7 @@ true MultiThreaded true + stdcpp17 Console @@ -238,6 +242,7 @@ true MultiThreaded true + stdcpp17 Console @@ -257,6 +262,7 @@ true MultiThreaded true + stdcpp17 Console 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 dc5e68656..e4591de58 100644 --- a/build/visual-studio/slang-lookup-generator/slang-lookup-generator.vcxproj +++ b/build/visual-studio/slang-lookup-generator/slang-lookup-generator.vcxproj @@ -170,6 +170,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -187,6 +188,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -204,6 +206,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -223,6 +226,7 @@ true MultiThreaded true + stdcpp17 Console @@ -243,6 +247,7 @@ true MultiThreaded true + stdcpp17 Console @@ -263,6 +268,7 @@ true MultiThreaded true + stdcpp17 Console 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 40fa7dad9..047e7764d 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 @@ -170,6 +170,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -188,6 +189,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -206,6 +208,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -226,6 +229,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -247,6 +251,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -268,6 +273,7 @@ true MultiThreaded true + stdcpp17 Windows diff --git a/build/visual-studio/slang-rt/slang-rt.vcxproj b/build/visual-studio/slang-rt/slang-rt.vcxproj index 380637f34..7f9a4c9aa 100644 --- a/build/visual-studio/slang-rt/slang-rt.vcxproj +++ b/build/visual-studio/slang-rt/slang-rt.vcxproj @@ -169,6 +169,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -186,6 +187,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -203,6 +205,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -222,6 +225,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -242,6 +246,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -262,6 +267,7 @@ true MultiThreaded true + stdcpp17 Windows diff --git a/build/visual-studio/slang-test/slang-test.vcxproj b/build/visual-studio/slang-test/slang-test.vcxproj index ce47b717f..1dc703860 100644 --- a/build/visual-studio/slang-test/slang-test.vcxproj +++ b/build/visual-studio/slang-test/slang-test.vcxproj @@ -170,6 +170,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -187,6 +188,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -204,6 +206,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -223,6 +226,7 @@ true MultiThreaded true + stdcpp17 Console @@ -243,6 +247,7 @@ true MultiThreaded true + stdcpp17 Console @@ -263,6 +268,7 @@ true MultiThreaded true + stdcpp17 Console 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 f4deb90e3..4944c52e8 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 @@ -170,6 +170,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -188,6 +189,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -206,6 +208,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -226,6 +229,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -247,6 +251,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -268,6 +273,7 @@ true MultiThreaded true + stdcpp17 Windows diff --git a/build/visual-studio/slang/slang.vcxproj b/build/visual-studio/slang/slang.vcxproj index 71545a5d1..c36dd269d 100644 --- a/build/visual-studio/slang/slang.vcxproj +++ b/build/visual-studio/slang/slang.vcxproj @@ -170,6 +170,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -192,6 +193,7 @@ IF EXIST ..\..\..\external\slang-glslang\bin\windows-x86\release\slang-glslang.d false MultiThreadedDebug true + stdcpp17 Windows @@ -214,6 +216,7 @@ IF EXIST ..\..\..\external\slang-glslang\bin\windows-x64\release\slang-glslang.d false MultiThreadedDebug true + stdcpp17 Windows @@ -238,6 +241,7 @@ IF EXIST ..\..\..\external\slang-glslang\bin\windows-aarch64\release\slang-glsla true MultiThreaded true + stdcpp17 Windows @@ -263,6 +267,7 @@ IF EXIST ..\..\..\external\slang-glslang\bin\windows-x86\release\slang-glslang.d true MultiThreaded true + stdcpp17 Windows @@ -288,6 +293,7 @@ IF EXIST ..\..\..\external\slang-glslang\bin\windows-x64\release\slang-glslang.d true MultiThreaded true + stdcpp17 Windows diff --git a/build/visual-studio/slangc/slangc.vcxproj b/build/visual-studio/slangc/slangc.vcxproj index c9f69c866..f24393153 100644 --- a/build/visual-studio/slangc/slangc.vcxproj +++ b/build/visual-studio/slangc/slangc.vcxproj @@ -169,6 +169,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -185,6 +186,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -201,6 +203,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -219,6 +222,7 @@ true MultiThreaded true + stdcpp17 Console @@ -238,6 +242,7 @@ true MultiThreaded true + stdcpp17 Console @@ -257,6 +262,7 @@ true MultiThreaded true + stdcpp17 Console diff --git a/build/visual-studio/slangd/slangd.vcxproj b/build/visual-studio/slangd/slangd.vcxproj index bd6b2cb03..d4105092c 100644 --- a/build/visual-studio/slangd/slangd.vcxproj +++ b/build/visual-studio/slangd/slangd.vcxproj @@ -170,6 +170,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -187,6 +188,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -204,6 +206,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -223,6 +226,7 @@ true MultiThreaded true + stdcpp17 Console @@ -243,6 +247,7 @@ true MultiThreaded true + stdcpp17 Console @@ -263,6 +268,7 @@ true MultiThreaded true + stdcpp17 Console diff --git a/build/visual-studio/test-process/test-process.vcxproj b/build/visual-studio/test-process/test-process.vcxproj index 115d3bff3..9b03826ef 100644 --- a/build/visual-studio/test-process/test-process.vcxproj +++ b/build/visual-studio/test-process/test-process.vcxproj @@ -170,6 +170,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -187,6 +188,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -204,6 +206,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -223,6 +226,7 @@ true MultiThreaded true + stdcpp17 Console @@ -243,6 +247,7 @@ true MultiThreaded true + stdcpp17 Console @@ -263,6 +268,7 @@ true MultiThreaded true + stdcpp17 Console diff --git a/build/visual-studio/test-server/test-server.vcxproj b/build/visual-studio/test-server/test-server.vcxproj index eb4da3a17..29c160e1e 100644 --- a/build/visual-studio/test-server/test-server.vcxproj +++ b/build/visual-studio/test-server/test-server.vcxproj @@ -170,6 +170,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -187,6 +188,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -204,6 +206,7 @@ false MultiThreadedDebug true + stdcpp17 Console @@ -223,6 +226,7 @@ true MultiThreaded true + stdcpp17 Console @@ -243,6 +247,7 @@ true MultiThreaded true + stdcpp17 Console @@ -263,6 +268,7 @@ true MultiThreaded true + stdcpp17 Console diff --git a/build/visual-studio/triangle/triangle.vcxproj b/build/visual-studio/triangle/triangle.vcxproj index 09d5b63e1..e1f1cdbaa 100644 --- a/build/visual-studio/triangle/triangle.vcxproj +++ b/build/visual-studio/triangle/triangle.vcxproj @@ -170,6 +170,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -187,6 +188,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -204,6 +206,7 @@ false MultiThreadedDebug true + stdcpp17 Windows @@ -223,6 +226,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -243,6 +247,7 @@ true MultiThreaded true + stdcpp17 Windows @@ -263,6 +268,7 @@ true MultiThreaded true + stdcpp17 Windows diff --git a/premake5.lua b/premake5.lua index 093b4659d..7635e1df1 100644 --- a/premake5.lua +++ b/premake5.lua @@ -320,8 +320,7 @@ workspace "slang" -- and configuration options, e.g. `bin/windows-x64/debug/` targetdir("bin/" .. targetName .. "/%{cfg.buildcfg:lower()}") - -- C++11 - cppdialect "C++11" + cppdialect "C++17" -- Statically link to the C/C++ runtime rather than create a DLL dependency. staticruntime "On" -- Turn off edit and continue for all projects. This is needed to avoid diff --git a/source/slang/slang-ir.h b/source/slang/slang-ir.h index d74a679d3..78069a122 100644 --- a/source/slang/slang-ir.h +++ b/source/slang/slang-ir.h @@ -2302,9 +2302,7 @@ R* composeGetters(T* t, F f, Fs... fs) using D = decltype(detail::thisArg(std::declval)); if(D* d = as(t)) { - // TODO: When we're on c++17, use std::invoke - // auto* n = std::invoke(f, d); - auto* n = (d->*f)(); + auto* n = std::invoke(f, d); return composeGetters(n, fs...); } return nullptr; -- cgit v1.2.3