From ec8fed3161b1ce536a2067f45f8976bcb26b5f54 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 8 Mar 2024 00:12:22 +0800 Subject: [PATCH 001/137] Remove premake lua --- premake.bat | 3 - premake5.lua | 1962 -------------------------------------------------- 2 files changed, 1965 deletions(-) delete mode 100644 premake.bat delete mode 100644 premake5.lua diff --git a/premake.bat b/premake.bat deleted file mode 100644 index 28b404a730..0000000000 --- a/premake.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -set ROOT=%~dp0 -"%ROOT%\external\slang-binaries\premake\premake-5.0.0-alpha16\bin\windows-x64\premake5.exe" %* diff --git a/premake5.lua b/premake5.lua deleted file mode 100644 index 1cfe335173..0000000000 --- a/premake5.lua +++ /dev/null @@ -1,1962 +0,0 @@ --- premake5.lua - --- This file describes the build configuration for Slang so --- that premake can generate platform-specific build files --- using Premake 5 (https://premake.github.io/). --- --- To update the build files that are checked in to the Slang repository, --- run a `premake5` binary and specify the appropriate action, e.g.: --- --- premake5.exe --os=windows vs2015 --- --- If you are trying to build Slang on another platform, then you --- can try invoking `premake5` for your desired OS and build format --- and see what happens. --- --- If you are going to modify this file to change/customize the Slang --- build, then you may need to read up on Premake's approach and --- how it uses/abuses Lua syntax. A few important things to note: --- --- * Everything that *looks* like a declarative (e.g., `kind "SharedLib"`) --- is actually a Lua function call (e.g., `kind("SharedLib")`) that --- modifies the behind-the-scenes state that describes the build. --- --- * Many of these function calls are "sticky" and affect subsequent --- calls, so ordering matters a *lot*. This file uses indentation to --- represent some of the flow of state, but it is important to recognize --- that the indentation is not semantically significant. --- --- * Because the configuration logic is just executable Lua code, we --- can capture and re-use bits of configuration logic in ordinary --- Lua subroutines. --- --- Now let's move on to the actual build: - --- The "workspace" represents the overall build (the "solution" in --- Visual Studio terms). It sets up basic build settings that will --- apply across all projects. --- - --- To output linux will output to linux --- % premake5 --os=linux gmake2 --build-location="build.linux" --- --- % cd build.linux --- % make config=release_x64 --- or --- % make config=debug_x64 --- --- From in the build directory you can use --- % premake5 --file=../premake5.lua --os=linux gmake2 - --- Fail if we try to use the deprecated 'gmake' generator -if _ACTION == "gmake" then - premake.error "Please use the 'gmake2' generator instead of 'gmake'" -end - --- --- Add the package path for slang-pack/slang-util --- The question mark is there the name of the module is inserted. ---- - -local modulePath = "external/slang-binaries/lua-modules/?.lua" - -package.path = package.path .. ";" .. modulePath - --- Load the slack package manager module -slangPack = require("slang-pack") -slangUtil = require("slang-util") - --- Load the dependencies from the json file -deps = slangPack.loadDependencies("deps/target-deps.json") - -newoption { - trigger = "override-module", - description = "(Optional) Specify a lua file that can override functions", - value = "path" -} - -newoption { - trigger = "build-location", - description = "(Optional) Specifiy the location to place solution on root Makefile", - value = "path" -} - -newoption { - trigger = "execute-binary", - description = "(Optional) If true binaries used in build will be executed (disable on cross compilation)", - value = "bool", - default = "true", - allowed = { { "true", "True"}, { "false", "False" } } -} - -newoption { - trigger = "build-glslang", - description = "(Optional) If true glslang and spirv-opt will be built", - value = "bool", - default = "false", - allowed = { { "true", "True"}, { "false", "False" } } -} - -newoption { - trigger = "enable-cuda", - description = "(Optional) If true will enable cuda tests, if CUDA is found via CUDA_PATH", - value = "bool", - default = "false", - allowed = { { "true", "True"}, { "false", "False" } } -} - -newoption { - trigger = "enable-nvapi", - description = "(Optional) If true will enable NVAPI, if NVAPI is found via external/nvapi", - value = "bool", - default = "false", - allowed = { { "true", "True"}, { "false", "False" } } -} - -newoption { - trigger = "cuda-sdk-path", - description = "(Optional) Path to the root of CUDA SDK. If set will enable CUDA in build (ie in effect sets enable-cuda=true too)", - value = "path" -} - -newoption { - trigger = "enable-optix", - description = "(Optional) If true will enable OptiX build/ tests (also implicitly enables CUDA)", - value = "bool", - default = "false", - allowed = { { "true", "True"}, { "false", "False" } } -} - -newoption { - trigger = "optix-sdk-path", - description = "(Optional) Path to the root of OptiX SDK. (Implicitly enabled OptiX and CUDA)", - value = "path" -} - -newoption { - trigger = "enable-profile", - description = "(Optional) If true will enable slang-profile tool - suitable for gprof usage on linux", - value = "bool", - default = "false", - allowed = { { "true", "True"}, { "false", "False" } } -} - -newoption { - trigger = "enable-embed-stdlib", - description = "(Optional) If true build slang with an embedded version of the stdlib", - value = "bool", - default = "false", - allowed = { { "true", "True"}, { "false", "False" } } -} - -newoption { - trigger = "enable-xlib", - description = "(Optional) If true build `gfx` and `platform` with xlib to support windowed apps on linux.", - value = "bool", - default = "true", - allowed = { { "true", "True"}, { "false", "False" } } -} - -newoption { - trigger = "enable-experimental-projects", - description = "(Optional) If true include experimental projects in build.", - value = "bool", - default = "false", - allowed = { { "true", "True"}, { "false", "False" } } -} - -newoption { - trigger = "disable-stdlib-source", - description = "(Optional) If true stdlib source will not be included in binary.", - value = "bool", - allowed = { { "true", "True"}, { "false", "False" } } -} - -newoption { - trigger = "skip-source-generation", - description = "(Optional) If true will skip source generation steps.", - value = "bool", - default = "false", - allowed = { { "true", "True"}, { "false", "False" } } -} - -newoption { - trigger = "deploy-slang-llvm", - description = "(Optional) If true will copy slang-llvm to output directory.", - value = "bool", - default = "true", - allowed = { { "true", "True"}, { "false", "False" } } -} - -newoption { - trigger = "deploy-slang-glslang", - description = "(Optional) If true will copy slang-glslang to output directory.", - value = "bool", - default = "true", - allowed = { { "true", "True"}, { "false", "False" } } -} - -newoption { - trigger = "full-debug-validation", - description = "(Optional) If true will enable full IR validation in debug build. (SLOW!)", - value = "bool", - default = "false", - allowed = { { "true", "True"}, { "false", "False" } } -} - -newoption { - trigger = "enable-asan", - description = "(Optional) If true will enable ASAN (address santizier).", - value = "bool", - default = "false", - allowed = { { "true", "True"}, { "false", "False" } } -} - -newoption { - trigger = "dx-on-vk", - description = "(Optional) If true will use dxvk and vkd3d-proton for DirectX support", - value = "bool", - default = "false", - allowed = { { "true", "True"}, { "false", "False" } } -} - -newoption { - trigger = "enable-aftermath", - description = "(Optional) Enable aftermath in GFX, and add aftermath crash example to project", - value = "bool", - default = "false", - allowed = { { "true", "True"}, { "false", "False" } } -} - -newoption { - trigger = "default-spirv-direct", - description = "(Optional) Development flag to make the default SPIR-V path generate directly rather than via GLSL", - value = "bool", - default = "false", - allowed = { { "true", "True"}, { "false", "False" } } -} - -buildLocation = _OPTIONS["build-location"] -executeBinary = (_OPTIONS["execute-binary"] == "true") -buildGlslang = (_OPTIONS["build-glslang"] == "true") -enableCuda = not not (_OPTIONS["enable-cuda"] == "true" or _OPTIONS["cuda-sdk-path"]) -enableProfile = (_OPTIONS["enable-profile"] == "true") -optixPath = _OPTIONS["optix-sdk-path"] -enableOptix = not not (_OPTIONS["enable-optix"] == "true" or optixPath) -enableProfile = (_OPTIONS["enable-profile"] == "true") -enableEmbedStdLib = (_OPTIONS["enable-embed-stdlib"] == "true") -enableXlib = (_OPTIONS["enable-xlib"] == "true") -skipSourceGeneration = (_OPTIONS["skip-source-generation"] == "true") -deployLLVM = (_OPTIONS["deploy-slang-llvm"] == "true") -deployGLSLang = (_OPTIONS["deploy-slang-glslang"] == "true") -fullDebugValidation = (_OPTIONS["full-debug-validation"] == "true") -enableAsan = (_OPTIONS["enable-asan"] == "true") -dxOnVk = (_OPTIONS["dx-on-vk"] == "true") -enableAftermath = (_OPTIONS["enable-aftermath"] == "true") -defaultSPIRVDirect = (_OPTIONS["default-spirv-direct"] == "true") - --- If stdlib embedding is enabled, disable stdlib source embedding by default -disableStdlibSource = enableEmbedStdLib - --- If embedding is enabled, and the setting `disable-stdlib-source` setting is set, use it's value -if enableEmbedStdLib and _OPTIONS["disable-stdlib-source"] ~= nil then - disableStdlibSource = (_OPTIONS["disable-stdlib-source"] == "true") -end - -if enableAftermath then - aftermathPath = "external/nv-aftermath" - - if not os.isfile(path.join(aftermathPath, "nsight-aftermath-usage-guidelines.txt")) then - print("external/nv-aftermath directory must hold aftermath SDK") - os.exit(0) - end - - printf("Enabled aftermath") -end - --- Determine the target info - -targetInfo = slangUtil.getTargetInfo() - --- --- Update the dependencies for the target --- - -deps:update(targetInfo.name) - --- Get the target name that can be used as paths that generate for different configurations (ie contains premake Tokens) - -targetName = targetInfo.tokenName - --- This is the path where nvapi is expected to be found - -nvapiPath = "external/nvapi" - -if enableOptix then - optixPath = optixPath or "C:/ProgramData/NVIDIA Corporation/OptiX SDK 7.0.0/" - enableCuda = true -end - --- cudaPath is only set if cuda is enabled, and CUDA_PATH enviromental variable is set -cudaPath = nil -if enableCuda then - -- Get the CUDA path. Use the value set on cuda-sdk-path by default, if not set use the environment variable. - cudaPath = (_OPTIONS["cuda-sdk-path"] or os.getenv("CUDA_PATH")) -end - --- TODO(JS): What's the point in the enable-xlib command line option if it's just overridden here? - -if targetInfo.isWindows or os.target() == "macosx" then - enableXlib = false -end - --- Even if we have the nvapi path, we only want to currently enable on windows targets - -enableNvapi = not not (os.isdir(nvapiPath) and targetInfo.isWindows and _OPTIONS["enable-nvapi"] == "true") - -if enableNvapi then - printf("Enabled NVAPI") -end - -overrideModule = {} -local overrideModulePath = _OPTIONS["override-module"] -if overrideModulePath then - overrideModule = require(overrideModulePath) -end - - --- This is needed for gcc, for the 'fileno' functions on cygwin --- _GNU_SOURCE makes realpath available in gcc -if targetInfo.os == "cygwin" then - buildoptions { "-D_POSIX_SOURCE" } - filter { "toolset:gcc*" } - buildoptions { "-D_GNU_SOURCE" } -end - -function getPlatforms(targetInfo) - return { "x86", "x64", "aarch64" } -end - -workspace "slang" - -- We will support debug/release configuration and x86/x64 builds. - configurations { "Debug", "Release" } - platforms(getPlatforms(targetInfo)) - - if buildLocation then - location(buildLocation) - end - - flags "MultiProcessorCompile" - - -- - -- Make slang-test the startup project. - -- - -- https://premake.github.io/docs/startproject - startproject "slang-test" - - -- The output binary directory will be derived from the OS - -- and configuration options, e.g. `bin/windows-x64/debug/` - targetdir("bin/" .. targetName .. "/%{cfg.buildcfg:lower()}") - - 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 - -- linking warnings. - editandcontinue "Off" - - -- Once we've set up the common settings, we will make some tweaks - -- that only apply in a subset of cases. Each call to `filter()` - -- changes the "active" filter for subsequent commands. In - -- effect, those commands iwll be ignored when the conditions of - -- the filter aren't satisfied. - - -- Our `x64` platform should (obviously) target the x64 - -- architecture and similarly for x86. - -- - -- https://premake.github.io/docs/architecture/ - -- - filter { "platforms:x64" } - architecture "x64" - filter { "platforms:x86" } - architecture "x86" - filter { "platforms:aarch64" } - architecture "ARM64" - filter { "platforms:aarch64", "toolset:clang" } - buildoptions { "-arch arm64" } - linkoptions { "-arch arm64" } - - filter { "toolset:clang or gcc*" } - -- Makes all symbols hidden by default unless explicitly 'exported' - buildoptions { "-fvisibility=hidden" } - - filter { "toolset:clang or gcc*", "files:source/compiler-core/slang-dxc-compiler.cpp" } - -- For the DXC headers - buildoptions { "-fms-extensions" } - - -- Disable some warnings - filter { "toolset:clang or gcc*" } - buildoptions { - "-Wno-switch", - "-Wno-parentheses", - "-Wno-unused-local-typedefs", - } - filter { "toolset:gcc*", "language:C++" } - buildoptions { "-Wno-class-memaccess" } - -- If a function returns an address/reference to a local, we want it to produce an error, because - -- it probably means something very bad. - buildoptions { "-Werror=return-local-addr" } - filter { "toolset:clang", "language:C++" } - buildoptions { "-Wno-assume" } - filter { "toolset:clang or gcc*", "language:C++" } - buildoptions { "-Wno-reorder", "-Wno-invalid-offsetof" } - - -- Enable some warnings on clang/gcc which are on by default in MSVC - filter { "toolset:clang or gcc*", "language:C++" } - buildoptions { "-Wnarrowing" } - - -- When compiling the debug configuration, we want to turn - -- optimization off, make sure debug symbols are output, - -- and add the same preprocessor definition that VS - -- would add by default. - filter { "configurations:debug" } - optimize "Off" - symbols "On" - defines { "_DEBUG" } - -- staticruntime "Off" - -- For the release configuration we will turn optimizations on - -- (we do not yet micro-manage the optimization settings) - -- and set the preprocessor definition that VS would add by default. - filter { "configurations:release" } - optimize "On" - defines { "NDEBUG" } - - filter { "system:linux" } - links { "dl" } - -- - -- `--no-undefined` - by default if a symbol is not found in a link it will assume it will be resolved at runtime (!) - -- this option ensures that all the referenced symbols exist - -- - linkoptions{ "-Wl,-rpath,'$$ORIGIN',--no-as-needed,--no-undefined" } - -- allow libraries to be listed in any order (do not require dependency order) - linkgroups "On" - - filter {} - -- 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", "_ITERATOR_DEBUG_LEVEL=0" } - - if dxOnVk then - defines { "SLANG_CONFIG_DX_ON_VK" } - end - - if defaultSPIRVDirect then - defines { "SLANG_CONFIG_DEFAULT_SPIRV_DIRECT" } - end - -function dump(o) - if type(o) == 'table' then - local s = '{ ' - for k,v in pairs(o) do - if type(k) ~= 'number' then k = '"'..k..'"' end - s = s .. '['..k..'] = ' .. dump(v) .. ',' - end - return s .. '} ' - else - return tostring(o) - end -end - -function dumpTable(o) - local s = '{ ' - for k,v in pairs(o) do - if type(k) ~= 'number' then k = '"'..k..'"' end - s = s .. '['..k..'] = ' .. tostring(v) .. ',\n' - end - return s .. '} ' -end - -function getExecutableSuffix() - if(os.target() == "windows") then - return ".exe" - end - return "" -end --- --- We are now going to start defining the projects, where --- each project builds some binary artifact (an executable, --- library, etc.). --- --- All of our projects follow a common structure, so rather --- than reiterate a bunch of build settings, we define --- some subroutines that make the configuration as concise --- as possible. --- --- First, we will define a helper routine for adding all --- the relevant files from a given directory path: --- --- Note that this does not work recursively --- so projects that spread their source over multiple --- directories will need to take more steps. -function addSourceDir(path) - files - { - path .. "/*.cpp", -- C++ source files - path .. "/*.slang", -- Slang files (for our stdlib) - path .. "/*.h", -- Header files - path .. "/*.hpp", -- C++ style headers (for glslang) - path .. "/*.natvis", -- Visual Studio debugger visualization files - path .. "/*.natstepfilter", -- Visual Studio debugger step filter files - path .. "/*.natjmc", -- Visual Studio debugger step filter files - } - if os.target() == "macosx" then - files { path .. "/*.mm" } -- Objective-C++ files - filter { "files:**.mm" } - compileas "Objective-C++" - filter {} - end - removefiles - { - "**/*.meta.slang.h", - "**/slang-*generated*.h", - "**/gfx-unit-test/test-tmp*" - } -end - --- Adds CUDA dependency to a project -function addCUDAIfEnabled() - if type(cudaPath) == "string" and targetInfo.isWindows then - filter {} - includedirs { cudaPath .. "/include" } - includedirs { cudaPath .. "/include", cudaPath .. "/common/inc" } - links { "cuda" } - if optixPath then - defines { "RENDER_TEST_OPTIX" } - includedirs { optixPath .. "include/" } - end - - filter { "platforms:x86" } - libdirs { cudaPath .. "/lib/Win32/" } - - filter { "platforms:x64" } - libdirs { cudaPath .. "/lib/x64/" } - filter {} - return true - elseif enableCuda then - filter {} - if type(cudaPath) == "string" then - includedirs { cudaPath .. "/include" } - includedirs { cudaPath .. "/include" } - if optixPath then - defines { "GFX_OPTIX" } - includedirs { optixPath .. "include/" } - end - filter { "platforms:x86" } - libdirs { cudaPath .. "/lib32/" } - filter { "platforms:x64" } - libdirs { cudaPath .. "/lib64/" } - filter {} - links { "cuda" } - else - print "Error: CUDA is enabled but --cuda-sdk-path is not specified." - end - return true - end - return false -end - --- --- Next we will define a helper routine that all of our --- projects will bottleneck through. Here `name` is --- the name for the project (and the base name for --- whatever output file it produces), while `sourceDir` --- is the directory that holds the source. --- --- E.g., for the `slangc` project, the source code --- is nested in `source/`, so we'd (indirectly) call: --- --- baseSlangProject("slangc", "source/slangc") --- --- NOTE! This function will add any source from the sourceDir, *if* it's specified. --- Pass nil if adding files is not wanted. -function baseSlangProject(name, sourceDir) - - -- Start a new project in premake. This switches - -- the "current" project over to the newly created - -- one, so that subsequent commands affect this project. - -- - project(name) - - -- We need every project to have a stable UUID for - -- output formats (like Visual Studio and XCode projects) - -- that use UUIDs rather than names to uniquely identify - -- projects. If we don't have a stable UUID, then the - -- output files might have spurious diffs whenever we - -- re-run premake generation. - - if sourceDir then - uuid(os.uuid(name .. '|' .. sourceDir)) - else - -- If we don't have a sourceDir, the name will have to be enough - uuid(os.uuid(name)) - end - - -- Location could do with a better name than 'other' - but it seems as if %{cfg.buildcfg:lower()} and similar variables - -- is not available for location to expand. - location("build/" .. slangUtil.getBuildLocationName(targetInfo) .. "/" .. name) - - - -- The intermediate ("object") directory will use a similar - -- naming scheme to the output directory, but will also use - -- the project name to avoid cases where multiple projects - -- have source files with the same name. - -- - objdir("intermediate/" .. targetName .. "/%{cfg.buildcfg:lower()}/%{prj.name}") - - -- Treat C++ as the default language, projects in other languages can - -- override this later - -- - language "C++" - - -- By default, Premake generates VS project files that - -- reflect the directory structure of the source code. - -- While this is nice in principle, it creates messy - -- results in practice for our projects. - -- - -- Instead, we will use the `vpaths` feature to imitate - -- the default VS behavior of grouping files into - -- virtual subdirectories (VS calls them "filters") for - -- header and source files respectively. - -- - -- Note: We are setting `vpaths` using a list of key/value - -- tables instead of just a key/value table, since this - -- appears to be an (undocumented) way to fix the order - -- in which the filters are tested. Otherwise we have - -- issues where premake will nondeterministically decide - -- the check something against the `**.cpp` filter first, - -- and decide that a `foo.cpp.h` file should go into - -- the `"Source Files"` vpath. That behavior seems buggy, - -- but at least we appear to have a workaround. - -- - vpaths { - { ["Header Files"] = { "**.h", "**.hpp"} }, - { ["Source Files"] = { "**.cpp", "**.slang", "**.natvis", "**.natjmc" } }, - } - - -- Override default options for a project if necessary - - if overrideModule.addBaseProjectOptions then - overrideModule.addBaseProjectOptions() - end - - -- - -- Add the files in the sourceDir - -- NOTE! This doesn't recursively add files in subdirectories - -- - - if not not sourceDir then - addSourceDir(sourceDir) - end - - -- - -- Enable ASAN (address sanitizer) if requested. - -- - - if enableAsan then - if (targetInfo.isWindows) then - buildoptions { "/fsanitize=address" } - flags { "NoIncrementalLink" } - end - end - -end - - --- We can now use the `baseSlangProject()` subroutine to --- define helpers for the different categories of project --- in our source tree. --- --- For example, the Slang project has several tools that --- are used during building/testing, but don't need to --- be distributed. These always have their source code in --- `tools//`. --- -function tool(name) - -- We use the `group` command here to specify that the - -- next project we create shold be placed into a group - -- named "tools" in a generated IDE solution/workspace. - -- - -- This is used in the generated Visual Studio solution - -- to group all the tools projects together in a logical - -- sub-directory of the solution. - -- - group "tools" - - -- Now we invoke our shared project configuration logic, - -- specifying that the project lives under the `tools/` path. - -- - baseSlangProject(name, "tools/" .. name) - - -- Finally, we set the project "kind" to produce a console - -- application. This is a reasonable default for tools, - -- and it can be overriden because Premake is stateful, - -- and a subsequent call to `kind()` would overwrite this - -- default. - -- - kind "ConsoleApp" - - if not targetInfo.isWindows then - links { "pthread" } - end -end - --- "Standard" projects will be those that go to make the binary --- packages for slang: the shared libraries and executables. --- -function standardProject(name, sourceDir) - -- Because Premake is stateful, any `group()` call by another - -- project would still be in effect when we create a project - -- here (e.g., if somebody had called `tool()` before - -- `standardProject()`), so we are careful here to set the - -- group to an emptry string, which Premake treats as "no group." - -- - group "" - - baseSlangProject(name, sourceDir) -end - - -function toolSharedLibrary(name) - group "test-tool" - -- specifying that the project lives under the `tools/` path. - -- - baseSlangProject(name .. "-tool", "tools/" .. name) - - defines { "SLANG_SHARED_LIBRARY_TOOL" } - - kind "SharedLib" - - if not targetInfo.isWindows then - links { "pthread" } - end -end - -function exampleLibrary(name) - group "examples" - baseSlangProject(name, "examples/"..name) - kind "StaticLib" - includedirs { ".", "tools" } - links { "gfx", "slang", "platform", "gfx-util", "core"} - addCUDAIfEnabled(); -end - -exampleLibrary "example-base" - --- Finally we have the example programs that show how to use Slang. --- -function example(name) - -- Example programs go into an "example" group - group "examples" - - -- They have their source code under `examples//` - baseSlangProject(name, "examples/" .. name) - - -- Set up working directory to be the source directory - debugdir("examples/" .. name) - - -- By default, all of our examples are GUI applications. One some - -- platforms there is no meaningful distinction between GUI and - -- command-line applications, but it is significant on Windows and MacOS - -- - kind "WindowedApp" - - -- Every example needs to be able to include the `slang.h` header - -- if it is going to use Slang, so we might as well set up a suitable - -- include path here rather than make each example do it. - -- - -- Most of the examples also need the `gfx` library, - -- which lives under `tools/`, so we will add that to the path as well. - -- - includedirs { ".", "tools" } - - -- The examples also need to link against the slang library, - -- and the `gfx` abstraction layer (which in turn - -- depends on the `core` library). We specify all of that here, - -- rather than in each example. - links { "example-base", "slang", "gfx", "gfx-util", "platform", "core" } - - if not targetInfo.isWindows then - links { "pthread" } - end - - if targetInfo.isWindows then - else - if enableXlib then - defines { "SLANG_ENABLE_XLIB" } - libdirs { "/usr/X11/lib" } - links {"X11"} - end - end - - addCUDAIfEnabled(); -end - --- --- Create a project that is used as a build step, typically to --- build items needed for other dependencies ---- - -function generatorProject(name, sourcePath, projectKind) - -- We use the `group` command here to specify that the - -- next project we create shold be placed into a group - -- named "generator" in a generated IDE solution/workspace. - -- - -- This is used in the generated Visual Studio solution - -- to group all the tools projects together in a logical - -- sub-directory of the solution. - -- - group "generator" - - -- Set up the project, but do NOT add any source files. - baseSlangProject(name, sourcePath) - - -- By default the generator projects run a custom tool and don't - -- require any premake machinery to compile a binary for them. - if projectKind == nil then - kind "Utility" - else - kind (projectKind) - end - - if not targetInfo.isWindows then - links { "pthread" } - end -end - --- --- With all of these helper routines defined, we can now define the --- actual projects quite simply. For example, here is the entire --- declaration of the "Hello, World" example project: --- -example "hello-world" - kind "ConsoleApp" - includedirs {"external/vulkan/include"} - --- Note how we are calling our custom `example()` subroutine with --- the same syntax sugar that Premake usually advocates for their --- `project()` function. This allows us to treat `example` as --- a kind of specialized "subclass" of `project` --- - --- Let's go ahead and set up the projects for our other example now. -example "platform-test" - -example "triangle" - -example "ray-tracing" -example "ray-tracing-pipeline" - -example "autodiff-texture" - -example "gpu-printing" - kind "ConsoleApp" - -example "shader-toy" - -example "model-viewer" - -example "shader-object" - kind "ConsoleApp" - -example "cpu-com-example" - kind "ConsoleApp" - -example "cpu-hello-world" - kind "ConsoleApp" - -if enableAftermath then - example "nv-aftermath-example" - filter {} - - local aftermathIncludePath = path.join(aftermathPath, "include") - local aftermathLibPath = path.join(aftermathPath, "lib") - - -- Add the aftermath includes - - includedirs { aftermathIncludePath } - - -- Add the libs directory. - -- Additionally we need to copy dlls that are needed for aftermath usage such that they - -- are available from the executable. - - filter { "platforms:x86" } - local libPath = path.join(aftermathLibPath, "x86") - libdirs { libPath } - links { "GFSDK_Aftermath_Lib.x86" } - - postbuildcommands { - '{COPY} "$(SolutionDir)"' .. libPath .. '/*.* "%{cfg.targetdir}"' - } - - filter { "platforms:x64" } - local libPath = path.join(aftermathLibPath, "x64") - libdirs { libPath } - links { "GFSDK_Aftermath_Lib.x64" } - - postbuildcommands { - '{COPY} "$(SolutionDir)"' .. libPath .. '/*.* "%{cfg.targetdir}"' - } -end - --- Most of the other projects have more interesting configuration going --- on, so let's walk through them in order of increasing complexity. --- --- The `core` project is a static library that has all the basic types --- and routines that get shared across both the Slang compiler/runtime --- and the various tool projects. It's build is pretty simple: --- - -standardProject("core", "source/core") - uuid "F9BE7957-8399-899E-0C49-E714FDDD4B65" - kind "StaticLib" - -- We need the core library to be relocatable to be able to link with slang.so - pic "On" - - -- For our core implementation, we want to use the most - -- aggressive warning level supported by the target, and - -- to treat every warning as an error to make sure we - -- keep our code free of warnings. - -- - warnings "Extra" - - includedirs { "external/miniz" } - - if targetInfo.isWindows then - addSourceDir "source/core/windows" - else - addSourceDir "source/core/unix" - end - -standardProject("compiler-core", "source/compiler-core") - uuid "12C1E89D-F5D0-41D3-8E8D-FB3F358F8126" - kind "StaticLib" - -- We need the compiler-core library to be relocatable to be able to link with slang.so - pic "On" - - links { "core" } - - -- For our core implementation, we want to use the most - -- aggressive warning level supported by the target, and - -- to treat every warning as an error to make sure we - -- keep our code free of warnings. - -- - warnings "Extra" - - if targetInfo.isWindows then - addSourceDir "source/compiler-core/windows" - else - addSourceDir "source/compiler-core/unix" - end - -standardProject("slang-rt", "source/slang-rt") - uuid "DFC79D72-91DE-434C-871B-B3943B488BEB" - kind "SharedLib" - pic "On" - warnings "Extra" - links {"miniz", "lz4"} - includedirs { "external/miniz" } - defines { "SLANG_RT_DYNAMIC", "SLANG_RT_DYNAMIC_EXPORT" } - addSourceDir "source/core" - if targetInfo.isWindows then - addSourceDir "source/core/windows" - else - addSourceDir "source/core/unix" - links { "pthread" } - end - --- --- The cpp extractor is a tool that scans C++ header files to extract --- reflection like information, and generate files to handle --- RTTI fast/simply ---- - -tool "slang-cpp-extractor" - uuid "CA8A30D1-8FA9-4330-B7F7-84709246D8DC" - includedirs { "." } - - links { "compiler-core", "core" } - -tool "slang-spirv-embed-generator" - uuid "8da787cc-0e04-450f-8e29-88eac5ebe9bb" - includedirs { "." } - - links { "compiler-core", "core" } - -tool "slang-lookup-generator" - uuid "3242baa7-fc4c-4f76-83bc-e4403099dc1d" - includedirs { "." } - - links { "compiler-core", "core" } - -tool "slang-capability-generator" - uuid "FD16CA29-C66A-430A-822C-C09655088611" - includedirs { "." } - - links { "compiler-core", "core" } - -tool "test-process" - uuid "BE412850-4BB9-429A-877C-BFBC4B34186C" - includedirs { "." } - - links { "compiler-core", "core" } - -tool "test-server" - uuid "23149706-C12F-4329-B6AA-8266407C32D3" - includedirs { "." } - - links { "compiler-core", "core", "slang" } - -tool "slangd" - uuid "B2D63B45-92B0-40F7-B242-CCA4DFD64341" - includedirs { "." } - links { "compiler-core", "core", "slang" } - -tool "vk-pipeline-create" - uuid "9ED23316-AE8B-4018-9407-271F4DDB8CBA" - includedirs { ".", "external/vulkan/include"} - files { "examples/hello-world/vulkan-api.cpp", "examples/hello-world/vulkan-api.h" } - links { "slang", "gfx", "gfx-util", "platform", "core" } - --- --- --- `slang-generate` is a tool we use for source code generation on --- the compiler. It depends on the `core` library, so we need to --- declare that: --- - -tool "slang-generate" - uuid "66174227-8541-41FC-A6DF-4764FC66F78E" - links { "core" } - -tool "slang-embed" - uuid "7F773DD9-EB8F-2403-B43C-B49C2014B99C" - links { "core" } - --- --- The `slang-test` test driver also uses the `core` library, and it --- currently relies on include paths being set up so that it can find --- the core headers: --- - -tool "slang-test" - uuid "0C768A18-1D25-4000-9F37-DA5FE99E3B64" - includedirs { "." } - links { "compiler-core", "slang", "core", "miniz", "lz4" } - dependson { "slang-reflection-test-tool", "render-test-tool", "slang-unit-test-tool", "gfx-unit-test-tool" } - -- We want to set to the root of the project, but that doesn't seem to work with '.'. - -- So set a path that resolves to the same place. - debugdir("source/..") - if not targetInfo.isWindows then - links { "pthread" } - end - --- --- The reflection test harness `slang-reflection-test` is pretty --- simple, in that it only needs to link against the slang library --- to do its job: --- - -toolSharedLibrary "slang-reflection-test" - uuid "C5ACCA6E-C04D-4B36-8516-3752B3C13C2F" - - includedirs { "." } - - kind "SharedLib" - links { "core", "slang" } - --- --- The most complex testing tool we have is `render-test`, but from --- a build perspective the most interesting thing about it is that for --- our Windows build it requires a Windows 10 SDK. --- --- TODO: Try to make the build not require a fixed version of the Windows SDK. --- Ideally we should just specify a *minimum* version. --- --- This test also requires Vulkan headers which we've placed in the --- `external/` directory, and it also includes files from the `core` --- library in ways that require us to set up `source/` as an include path. --- --- TODO: Fix that requirement. --- - -toolSharedLibrary "render-test" - uuid "61F7EB00-7281-4BF3-9470-7C2EA92620C3" - - includedirs { ".", "external", "external/vulkan/include", "source", "tools/gfx", "tools/platform" } - links { "core", "compiler-core", "slang", "gfx", "gfx-util", "platform" } - if targetInfo.isWindows then - addSourceDir "tools/render-test/windows" - - systemversion "latest" - - -- For Windows targets, we want to copy - -- dxcompiler.dll, and dxil.dll from the Windows SDK redistributable - -- directory into the output directory. - -- d3dcompiler_47.dll is copied from the external/slang-binaries submodule. - postbuildcommands { '"$(SolutionDir)tools\\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/%{cfg.platform:lower()}/" "%{cfg.targetdir}/" "windows-%{cfg.platform:lower()}"'} - if (type(cudaPath) == "string") then - addSourceDir "tools/render-test/cuda" - end - end - if addCUDAIfEnabled() then - defines { "RENDER_TEST_CUDA" } - end - --- --- `gfx` is a abstraction layer for different GPU platforms. --- - -tool "gfx" - uuid "222F7498-B40C-4F3F-A704-DDEB91A4484A" - -- Unlike most of the code under `tools/`, this is a library - -- rather than a stand-alone executable. - kind "SharedLib" - links { "core", "slang" } - pic "On" - - defines { "SLANG_GFX_DYNAMIC", "SLANG_GFX_DYNAMIC_EXPORT" } - - includedirs { ".", "external", "external/vulkan/include", "source" } - - files {"slang-gfx.h"} - - -- Will compile across targets - addSourceDir "tools/gfx/apple" - addSourceDir "tools/gfx/cpu" - addSourceDir "tools/gfx/nvapi" - addSourceDir "tools/gfx/cuda" - addSourceDir "tools/gfx/debug-layer" - if targetInfo.isWindows then - postbuildcommands { - '{COPY} "$(SolutionDir)tools/gfx/gfx.slang" "%{cfg.targetdir}"', - '{COPY} "$(SolutionDir)tools/gfx/slang.slang" "%{cfg.targetdir}"' - } - else - postbuildcommands { - '{COPY} "' .. path.getabsolute("tools/gfx/gfx.slang") .. '" "%{cfg.targetdir}"', - '{COPY} "' .. path.getabsolute("tools/gfx/slang.slang") .. '" "%{cfg.targetdir}"', - } - end - - -- If aftermath is enabled we need a define to turn on debugging features withing GFX - - if enableAftermath then - defines { "GFX_NV_AFTERMATH" } - - local aftermathIncludePath = path.join(aftermathPath, "include") - local aftermathLibPath = path.join(aftermathPath, "lib") - - -- Add the aftermath includes - includedirs { aftermathIncludePath } - - -- Add the libs - -- - -- We don't copy the dlls as that is something the application should do. - - filter { "platforms:x86" } - local libPath = path.join(aftermathLibPath, "x86") - libdirs { libPath } - links { "GFSDK_Aftermath_Lib.x86" } - - filter { "platforms:x64" } - local libPath = path.join(aftermathLibPath, "x64") - libdirs { libPath } - links { "GFSDK_Aftermath_Lib.x64" } - - end - - -- To special case that we may be building using cygwin on windows. If 'true windows' we build for dx12/vk and run the script - -- If not we assume it's a cygwin/mingw type situation and remove files that aren't appropriate - if targetInfo.isWindows then - systemversion "latest" - - -- For Windows targets, we want to copy - -- dxcompiler.dll, and dxil.dll from the Windows SDK redistributable - -- directory into the output directory. - -- d3dcompiler_47.dll is copied from the external/slang-binaries submodule. - postbuildcommands { '"$(SolutionDir)tools\\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/%{cfg.platform:lower()}/" "%{cfg.targetdir}/"'} - - addSourceDir "tools/gfx/vulkan" - addSourceDir "tools/gfx/open-gl" - addSourceDir "tools/gfx/d3d" - addSourceDir "tools/gfx/d3d11" - addSourceDir "tools/gfx/d3d12" - elseif targetInfo.os == "mingw" or targetInfo.os == "cygwin" then - -- Don't support any render techs... - elseif os.target() == "macosx" then - addSourceDir "tools/gfx/vulkan" - else - -- Linux like - addSourceDir "tools/gfx/vulkan" - if dxOnVk then - addSourceDir "tools/gfx/d3d" - addSourceDir "tools/gfx/d3d11" - addSourceDir "tools/gfx/d3d12" - end - --addSourceDir "tools/gfx/open-gl" - end - - if os.target() == "macosx" then - links { "Cocoa.framework", "QuartzCore.framework" } - end - - if enableXlib then - defines { "SLANG_ENABLE_XLIB" } - libdirs { "/usr/X11/lib" } - links {"X11"} - end - - -- If NVAPI is enabled - if enableNvapi then - -- Add the include path - includedirs { nvapiPath } - - -- Add a define so that render-test code can check if nvapi is available - defines { "GFX_NVAPI" } - - -- Set the nvapi libs directory - filter { "platforms:x86" } - libdirs { nvapiPath .. "/x86" } - links { "nvapi" } - - filter { "platforms:x64" } - libdirs { nvapiPath .. "/amd64" } - links { "nvapi64" } - - end - if addCUDAIfEnabled() then - defines { "GFX_ENABLE_CUDA" } - end - --- --- `gfx-util` is a static library containing utilities and helpers for using --- the `gfx` library. --- -tool "gfx-util" - uuid "F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B" - kind "StaticLib" - pic "On" - - includedirs { ".", "source" } - - addSourceDir "tools/gfx-util" --- --- `platform` contains all the platform abstractions for a GUI application. --- -tool "platform" - uuid "3565fe5e-4fa3-11eb-ae93-0242ac130002" - kind "SharedLib" - pic "On" - links {"core", "slang", "gfx" } - defines { "SLANG_PLATFORM_DYNAMIC", "SLANG_PLATFORM_DYNAMIC_EXPORT" } - includedirs { ".", "external", "source", "external/imgui", "tools/gfx" } - addSourceDir "tools/platform" - addSourceDir "tools/platform/linux" - addSourceDir "tools/platform/windows" - addSourceDir "tools/platform/apple" - addSourceDir "tools/platform/placeholder" - -- Include windowing support on Windows. - if targetInfo.isWindows then - systemversion "latest" - elseif os.target() == "macosx" then - links { "Cocoa.framework", "QuartzCore.framework" } - else - if enableXlib then - defines { "SLANG_ENABLE_XLIB" } - libdirs { "/usr/X11/lib" } - links {"X11"} - end - end - --- --- The `slangc` command-line application is just a very thin wrapper --- around the Slang dynamic library, so its build is extermely simple. --- One windows `slangc` uses the the `core` library for some UTF-16 --- to UTF-8 string conversion before calling into `slang.dll`, so --- it also depends on `core`: --- - -standardProject("slangc", "source/slangc") - uuid "D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7" - kind "ConsoleApp" - links { "core", "slang" } - if not targetInfo.isWindows then - links { "pthread" } - end - -function getBuildDir(isArm64) - return "%{cfg.targetdir}" -end - -function astReflectGenerator(isArm64) - local builddir = getBuildDir() - - filter("files:**/slang-ast-reflect.h") - - buildmessage "C++ Extractor %{file.relpath}" - - local sourcePath = "%{file.directory}" - - -- Work out the output files - - local outputTypes = { "obj", "ast", "value" }; - - local outputTable = {} - - for key, outputType in ipairs(outputTypes) do - table.insert(outputTable, sourcePath .. "/slang-generated-" .. outputType .. ".h") - table.insert(outputTable, sourcePath .. "/slang-generated-" .. outputType .. "-macro.h") - end - - -- List all of the input files to be scanned - - local inputFiles = { "slang-ast-support-types.h", "slang-ast-base.h", "slang-ast-decl.h", "slang-ast-expr.h", "slang-ast-modifier.h", "slang-ast-stmt.h", "slang-ast-type.h", "slang-ast-val.h" } - - local options = { "-strip-prefix", "slang-", "-o", "slang-generated", "-output-fields", "-mark-suffix", "_CLASS"} - - -- Specify the actual command to run for this action. - -- - -- Note that we use a single-quoted Lua string and wrap the path - -- to the `slang-cpp-extractor` command in double quotes to avoid - -- confusing the Windows shell. It seems that Premake outputs that - -- path with forward slashes, which confused the shell if we don't - -- quote the executable path. - - local buildcmd = '"' .. builddir .. '/slang-cpp-extractor" -d ' .. sourcePath .. " " .. table.concat(inputFiles, " ") .. " " .. table.concat(options, " ") - - buildcommands { buildcmd } - - -- Specify the files output by the extactor - so custom action will run when these files are needed. - -- - buildoutputs(outputTable) - - -- Make it depend on the extractor tool itself - local buildInputTable = { builddir .. "/slang-cpp-extractor" .. getExecutableSuffix() } - for key, inputFile in ipairs(inputFiles) do - table.insert(buildInputTable, sourcePath .. "/" .. inputFile) - end - - -- - buildinputs(buildInputTable) -end - -function metaSlangGenerator() - local builddir = getBuildDir() - - filter("files:**.meta.slang") - - -- Specify the "friendly" message that should print to the build log for the action - buildmessage "slang-generate %{file.relpath}" - - -- Specify the actual command to run for this action. - -- - -- Note that we use a single-quoted Lua string and wrap the path - -- to the `slang-generate` command in double quotes to avoid - -- confusing the Windows shell. It seems that Premake outputs that - -- path with forward slashes, which confused the shell if we don't - -- quote the executable path. - -- - buildcommands { '"' .. builddir .. '/slang-generate" %{file.relpath}' } - - -- Given `foo.meta.slang` we woutput `foo.meta.slang.h`. - -- This needs to be specified because the custom action will only - -- run when this file needs to be generated. - -- - -- Note the use of abspath here, this ensures windows tests the correct file, otherwise - -- triggering doesn't work. The problem still remains on linux, because abspath *isn't* an - -- absolute path, it remains relative. - -- - -- TODO(JS): - -- It's not clear how to determine how to create the absolute path on linux, using - -- path.absolutepath, requires knowing the path to be relative to, and it's neither - -- the current path, the source path or the targetpath. - buildoutputs { "%{file.abspath}.h" } - - -- We will specify an additional build input dependency on the `slang-generate` - -- tool itself, so that changes to the code for the tool cause the generation - -- step to be re-run. - -- - -- In order to get the file name right, we need to know the executable suffix - -- that the target platform will use. Premake might have a built-in way to - -- query this, but I couldn't find it, so I am just winging it for now: - -- - -- - buildinputs { builddir .. "/slang-generate" .. getExecutableSuffix() } -end - -function preludeGenerator() - local builddir = getBuildDir() - - filter("files:prelude/*-prelude.h") - - buildmessage "slang-embed %{file.relpath}" - buildcommands { '"' .. builddir .. '/slang-embed" %{file.relpath}' } - buildoutputs { "%{file.abspath}.cpp" } - buildinputs { builddir .. "/slang-embed" .. getExecutableSuffix() } -end - -function capabilityGenerator() - filter("files:source/slang/*.capdef") - - dependson { "slang-capability-generator" } - local inputFile = "%{file.abspath}" - local builddir = getBuildDir() - local outputHeaderFile = "%{wks.location}/source/slang/slang-generated-capability-defs.h" - local outputCppFile = "%{wks.location}/source/slang/slang-generated-capability-defs-impl.h" - local outputLookupFile = "%{wks.location}/source/slang/slang-lookup-capability-defs.cpp" - if executeBinary then - buildmessage ("slang-capability-generator %{file.relpath}") - local buildcmd = '"' .. builddir .. '/slang-capability-generator" "%{file.abspath}"' - buildcommands { buildcmd } - buildinputs { "%{file.abspath}", builddir .. "/slang-capability-generator" .. getExecutableSuffix() } - buildoutputs (outputHeaderFile, outputCppFile, outputLookupFile) - end - - filter { } -end - -if not skipSourceGeneration then - -generatorProject("run-generators", nil) - - -- We make 'source/slang' the location of the source, to make paths to source - -- relative to that - - -- We include these, even though they are not really part of the dummy - -- build, so that the filters below can pick up the appropriate locations. - - files - { - "source/slang/*.meta.slang", -- The stdlib files - "source/slang/slang-ast-reflect.h", -- C++ reflection - "prelude/*.h", -- The prelude files - "source/slang/*.capdef", - - -- - -- To build we need to have some source! It has to be a source file that - -- does not depend on anything that is generated, so we take something - -- from core that will compile without any generation. - -- - - "source/core/slang-string.cpp", - } - - -- First, we need to ensure that various source-generation tools - -- get built before `slang`, so we declare a non-linking dependency between - -- the projects here: - dependson { "slang-cpp-extractor", "slang-generate", "slang-embed", "slang-capability-generator" } - - local executableSuffix = getExecutableSuffix() - - -- We need to run the C++ extractor to generate some include files - if executeBinary then - astReflectGenerator() - end - - -- Next, we want to add a custom build rule for each of the - -- files that makes up the standard library. Those are - -- always named `*.meta.slang`, so we can select for them - -- using a `filter` and then use Premake's support for - -- defining custom build commands: - -- - if executeBinary then - metaSlangGenerator() - preludeGenerator() - capabilityGenerator() - end - - filter { } - -generatorProject("generate-spirv-embed") - tables = { - { - json = "external/spirv-headers/include/spirv/unified1/spirv.core.grammar.json", - }, - } - for _, t in pairs(tables) do - files {t.json} - end - - dependson { "slang-spirv-embed-generator" } - - local builddir = getBuildDir() - if executeBinary then - for _, t in pairs(tables) do - filter("files:" .. t.json) - - local inJson = "%{file.abspath}" - local cppFilename = "slang-spirv-core-grammar-embed.cpp" - local cppPath = "%{wks.location}/source/slang/" .. cppFilename - local buildcmd = '"' .. builddir .. '/slang-spirv-embed-generator" ' - .. inJson .. " " - .. cppPath - - buildmessage ("slang-spirv-embed-generator for " .. cppFilename) - buildcommands { buildcmd } - buildinputs { inJson, builddir .. "/slang-spirv-embed-generator" .. getExecutableSuffix() } - buildoutputs (cppPath) - end - end - - filter { } - -generatorProject("generate-lookup-tables") - tables = { - { - json = "external/spirv-headers/include/spirv/unified1/extinst.glsl.std.450.grammar.json", - header = "spirv/unified1/GLSL.std.450.h", - prefix = "GLSLstd450", - type = "GLSLstd450" - }, - } - for _, t in pairs(tables) do - files {t.json} - end - - dependson { "slang-lookup-generator" } - - local builddir = getBuildDir() - if executeBinary then - for _, t in pairs(tables) do - filter("files:" .. t.json) - - local inJson = "%{file.abspath}" - local cppFilename = "slang-lookup-" .. t.type:lower() .. ".cpp" - local cppPath = "%{wks.location}/source/slang/" .. cppFilename - local buildcmd = '"' .. builddir .. '/slang-lookup-generator" ' - .. inJson .. " " - .. cppPath .. " " - .. t.type .. " " - .. t.prefix .. " " - .. t.header - - buildmessage ("slang-lookup-generator for " .. cppFilename) - buildcommands { buildcmd } - buildinputs { inJson, builddir .. "/slang-lookup-generator" .. getExecutableSuffix() } - buildoutputs (cppPath) - end - end - - filter { } - -if enableEmbedStdLib then - standardProject("slangc-bootstrap", "source/slangc") - uuid "6339BF31-AC99-4819-B719-679B63451EF0" - kind "ConsoleApp" - links { "core", "compiler-core", "miniz", "lz4" } - - -- We need to run all the generators to be able to build the main - -- slang source in source/slang - - dependson { "run-generators" } - - defines { - -- We are going statically link Slang compiler with the slangc command line - "SLANG_STATIC", - -- This is the bootstrap to produce the embedded stdlib, so we disable to be able to bootstrap - "SLANG_WITHOUT_EMBEDDED_STD_LIB" - } - - includedirs { "external/spirv-headers/include", "source" } - - -- Add all of the slang source - addSourceDir "source/slang" - - -- On some tests with MSBuild disabling these made build work. - -- flags { "NoIncrementalLink", "NoPCH", "NoMinimalRebuild" } - - -- The `standardProject` operation already added all the code in - -- `source/slang/*`, but we also want to incldue the umbrella - -- `slang.h` header in this prject, so we do that manually here. - files { "slang.h" } - - files { "source/core/core.natvis" } - - -- We explicitly name the prelude file(s) that we need to - -- compile for their embedded code, since they will not - -- exist at the time projects/makefiles are generated, - -- and thus a glob would not match anything. - files { - "prelude/slang-cuda-prelude.h.cpp", - "prelude/slang-hlsl-prelude.h.cpp", - "prelude/slang-cpp-prelude.h.cpp", - "prelude/slang-cpp-host-prelude.h.cpp", - "prelude/slang-torch-prelude.h.cpp", - "source/slang/slang-lookup-glslstd450.cpp", - "source/slang/slang-lookup-capability-defs.cpp" - } - if not targetInfo.isWindows then - links { "pthread" } - end -end - -if enableEmbedStdLib then - generatorProject("embed-stdlib-generator", nil, "SharedLib") - - -- We include these, even though they are not really part of the dummy - -- build, so that the filters below can pick up the appropriate locations. - - files - { - -- - -- To build we need to have some source! It has to be a source file that - -- does not depend on anything that is generated, so we take something - -- from core that will compile without any generation. - -- - - "source/slang/slang-stdlib-api.cpp", - } - - -- Only produce the embedded stdlib if that option is enabled - - local executableSuffix = getExecutableSuffix() - - -- We need slangc-bootstrap to build the embedded stdlib - dependson { "slangc-bootstrap" } - - local absDirectory = path.getabsolute("source/slang") - local absOutputPath = absDirectory .. "/slang-stdlib-generated.h" - - -- I don't know why I need a filter, but without it nothing works (!) - filter("files:source/slang/slang-stdlib-api.cpp") - -- Note! Has to be an absolute path else doesn't work(!) - buildoutputs { absOutputPath } - filter("files:source/slang/slang-stdlib-api.cpp") - - filter(f) - buildinputs { "%{cfg.targetdir}/slangc-bootstrap" .. executableSuffix } - buildcommands { '"%{cfg.targetdir}/slangc-bootstrap" -archive-type riff-lz4 -save-stdlib-bin-source "%{file.directory}/slang-stdlib-generated.h"' } -end -end -- not skipSourceGeneration - --- --- TODO: Slang's current `Makefile` build does some careful incantations --- to make sure that the binaries it generates use a "relative `RPATH`" --- for loading shared libraries, so that Slang is not dependent on --- being installed to a fixed path on end-user machines. Before we --- can use Premake for the Linux build (or eventually MacOS) we would --- need to figure out how to replicate this incantation in premake. --- - --- --- Now that we've gotten all the simple projects out of the way, it is time --- to get into the more serious build steps. --- --- First up is the `slang` dynamic library project: --- - -standardProject("slang", "source/slang") - uuid "DB00DA62-0533-4AFD-B59F-A67D5B3A0808" - kind "SharedLib" - 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*. - -- - defines { "SLANG_DYNAMIC_EXPORT" } - - if disableStdlibSource then - defines { "SLANG_DISABLE_STDLIB_SOURCE" } - end - - if fullDebugValidation then - defines { "SLANG_ENABLE_FULL_IR_VALIDATION" } - end - - if enableEmbedStdLib then - -- We only have this dependency if we are embedding stdlib - if not skipSourceGeneration then - dependson { "embed-stdlib-generator" } - end - else - -- Disable StdLib embedding - defines { "SLANG_WITHOUT_EMBEDDED_STD_LIB" } - end - - includedirs { "external/spirv-headers/include", "source" } - - -- On some tests with MSBuild disabling these made build work. - -- flags { "NoIncrementalLink", "NoPCH", "NoMinimalRebuild" } - - -- The `standardProject` operation already added all the code in - -- `source/slang/*`, but we also want to incldue the umbrella - -- `slang.h` header in this prject, so we do that manually here. - files { "slang.h" } - - files { "source/core/core.natvis" } - - -- We explicitly name the prelude file(s) that we need to - -- compile for their embedded code, since they will not - -- exist at the time projects/makefiles are generated, - -- and thus a glob would not match anything. - files { - "prelude/slang-cuda-prelude.h.cpp", - "prelude/slang-hlsl-prelude.h.cpp", - "prelude/slang-cpp-prelude.h.cpp", - "prelude/slang-cpp-host-prelude.h.cpp", - "prelude/slang-torch-prelude.h.cpp" - } - - -- Similarly for any generated lookup tables - files { - "source/slang/slang-lookup-glslstd450.cpp", - "source/slang/slang-lookup-capability-defs.cpp", - "source/slang/slang-generated-capability-defs.h", - "source/slang/slang-generated-capability-defs-impl.h", - } - - -- - -- The most challenging part of building `slang` is that we need - -- to invoke generators such as slang-cpp-extractor and slang-generate - -- to generate. We do this by executing the run-generators 'dummy' project - -- which produces the appropriate source - - if not skipSourceGeneration then - dependson { "run-generators" } - dependson { "generate-lookup-tables" } - dependson { "generate-capabilities" } - dependson { "generate-spirv-embed" } - end - - -- If we have slang-llvm copy it - local slangLLVMPath = deps:getProjectRelativePath("slang-llvm", "../../..") - - if slangLLVMPath and deployLLVM then - filter { "system:linux or macosx or windows" } - local sharedLibName = slangUtil.getSharedLibraryFileName(targetInfo, "slang-llvm") - postbuildcommands { - "{COPY} " .. slangLLVMPath .."/bin/" .. targetName .. "/release/" .. sharedLibName .. " %{cfg.targetdir}" - } - end - - local slangGlslangPath = deps:getProjectRelativePath("slang-glslang", "../../..") - - -- If we are not building glslang from source, then be - -- sure to copy a binary copy over to the output directory - if not buildGlslang and slangGlslangPath~=nil and deployGLSLang then - filter { "system:linux or macosx or windows" } - local sharedLibName = slangUtil.getSharedLibraryFileName(targetInfo, "slang-glslang") - postbuildcommands { - "{COPY} " .. slangGlslangPath .. "/bin/" .. targetName .. "/release/" .. sharedLibName .. " %{cfg.targetdir}" - } - end - - filter {"configurations:debug"} - defines { "SLANG_ENABLE_IR_BREAK_ALLOC=1" } - filter {} - - if not targetInfo.isWindows then - links { "pthread" } - end - -toolSharedLibrary "gfx-unit-test" - uuid "092DAB9F-1DA5-4538-ADD7-1A8D1DBFD519" - includedirs { "." } - addSourceDir "tools/unit-test" - links { "core", "slang", "gfx", "gfx-util", "platform" } - -toolSharedLibrary "slang-unit-test" - uuid "0162864E-7651-4B5E-9105-C571105276EA" - includedirs { "." } - addSourceDir "tools/unit-test" - links { "lz4", "miniz", "core", "compiler-core", "slang" } - if not targetInfo.isWindows then - links { "pthread" } - end - -if enableProfile then - tool "slang-profile" - uuid "375CC87D-F34A-4DF1-9607-C5C990FD6227" - - -- gprof needs symbols - symbols "On" - - dependson { "slang" } - - includedirs { "external/spirv-headers/include" } - - defines { "SLANG_STATIC", - -- Disable StdLib embedding - "SLANG_WITHOUT_EMBEDDED_STD_LIB" - } - - -- The `standardProject` operation already added all the code in - -- `source/slang/*`, but we also want to incldue the umbrella - -- `slang.h` header in this prject, so we do that manually here. - files { "slang.h" } - - files { "source/core/core.natvis" } - - -- We explicitly name the prelude file(s) that we need to - -- compile for their embedded code, since they will not - -- exist at the time projects/makefiles are generated, - -- and thus a glob would not match anything. - files { - "prelude/slang-cuda-prelude.h.cpp", - "prelude/slang-hlsl-prelude.h.cpp", - "prelude/slang-cpp-prelude.h.cpp", - "prelude/slang-cpp-host-prelude.h.cpp", - "prelude/slang-torch-prelude.h.cpp" - } - - -- Add the slang source - addSourceDir "source/slang" - - includedirs { "." } - links { "core", "compiler-core", "miniz", "lz4"} - - filter { "system:linux" } - linkoptions{ "-pg" } - buildoptions{ "-pg" } - -end - -standardProject("miniz", nil) - uuid "E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F" - kind "StaticLib" - pic "On" - - -- Add the files explicitly - language "C" - files - { - "external/miniz/miniz.c", - "external/miniz/miniz_tdef.c", - "external/miniz/miniz_tinfl.c", - "external/miniz/miniz_zip.c" - } - - -- A file usually created by miniz's build system - io.writefile("external/miniz/miniz_export.h", "#define MINIZ_EXPORT") - -- Miniz redefines this, so remove it for this project - removedefines "WIN32_LEAN_AND_MEAN" - - filter { "system:linux" } - defines { "_LARGEFILE64_SOURCE" } - - filter { "system:linux or macosx" } - links { "dl"} - -standardProject("lz4", nil) - uuid "E1EC8075-823E-46E5-BC38-C124CCCDF878" - kind "StaticLib" - pic "On" - - -- Add the files explicitly - language "C" - files - { - "external/lz4/lib/lz4.c", - "external/lz4/lib/lz4.h", - } - - filter { "system:linux or macosx" } - links { "dl"} - -if buildGlslang then - -standardProject("slang-spirv-tools", nil) - uuid "C36F6185-49B3-467E-8388-D0E9BF5F7BB8" - kind "StaticLib" - pic "On" - - includedirs { "external/spirv-tools", "external/spirv-tools/include", "external/spirv-headers/include", "external/spirv-tools-generated"} - - addSourceDir("external/spirv-tools/source") - addSourceDir("external/spirv-tools/source/opt") - addSourceDir("external/spirv-tools/source/util") - addSourceDir("external/spirv-tools/source/val") - - filter { "system:linux or macosx" } - links { "dl"} --- --- The single most complicated part of our build is our custom version of glslang. --- Is not really set up to produce a shared library with a usable API, so we have --- our own custom shim API around it to invoke GLSL->SPIRV compilation. --- --- Glslang normally relies on a CMake-based build process, and its code is spread --- across multiple directories with implicit dependencies on certain command-line --- definitions. --- --- The following is a tailored build of glslang that pulls in the pieces we care --- about whle trying to leave out the rest: --- -standardProject("slang-glslang", "source/slang-glslang") - uuid "C495878A-832C-485B-B347-0998A90CC936" - kind "SharedLib" - pic "On" - cppdialect "C++17" - includedirs { "external/glslang", "external/spirv-tools", "external/spirv-tools/include", "external/spirv-headers/include", "external/spirv-tools-generated", "external/glslang-generated" } - - defines - { - -- `ENABLE_OPT` must be defined (to either zero or one) for glslang to compile at all - "ENABLE_OPT=1", - - -- We want to build a version of glslang that supports every feature possible, - -- so we will enable all of the supported vendor-specific extensions so - -- that they can be used in Slang-generated GLSL code when required. - -- - "AMD_EXTENSIONS", - "NV_EXTENSIONS", - } - - -- We will add source code from every directory that is required to get a - -- minimal GLSL->SPIR-V compilation path working. - addSourceDir("external/glslang/glslang/GenericCodeGen") - addSourceDir("external/glslang/glslang/MachineIndependent") - addSourceDir("external/glslang/glslang/MachineIndependent/preprocessor") - addSourceDir("external/glslang/OGLCompilersDLL") - addSourceDir("external/glslang/SPIRV") - addSourceDir("external/glslang/StandAlone") - - -- Unfortunately, blindly adding files like that also pulled in a declaration - -- of a main entry point that we do *not* want, so we will specifically - -- exclude that file from our build. - removefiles { "external/glslang/StandAlone/StandAlone.cpp" } - - -- Glslang includes some platform-specific code around DLL setup/teardown - -- and handling of thread-local storage for its multi-threaded mode. We - -- don't really care about *any* of that, but we can't remove it from the - -- build so we need to include the appropriate platform-specific sources. - - links { "slang-spirv-tools"} - - filter { "system:windows" } - -- On Windows we need to add the platform-specific sources and then - -- remove the `main.cpp` file since it tries to define a `DllMain` - -- and we don't want the default glslang one. - addSourceDir( "external/glslang/glslang/OSDependent/Windows") - removefiles { "external/glslang/glslang/OSDependent/Windows/main.cpp" } - - filter { "system:linux or macosx" } - addSourceDir( "external/glslang/glslang/OSDependent/Unix") - links { "dl", "pthread" } - --- --- With glslang's build out of the way, we've now covered everything we have --- to build to get Slang and its tools/examples built. --- --- What is not included in this file yet is support for any custom `make` --- targets for: --- --- * Invoking the test runner --- * Packaging up binaries --- * "Installing" Slang on a user's machine --- - -end From d162f335c00c58f652dd73ff0bc4106a2a8b9828 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 8 Mar 2024 00:12:40 +0800 Subject: [PATCH 002/137] Remove premake generated vs project --- .../autodiff-texture/autodiff-texture.vcxproj | 313 ---- .../autodiff-texture.vcxproj.filters | 33 - .../compiler-core/compiler-core.vcxproj | 378 ----- .../compiler-core.vcxproj.filters | 312 ---- .../core-test-tool/core-test-tool.vcxproj | 194 --- .../core-test-tool.vcxproj.filters | 57 - build/visual-studio/core/core.vcxproj | 407 ----- build/visual-studio/core/core.vcxproj.filters | 392 ----- .../cpu-com-example/cpu-com-example.vcxproj | 308 ---- .../cpu-com-example.vcxproj.filters | 18 - .../cpu-hello-world/cpu-hello-world.vcxproj | 308 ---- .../cpu-hello-world.vcxproj.filters | 18 - .../example-base/example-base.vcxproj | 299 ---- .../example-base/example-base.vcxproj.filters | 21 - .../generate-capabilities.vcxproj | 164 -- .../generate-lookup-tables.vcxproj | 164 -- .../generate-lookup-tables.vcxproj.filters | 25 - .../generate-spirv-embed.vcxproj | 164 -- .../gfx-test-tool/gfx-test-tool.vcxproj | 197 --- .../gfx-test-tool.vcxproj.filters | 35 - .../gfx-unit-test-tool.vcxproj | 374 ----- .../gfx-unit-test-tool.vcxproj.filters | 206 --- build/visual-studio/gfx-util/gfx-util.vcxproj | 282 ---- .../gfx-util/gfx-util.vcxproj.filters | 21 - build/visual-studio/gfx/gfx.vcxproj | 578 ------- build/visual-studio/gfx/gfx.vcxproj.filters | 752 --------- .../gpu-printing/gpu-printing.vcxproj | 314 ---- .../gpu-printing/gpu-printing.vcxproj.filters | 35 - .../graphics-app-framework.vcxproj | 175 --- .../graphics-app-framework.vcxproj.filters | 36 - .../hello-world/hello-world.vcxproj | 312 ---- .../hello-world/hello-world.vcxproj.filters | 29 - build/visual-studio/lz4/lz4.vcxproj | 276 ---- build/visual-studio/lz4/lz4.vcxproj.filters | 27 - build/visual-studio/miniz/miniz.vcxproj | 276 ---- .../model-viewer/model-viewer.vcxproj | 308 ---- .../model-viewer/model-viewer.vcxproj.filters | 18 - .../platform-test/platform-test.vcxproj | 305 ---- .../platform-test.vcxproj.filters | 13 - build/visual-studio/platform/platform.vcxproj | 316 ---- .../platform/platform.vcxproj.filters | 51 - .../ray-tracing-pipeline.vcxproj | 308 ---- .../ray-tracing-pipeline.vcxproj.filters | 18 - .../ray-tracing/ray-tracing.vcxproj | 308 ---- .../ray-tracing/ray-tracing.vcxproj.filters | 18 - .../render-test-tool/render-test-tool.vcxproj | 345 ----- .../render-test-tool.vcxproj.filters | 57 - .../run-generators/run-generators.vcxproj | 343 ----- .../run-generators.vcxproj.filters | 71 - .../shader-object/shader-object.vcxproj | 308 ---- .../shader-object.vcxproj.filters | 18 - .../shader-toy/shader-toy.vcxproj | 309 ---- .../shader-toy/shader-toy.vcxproj.filters | 21 - .../slang-capability-generator.vcxproj | 296 ---- ...slang-capability-generator.vcxproj.filters | 21 - .../slang-cpp-extractor.vcxproj | 314 ---- .../slang-cpp-extractor.vcxproj.filters | 75 - .../slang-embed/slang-embed.vcxproj | 284 ---- .../slang-embed/slang-embed.vcxproj.filters | 13 - .../slang-generate/slang-generate.vcxproj | 284 ---- .../slang-generate.vcxproj.filters | 13 - .../slang-lookup-generator.vcxproj | 293 ---- .../slang-lookup-generator.vcxproj.filters | 13 - .../slang-reflection-test-tool.vcxproj | 299 ---- ...slang-reflection-test-tool.vcxproj.filters | 13 - build/visual-studio/slang-rt/slang-rt.vcxproj | 429 ------ .../slang-rt/slang-rt.vcxproj.filters | 398 ----- .../slang-spirv-embed-generator.vcxproj | 293 ---- ...lang-spirv-embed-generator.vcxproj.filters | 13 - .../slang-test/slang-test.vcxproj | 317 ---- .../slang-test/slang-test.vcxproj.filters | 57 - .../slang-unit-test-tool.vcxproj | 341 ---- .../slang-unit-test-tool.vcxproj.filters | 107 -- build/visual-studio/slang/slang.vcxproj | 784 ---------- .../visual-studio/slang/slang.vcxproj.filters | 1369 ----------------- build/visual-studio/slangc/slangc.vcxproj | 287 ---- .../slangc/slangc.vcxproj.filters | 13 - build/visual-studio/slangd/slangd.vcxproj | 296 ---- .../slangd/slangd.vcxproj.filters | 13 - .../test-process/test-process.vcxproj | 293 ---- .../test-process/test-process.vcxproj.filters | 13 - .../test-server/test-server.vcxproj | 301 ---- .../test-server/test-server.vcxproj.filters | 27 - build/visual-studio/triangle/triangle.vcxproj | 308 ---- .../triangle/triangle.vcxproj.filters | 18 - .../vk-pipeline-create.vcxproj | 306 ---- .../vk-pipeline-create.vcxproj.filters | 24 - slang.sln | 659 -------- 88 files changed, 19219 deletions(-) delete mode 100644 build/visual-studio/autodiff-texture/autodiff-texture.vcxproj delete mode 100644 build/visual-studio/autodiff-texture/autodiff-texture.vcxproj.filters delete mode 100644 build/visual-studio/compiler-core/compiler-core.vcxproj delete mode 100644 build/visual-studio/compiler-core/compiler-core.vcxproj.filters delete mode 100644 build/visual-studio/core-test-tool/core-test-tool.vcxproj delete mode 100644 build/visual-studio/core-test-tool/core-test-tool.vcxproj.filters delete mode 100644 build/visual-studio/core/core.vcxproj delete mode 100644 build/visual-studio/core/core.vcxproj.filters delete mode 100644 build/visual-studio/cpu-com-example/cpu-com-example.vcxproj delete mode 100644 build/visual-studio/cpu-com-example/cpu-com-example.vcxproj.filters delete mode 100644 build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj delete mode 100644 build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj.filters delete mode 100644 build/visual-studio/example-base/example-base.vcxproj delete mode 100644 build/visual-studio/example-base/example-base.vcxproj.filters delete mode 100644 build/visual-studio/generate-capabilities/generate-capabilities.vcxproj delete mode 100644 build/visual-studio/generate-lookup-tables/generate-lookup-tables.vcxproj delete mode 100644 build/visual-studio/generate-lookup-tables/generate-lookup-tables.vcxproj.filters delete mode 100644 build/visual-studio/generate-spirv-embed/generate-spirv-embed.vcxproj delete mode 100644 build/visual-studio/gfx-test-tool/gfx-test-tool.vcxproj delete mode 100644 build/visual-studio/gfx-test-tool/gfx-test-tool.vcxproj.filters delete mode 100644 build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj delete mode 100644 build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj.filters delete mode 100644 build/visual-studio/gfx-util/gfx-util.vcxproj delete mode 100644 build/visual-studio/gfx-util/gfx-util.vcxproj.filters delete mode 100644 build/visual-studio/gfx/gfx.vcxproj delete mode 100644 build/visual-studio/gfx/gfx.vcxproj.filters delete mode 100644 build/visual-studio/gpu-printing/gpu-printing.vcxproj delete mode 100644 build/visual-studio/gpu-printing/gpu-printing.vcxproj.filters delete mode 100644 build/visual-studio/graphics-app-framework/graphics-app-framework.vcxproj delete mode 100644 build/visual-studio/graphics-app-framework/graphics-app-framework.vcxproj.filters delete mode 100644 build/visual-studio/hello-world/hello-world.vcxproj delete mode 100644 build/visual-studio/hello-world/hello-world.vcxproj.filters delete mode 100644 build/visual-studio/lz4/lz4.vcxproj delete mode 100644 build/visual-studio/lz4/lz4.vcxproj.filters delete mode 100644 build/visual-studio/miniz/miniz.vcxproj delete mode 100644 build/visual-studio/model-viewer/model-viewer.vcxproj delete mode 100644 build/visual-studio/model-viewer/model-viewer.vcxproj.filters delete mode 100644 build/visual-studio/platform-test/platform-test.vcxproj delete mode 100644 build/visual-studio/platform-test/platform-test.vcxproj.filters delete mode 100644 build/visual-studio/platform/platform.vcxproj delete mode 100644 build/visual-studio/platform/platform.vcxproj.filters delete mode 100644 build/visual-studio/ray-tracing-pipeline/ray-tracing-pipeline.vcxproj delete mode 100644 build/visual-studio/ray-tracing-pipeline/ray-tracing-pipeline.vcxproj.filters delete mode 100644 build/visual-studio/ray-tracing/ray-tracing.vcxproj delete mode 100644 build/visual-studio/ray-tracing/ray-tracing.vcxproj.filters delete mode 100644 build/visual-studio/render-test-tool/render-test-tool.vcxproj delete mode 100644 build/visual-studio/render-test-tool/render-test-tool.vcxproj.filters delete mode 100644 build/visual-studio/run-generators/run-generators.vcxproj delete mode 100644 build/visual-studio/run-generators/run-generators.vcxproj.filters delete mode 100644 build/visual-studio/shader-object/shader-object.vcxproj delete mode 100644 build/visual-studio/shader-object/shader-object.vcxproj.filters delete mode 100644 build/visual-studio/shader-toy/shader-toy.vcxproj delete mode 100644 build/visual-studio/shader-toy/shader-toy.vcxproj.filters delete mode 100644 build/visual-studio/slang-capability-generator/slang-capability-generator.vcxproj delete mode 100644 build/visual-studio/slang-capability-generator/slang-capability-generator.vcxproj.filters delete mode 100644 build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj delete mode 100644 build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj.filters delete mode 100644 build/visual-studio/slang-embed/slang-embed.vcxproj delete mode 100644 build/visual-studio/slang-embed/slang-embed.vcxproj.filters delete mode 100644 build/visual-studio/slang-generate/slang-generate.vcxproj delete mode 100644 build/visual-studio/slang-generate/slang-generate.vcxproj.filters delete mode 100644 build/visual-studio/slang-lookup-generator/slang-lookup-generator.vcxproj delete mode 100644 build/visual-studio/slang-lookup-generator/slang-lookup-generator.vcxproj.filters delete mode 100644 build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj delete mode 100644 build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj.filters delete mode 100644 build/visual-studio/slang-rt/slang-rt.vcxproj delete mode 100644 build/visual-studio/slang-rt/slang-rt.vcxproj.filters delete mode 100644 build/visual-studio/slang-spirv-embed-generator/slang-spirv-embed-generator.vcxproj delete mode 100644 build/visual-studio/slang-spirv-embed-generator/slang-spirv-embed-generator.vcxproj.filters delete mode 100644 build/visual-studio/slang-test/slang-test.vcxproj delete mode 100644 build/visual-studio/slang-test/slang-test.vcxproj.filters delete mode 100644 build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj delete mode 100644 build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj.filters delete mode 100644 build/visual-studio/slang/slang.vcxproj delete mode 100644 build/visual-studio/slang/slang.vcxproj.filters delete mode 100644 build/visual-studio/slangc/slangc.vcxproj delete mode 100644 build/visual-studio/slangc/slangc.vcxproj.filters delete mode 100644 build/visual-studio/slangd/slangd.vcxproj delete mode 100644 build/visual-studio/slangd/slangd.vcxproj.filters delete mode 100644 build/visual-studio/test-process/test-process.vcxproj delete mode 100644 build/visual-studio/test-process/test-process.vcxproj.filters delete mode 100644 build/visual-studio/test-server/test-server.vcxproj delete mode 100644 build/visual-studio/test-server/test-server.vcxproj.filters delete mode 100644 build/visual-studio/triangle/triangle.vcxproj delete mode 100644 build/visual-studio/triangle/triangle.vcxproj.filters delete mode 100644 build/visual-studio/vk-pipeline-create/vk-pipeline-create.vcxproj delete mode 100644 build/visual-studio/vk-pipeline-create/vk-pipeline-create.vcxproj.filters delete mode 100644 slang.sln diff --git a/build/visual-studio/autodiff-texture/autodiff-texture.vcxproj b/build/visual-studio/autodiff-texture/autodiff-texture.vcxproj deleted file mode 100644 index b9b872836a..0000000000 --- a/build/visual-studio/autodiff-texture/autodiff-texture.vcxproj +++ /dev/null @@ -1,313 +0,0 @@ - - - - - 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;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(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 deleted file mode 100644 index cf46bc2573..0000000000 --- a/build/visual-studio/autodiff-texture/autodiff-texture.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {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 deleted file mode 100644 index 22a19abb96..0000000000 --- a/build/visual-studio/compiler-core/compiler-core.vcxproj +++ /dev/null @@ -1,378 +0,0 @@ - - - - - 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 - - - - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126} - true - Win32Proj - compiler-core - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - true - - - StaticLibrary - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - - - - - - - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\compiler-core\ - compiler-core - .lib - - - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\compiler-core\ - compiler-core - .lib - - - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\compiler-core\ - compiler-core - .lib - - - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\compiler-core\ - compiler-core - .lib - - - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\compiler-core\ - compiler-core - .lib - - - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\compiler-core\ - compiler-core - .lib - - - - NotUsing - Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/compiler-core/compiler-core.vcxproj.filters b/build/visual-studio/compiler-core/compiler-core.vcxproj.filters deleted file mode 100644 index eb1d52dfbe..0000000000 --- a/build/visual-studio/compiler-core/compiler-core.vcxproj.filters +++ /dev/null @@ -1,312 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - 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/core-test-tool/core-test-tool.vcxproj b/build/visual-studio/core-test-tool/core-test-tool.vcxproj deleted file mode 100644 index 3c44ba9f30..0000000000 --- a/build/visual-studio/core-test-tool/core-test-tool.vcxproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {0162864E-7651-4B5E-9105-C571105276EA} - true - Win32Proj - core-test-tool - - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - false - Unicode - v142 - - - DynamicLibrary - false - Unicode - v142 - - - - - - - - - - - - - - - - - - - true - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\core-test-tool\ - core-test-tool - .dll - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\core-test-tool\ - core-test-tool - .dll - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\core-test-tool\ - core-test-tool - .dll - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\core-test-tool\ - core-test-tool - .dll - - - - NotUsing - Level3 - _DEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - EditAndContinue - Disabled - MultiThreadedDebug - - - Windows - true - ..\..\..\bin\windows-x86\debug\core-test-tool.lib - - - - - NotUsing - Level3 - _DEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - EditAndContinue - Disabled - MultiThreadedDebug - - - Windows - true - ..\..\..\bin\windows-x64\debug\core-test-tool.lib - - - - - NotUsing - Level3 - NDEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - - - Windows - true - true - ..\..\..\bin\windows-x86\release\core-test-tool.lib - - - - - NotUsing - Level3 - NDEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - - - Windows - true - true - ..\..\..\bin\windows-x64\release\core-test-tool.lib - - - - - - - - - - - - - - - - - - - - - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/core-test-tool/core-test-tool.vcxproj.filters b/build/visual-studio/core-test-tool/core-test-tool.vcxproj.filters deleted file mode 100644 index 8cf814b3ba..0000000000 --- a/build/visual-studio/core-test-tool/core-test-tool.vcxproj.filters +++ /dev/null @@ -1,57 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - 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/core/core.vcxproj b/build/visual-studio/core/core.vcxproj deleted file mode 100644 index aed281cd58..0000000000 --- a/build/visual-studio/core/core.vcxproj +++ /dev/null @@ -1,407 +0,0 @@ - - - - - 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 - - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - true - Win32Proj - core - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - true - - - StaticLibrary - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - - - - - - - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\core\ - core - .lib - - - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\core\ - core - .lib - - - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\core\ - core - .lib - - - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\core\ - core - .lib - - - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\core\ - core - .lib - - - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\core\ - core - .lib - - - - NotUsing - Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..\external\miniz;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..\external\miniz;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..\external\miniz;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..\external\miniz;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..\external\miniz;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..\external\miniz;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build/visual-studio/core/core.vcxproj.filters b/build/visual-studio/core/core.vcxproj.filters deleted file mode 100644 index 0c06e36f2e..0000000000 --- a/build/visual-studio/core/core.vcxproj.filters +++ /dev/null @@ -1,392 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - 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/cpu-com-example/cpu-com-example.vcxproj b/build/visual-studio/cpu-com-example/cpu-com-example.vcxproj deleted file mode 100644 index 1fe6298047..0000000000 --- a/build/visual-studio/cpu-com-example/cpu-com-example.vcxproj +++ /dev/null @@ -1,308 +0,0 @@ - - - - - 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 - - - - {0996B38F-F512-A7D2-1E90-A7E60A6C4366} - true - Win32Proj - cpu-com-example - - - - 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\cpu-com-example\ - cpu-com-example - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\cpu-com-example\ - cpu-com-example - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\cpu-com-example\ - cpu-com-example - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\cpu-com-example\ - cpu-com-example - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\cpu-com-example\ - cpu-com-example - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\cpu-com-example\ - cpu-com-example - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - 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/cpu-com-example/cpu-com-example.vcxproj.filters b/build/visual-studio/cpu-com-example/cpu-com-example.vcxproj.filters deleted file mode 100644 index a2d5310323..0000000000 --- a/build/visual-studio/cpu-com-example/cpu-com-example.vcxproj.filters +++ /dev/null @@ -1,18 +0,0 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj b/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj deleted file mode 100644 index ddd9e5753f..0000000000 --- a/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj +++ /dev/null @@ -1,308 +0,0 @@ - - - - - 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 - - - - {4B47A364-37C4-96A7-6041-97BB4C1D333B} - true - Win32Proj - cpu-hello-world - - - - 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\cpu-hello-world\ - cpu-hello-world - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\cpu-hello-world\ - cpu-hello-world - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\cpu-hello-world\ - cpu-hello-world - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\cpu-hello-world\ - cpu-hello-world - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\cpu-hello-world\ - cpu-hello-world - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\cpu-hello-world\ - cpu-hello-world - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - 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/cpu-hello-world/cpu-hello-world.vcxproj.filters b/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj.filters deleted file mode 100644 index fe6c957f87..0000000000 --- a/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj.filters +++ /dev/null @@ -1,18 +0,0 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/example-base/example-base.vcxproj b/build/visual-studio/example-base/example-base.vcxproj deleted file mode 100644 index 4579222726..0000000000 --- a/build/visual-studio/example-base/example-base.vcxproj +++ /dev/null @@ -1,299 +0,0 @@ - - - - - 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 - - - - {37BED5B5-23FA-D81F-8C0C-F1167867813A} - true - Win32Proj - example-base - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - true - - - StaticLibrary - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - - - - - - - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\example-base\ - example-base - .lib - - - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\example-base\ - example-base - .lib - - - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\example-base\ - example-base - .lib - - - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\example-base\ - example-base - .lib - - - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\example-base\ - example-base - .lib - - - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\example-base\ - example-base - .lib - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - - - - - - - {222F7498-B40C-4F3F-A704-DDEB91A4484A} - - - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} - - - {3565FE5E-4FA3-11EB-AE93-0242AC130002} - - - {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B} - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/example-base/example-base.vcxproj.filters b/build/visual-studio/example-base/example-base.vcxproj.filters deleted file mode 100644 index 7fbff776fe..0000000000 --- a/build/visual-studio/example-base/example-base.vcxproj.filters +++ /dev/null @@ -1,21 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/generate-capabilities/generate-capabilities.vcxproj b/build/visual-studio/generate-capabilities/generate-capabilities.vcxproj deleted file mode 100644 index 021eff9c95..0000000000 --- a/build/visual-studio/generate-capabilities/generate-capabilities.vcxproj +++ /dev/null @@ -1,164 +0,0 @@ - - - - - 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 - - - - {C765C62E-33D2-8129-FCC5-198768F1A391} - true - Win32Proj - generate-capabilities - - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - - - - - - - - - - - - - - - - - - - - - - - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\generate-capabilities\ - - - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\generate-capabilities\ - - - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\generate-capabilities\ - - - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\generate-capabilities\ - - - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\generate-capabilities\ - - - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\generate-capabilities\ - - - - - - - - - - - - - - - - Document - "../../../bin/windows-x86/debug/slang-capability-generator" "%(FullPath)" - "../../../bin/windows-x64/debug/slang-capability-generator" "%(FullPath)" - "../../../bin/windows-aarch64/debug/slang-capability-generator" "%(FullPath)" - "../../../bin/windows-x86/release/slang-capability-generator" "%(FullPath)" - "../../../bin/windows-x64/release/slang-capability-generator" "%(FullPath)" - "../../../bin/windows-aarch64/release/slang-capability-generator" "%(FullPath)" - ../../../source/slang/slang-generated-capability-defs.h - slang-capability-generator for source/slang/slang-capabilities.capdef - ../../../source/slang/slang-capabilities.capdef;../../../bin/windows-x86/debug/slang-capability-generator.exe - ../../../source/slang/slang-capabilities.capdef;../../../bin/windows-x64/debug/slang-capability-generator.exe - ../../../source/slang/slang-capabilities.capdef;../../../bin/windows-aarch64/debug/slang-capability-generator.exe - ../../../source/slang/slang-capabilities.capdef;../../../bin/windows-x86/release/slang-capability-generator.exe - ../../../source/slang/slang-capabilities.capdef;../../../bin/windows-x64/release/slang-capability-generator.exe - ../../../source/slang/slang-capabilities.capdef;../../../bin/windows-aarch64/release/slang-capability-generator.exe - - - - - - \ No newline at end of file diff --git a/build/visual-studio/generate-lookup-tables/generate-lookup-tables.vcxproj b/build/visual-studio/generate-lookup-tables/generate-lookup-tables.vcxproj deleted file mode 100644 index eaaffcb1c5..0000000000 --- a/build/visual-studio/generate-lookup-tables/generate-lookup-tables.vcxproj +++ /dev/null @@ -1,164 +0,0 @@ - - - - - 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 - - - - {5FFA0764-4BF4-30B6-3461-C7C620FA9622} - true - Win32Proj - generate-lookup-tables - - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - - - - - - - - - - - - - - - - - - - - - - - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\generate-lookup-tables\ - - - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\generate-lookup-tables\ - - - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\generate-lookup-tables\ - - - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\generate-lookup-tables\ - - - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\generate-lookup-tables\ - - - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\generate-lookup-tables\ - - - - - - - - - - - - - - - - Document - "../../../bin/windows-x86/debug/slang-lookup-generator" %(FullPath) $(SolutionDir)/source/slang/slang-lookup-glslstd450.cpp GLSLstd450 GLSLstd450 spirv/unified1/GLSL.std.450.h - "../../../bin/windows-x64/debug/slang-lookup-generator" %(FullPath) $(SolutionDir)/source/slang/slang-lookup-glslstd450.cpp GLSLstd450 GLSLstd450 spirv/unified1/GLSL.std.450.h - "../../../bin/windows-aarch64/debug/slang-lookup-generator" %(FullPath) $(SolutionDir)/source/slang/slang-lookup-glslstd450.cpp GLSLstd450 GLSLstd450 spirv/unified1/GLSL.std.450.h - "../../../bin/windows-x86/release/slang-lookup-generator" %(FullPath) $(SolutionDir)/source/slang/slang-lookup-glslstd450.cpp GLSLstd450 GLSLstd450 spirv/unified1/GLSL.std.450.h - "../../../bin/windows-x64/release/slang-lookup-generator" %(FullPath) $(SolutionDir)/source/slang/slang-lookup-glslstd450.cpp GLSLstd450 GLSLstd450 spirv/unified1/GLSL.std.450.h - "../../../bin/windows-aarch64/release/slang-lookup-generator" %(FullPath) $(SolutionDir)/source/slang/slang-lookup-glslstd450.cpp GLSLstd450 GLSLstd450 spirv/unified1/GLSL.std.450.h - ../../../source/slang/slang-lookup-glslstd450.cpp - slang-lookup-generator for slang-lookup-glslstd450.cpp - ../../../external/spirv-headers/include/spirv/unified1/extinst.glsl.std.450.grammar.json;../../../bin/windows-x86/debug/slang-lookup-generator.exe - ../../../external/spirv-headers/include/spirv/unified1/extinst.glsl.std.450.grammar.json;../../../bin/windows-x64/debug/slang-lookup-generator.exe - ../../../external/spirv-headers/include/spirv/unified1/extinst.glsl.std.450.grammar.json;../../../bin/windows-aarch64/debug/slang-lookup-generator.exe - ../../../external/spirv-headers/include/spirv/unified1/extinst.glsl.std.450.grammar.json;../../../bin/windows-x86/release/slang-lookup-generator.exe - ../../../external/spirv-headers/include/spirv/unified1/extinst.glsl.std.450.grammar.json;../../../bin/windows-x64/release/slang-lookup-generator.exe - ../../../external/spirv-headers/include/spirv/unified1/extinst.glsl.std.450.grammar.json;../../../bin/windows-aarch64/release/slang-lookup-generator.exe - - - - - - \ No newline at end of file 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 deleted file mode 100644 index 148a8684a0..0000000000 --- a/build/visual-studio/generate-lookup-tables/generate-lookup-tables.vcxproj.filters +++ /dev/null @@ -1,25 +0,0 @@ - - - - - {593A5F10-C54E-87C1-8ED0-2A21FAA383F2} - - - {62802470-CE40-A0A6-977B-E92303FBE482} - - - {D5E9D41E-4156-9019-0A4A-28777675B281} - - - {58E55631-C4F2-8417-4DD9-8002B9E550CE} - - - {3C495E56-2830-204E-D180-866BBD4699B4} - - - - - spirv-headers\include\spirv\unified1 - - - \ No newline at end of file diff --git a/build/visual-studio/generate-spirv-embed/generate-spirv-embed.vcxproj b/build/visual-studio/generate-spirv-embed/generate-spirv-embed.vcxproj deleted file mode 100644 index 8529cd7888..0000000000 --- a/build/visual-studio/generate-spirv-embed/generate-spirv-embed.vcxproj +++ /dev/null @@ -1,164 +0,0 @@ - - - - - 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 - - - - {FB5DA174-E7EC-2A3E-900B-3F397C793BE4} - true - Win32Proj - generate-spirv-embed - - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - - - - - - - - - - - - - - - - - - - - - - - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\generate-spirv-embed\ - - - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\generate-spirv-embed\ - - - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\generate-spirv-embed\ - - - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\generate-spirv-embed\ - - - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\generate-spirv-embed\ - - - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\generate-spirv-embed\ - - - - - - - - - - - - - - - - Document - "../../../bin/windows-x86/debug/slang-spirv-embed-generator" %(FullPath) $(SolutionDir)/source/slang/slang-spirv-core-grammar-embed.cpp - "../../../bin/windows-x64/debug/slang-spirv-embed-generator" %(FullPath) $(SolutionDir)/source/slang/slang-spirv-core-grammar-embed.cpp - "../../../bin/windows-aarch64/debug/slang-spirv-embed-generator" %(FullPath) $(SolutionDir)/source/slang/slang-spirv-core-grammar-embed.cpp - "../../../bin/windows-x86/release/slang-spirv-embed-generator" %(FullPath) $(SolutionDir)/source/slang/slang-spirv-core-grammar-embed.cpp - "../../../bin/windows-x64/release/slang-spirv-embed-generator" %(FullPath) $(SolutionDir)/source/slang/slang-spirv-core-grammar-embed.cpp - "../../../bin/windows-aarch64/release/slang-spirv-embed-generator" %(FullPath) $(SolutionDir)/source/slang/slang-spirv-core-grammar-embed.cpp - ../../../source/slang/slang-spirv-core-grammar-embed.cpp - slang-spirv-embed-generator for slang-spirv-core-grammar-embed.cpp - ../../../external/spirv-headers/include/spirv/unified1/spirv.core.grammar.json;../../../bin/windows-x86/debug/slang-spirv-embed-generator.exe - ../../../external/spirv-headers/include/spirv/unified1/spirv.core.grammar.json;../../../bin/windows-x64/debug/slang-spirv-embed-generator.exe - ../../../external/spirv-headers/include/spirv/unified1/spirv.core.grammar.json;../../../bin/windows-aarch64/debug/slang-spirv-embed-generator.exe - ../../../external/spirv-headers/include/spirv/unified1/spirv.core.grammar.json;../../../bin/windows-x86/release/slang-spirv-embed-generator.exe - ../../../external/spirv-headers/include/spirv/unified1/spirv.core.grammar.json;../../../bin/windows-x64/release/slang-spirv-embed-generator.exe - ../../../external/spirv-headers/include/spirv/unified1/spirv.core.grammar.json;../../../bin/windows-aarch64/release/slang-spirv-embed-generator.exe - - - - - - \ No newline at end of file diff --git a/build/visual-studio/gfx-test-tool/gfx-test-tool.vcxproj b/build/visual-studio/gfx-test-tool/gfx-test-tool.vcxproj deleted file mode 100644 index ee88875380..0000000000 --- a/build/visual-studio/gfx-test-tool/gfx-test-tool.vcxproj +++ /dev/null @@ -1,197 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {092DAB9F-1DA5-4538-ADD7-1A8D1DBFD519} - true - Win32Proj - gfx-test-tool - - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - false - Unicode - v142 - - - DynamicLibrary - false - Unicode - v142 - - - - - - - - - - - - - - - - - - - true - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\gfx-test-tool\ - gfx-test-tool - .dll - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\gfx-test-tool\ - gfx-test-tool - .dll - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\gfx-test-tool\ - gfx-test-tool - .dll - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\gfx-test-tool\ - gfx-test-tool - .dll - - - - NotUsing - Level3 - _DEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - EditAndContinue - Disabled - MultiThreadedDebug - - - Windows - true - ..\..\..\bin\windows-x86\debug\gfx-test-tool.lib - - - - - NotUsing - Level3 - _DEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - EditAndContinue - Disabled - MultiThreadedDebug - - - Windows - true - ..\..\..\bin\windows-x64\debug\gfx-test-tool.lib - - - - - NotUsing - Level3 - NDEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - - - Windows - true - true - ..\..\..\bin\windows-x86\release\gfx-test-tool.lib - - - - - NotUsing - Level3 - NDEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - - - Windows - true - true - ..\..\..\bin\windows-x64\release\gfx-test-tool.lib - - - - - - - - - - - - - - - - - {222F7498-B40C-4F3F-A704-DDEB91A4484A} - - - {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B} - - - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/gfx-test-tool/gfx-test-tool.vcxproj.filters b/build/visual-studio/gfx-test-tool/gfx-test-tool.vcxproj.filters deleted file mode 100644 index 9e45424878..0000000000 --- a/build/visual-studio/gfx-test-tool/gfx-test-tool.vcxproj.filters +++ /dev/null @@ -1,35 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - \ 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 deleted file mode 100644 index 955c702d9b..0000000000 --- a/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj +++ /dev/null @@ -1,374 +0,0 @@ - - - - - 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 - - - - {092DAB9F-1DA5-4538-ADD7-1A8D1DBFD519} - true - Win32Proj - gfx-unit-test-tool - - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - true - - - DynamicLibrary - false - Unicode - v142 - - - DynamicLibrary - false - Unicode - v142 - - - DynamicLibrary - false - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - - - - - - - true - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\gfx-unit-test-tool\ - gfx-unit-test-tool - .dll - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\gfx-unit-test-tool\ - gfx-unit-test-tool - .dll - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\gfx-unit-test-tool\ - gfx-unit-test-tool - .dll - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\gfx-unit-test-tool\ - gfx-unit-test-tool - .dll - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\gfx-unit-test-tool\ - gfx-unit-test-tool - .dll - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\gfx-unit-test-tool\ - gfx-unit-test-tool - .dll - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-x86\debug\gfx-unit-test-tool.lib - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-x64\debug\gfx-unit-test-tool.lib - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-aarch64\debug\gfx-unit-test-tool.lib - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-x86\release\gfx-unit-test-tool.lib - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-x64\release\gfx-unit-test-tool.lib - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-aarch64\release\gfx-unit-test-tool.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} - - - {222F7498-B40C-4F3F-A704-DDEB91A4484A} - - - {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B} - - - {3565FE5E-4FA3-11EB-AE93-0242AC130002} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj.filters b/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj.filters deleted file mode 100644 index 6d48a99ae3..0000000000 --- a/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj.filters +++ /dev/null @@ -1,206 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - 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/gfx-util/gfx-util.vcxproj b/build/visual-studio/gfx-util/gfx-util.vcxproj deleted file mode 100644 index 386642e9ac..0000000000 --- a/build/visual-studio/gfx-util/gfx-util.vcxproj +++ /dev/null @@ -1,282 +0,0 @@ - - - - - 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 - - - - {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B} - true - Win32Proj - gfx-util - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - true - - - StaticLibrary - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - - - - - - - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\gfx-util\ - gfx-util - .lib - - - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\gfx-util\ - gfx-util - .lib - - - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\gfx-util\ - gfx-util - .lib - - - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\gfx-util\ - gfx-util - .lib - - - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\gfx-util\ - gfx-util - .lib - - - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\gfx-util\ - gfx-util - .lib - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\source;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\source;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\source;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\source;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\source;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\source;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - - - - - - - - \ No newline at end of file diff --git a/build/visual-studio/gfx-util/gfx-util.vcxproj.filters b/build/visual-studio/gfx-util/gfx-util.vcxproj.filters deleted file mode 100644 index 043906da36..0000000000 --- a/build/visual-studio/gfx-util/gfx-util.vcxproj.filters +++ /dev/null @@ -1,21 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/gfx/gfx.vcxproj b/build/visual-studio/gfx/gfx.vcxproj deleted file mode 100644 index 20d9ca28e1..0000000000 --- a/build/visual-studio/gfx/gfx.vcxproj +++ /dev/null @@ -1,578 +0,0 @@ - - - - - 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 - - - - {222F7498-B40C-4F3F-A704-DDEB91A4484A} - true - Win32Proj - gfx - 10.0 - - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - true - - - DynamicLibrary - false - Unicode - v142 - - - DynamicLibrary - false - Unicode - v142 - - - DynamicLibrary - false - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - - - - - - - true - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\gfx\ - gfx - .dll - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\gfx\ - gfx - .dll - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\gfx\ - gfx - .dll - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\gfx\ - gfx - .dll - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\gfx\ - gfx - .dll - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\gfx\ - gfx - .dll - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_GFX_DYNAMIC;SLANG_GFX_DYNAMIC_EXPORT;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external;..\..\..\external\vulkan\include;..\..\..\source;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-x86\debug\gfx.lib - - - IF EXIST "$(SolutionDir)tools\gfx\gfx.slang"\ (xcopy /Q /E /Y /I "$(SolutionDir)tools\gfx\gfx.slang" "..\..\..\bin\windows-x86\debug" > nul) ELSE (xcopy /Q /Y /I "$(SolutionDir)tools\gfx\gfx.slang" "..\..\..\bin\windows-x86\debug" > nul) -IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDir)tools\gfx\slang.slang" "..\..\..\bin\windows-x86\debug" > nul) ELSE (xcopy /Q /Y /I "$(SolutionDir)tools\gfx\slang.slang" "..\..\..\bin\windows-x86\debug" > nul) -"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../../bin/windows-x86/debug/" - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_GFX_DYNAMIC;SLANG_GFX_DYNAMIC_EXPORT;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external;..\..\..\external\vulkan\include;..\..\..\source;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-x64\debug\gfx.lib - - - IF EXIST "$(SolutionDir)tools\gfx\gfx.slang"\ (xcopy /Q /E /Y /I "$(SolutionDir)tools\gfx\gfx.slang" "..\..\..\bin\windows-x64\debug" > nul) ELSE (xcopy /Q /Y /I "$(SolutionDir)tools\gfx\gfx.slang" "..\..\..\bin\windows-x64\debug" > nul) -IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDir)tools\gfx\slang.slang" "..\..\..\bin\windows-x64\debug" > nul) ELSE (xcopy /Q /Y /I "$(SolutionDir)tools\gfx\slang.slang" "..\..\..\bin\windows-x64\debug" > nul) -"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../../bin/windows-x64/debug/" - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_GFX_DYNAMIC;SLANG_GFX_DYNAMIC_EXPORT;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external;..\..\..\external\vulkan\include;..\..\..\source;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-aarch64\debug\gfx.lib - - - IF EXIST "$(SolutionDir)tools\gfx\gfx.slang"\ (xcopy /Q /E /Y /I "$(SolutionDir)tools\gfx\gfx.slang" "..\..\..\bin\windows-aarch64\debug" > nul) ELSE (xcopy /Q /Y /I "$(SolutionDir)tools\gfx\gfx.slang" "..\..\..\bin\windows-aarch64\debug" > nul) -IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDir)tools\gfx\slang.slang" "..\..\..\bin\windows-aarch64\debug" > nul) ELSE (xcopy /Q /Y /I "$(SolutionDir)tools\gfx\slang.slang" "..\..\..\bin\windows-aarch64\debug" > nul) -"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/aarch64/" "../../../bin/windows-aarch64/debug/" - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_GFX_DYNAMIC;SLANG_GFX_DYNAMIC_EXPORT;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external;..\..\..\external\vulkan\include;..\..\..\source;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-x86\release\gfx.lib - - - IF EXIST "$(SolutionDir)tools\gfx\gfx.slang"\ (xcopy /Q /E /Y /I "$(SolutionDir)tools\gfx\gfx.slang" "..\..\..\bin\windows-x86\release" > nul) ELSE (xcopy /Q /Y /I "$(SolutionDir)tools\gfx\gfx.slang" "..\..\..\bin\windows-x86\release" > nul) -IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDir)tools\gfx\slang.slang" "..\..\..\bin\windows-x86\release" > nul) ELSE (xcopy /Q /Y /I "$(SolutionDir)tools\gfx\slang.slang" "..\..\..\bin\windows-x86\release" > nul) -"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../../bin/windows-x86/release/" - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_GFX_DYNAMIC;SLANG_GFX_DYNAMIC_EXPORT;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external;..\..\..\external\vulkan\include;..\..\..\source;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-x64\release\gfx.lib - - - IF EXIST "$(SolutionDir)tools\gfx\gfx.slang"\ (xcopy /Q /E /Y /I "$(SolutionDir)tools\gfx\gfx.slang" "..\..\..\bin\windows-x64\release" > nul) ELSE (xcopy /Q /Y /I "$(SolutionDir)tools\gfx\gfx.slang" "..\..\..\bin\windows-x64\release" > nul) -IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDir)tools\gfx\slang.slang" "..\..\..\bin\windows-x64\release" > nul) ELSE (xcopy /Q /Y /I "$(SolutionDir)tools\gfx\slang.slang" "..\..\..\bin\windows-x64\release" > nul) -"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../../bin/windows-x64/release/" - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_GFX_DYNAMIC;SLANG_GFX_DYNAMIC_EXPORT;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external;..\..\..\external\vulkan\include;..\..\..\source;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-aarch64\release\gfx.lib - - - IF EXIST "$(SolutionDir)tools\gfx\gfx.slang"\ (xcopy /Q /E /Y /I "$(SolutionDir)tools\gfx\gfx.slang" "..\..\..\bin\windows-aarch64\release" > nul) ELSE (xcopy /Q /Y /I "$(SolutionDir)tools\gfx\gfx.slang" "..\..\..\bin\windows-aarch64\release" > nul) -IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDir)tools\gfx\slang.slang" "..\..\..\bin\windows-aarch64\release" > nul) ELSE (xcopy /Q /Y /I "$(SolutionDir)tools\gfx\slang.slang" "..\..\..\bin\windows-aarch64\release" > nul) -"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/aarch64/" "../../../bin/windows-aarch64/release/" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/gfx/gfx.vcxproj.filters b/build/visual-studio/gfx/gfx.vcxproj.filters deleted file mode 100644 index 50baad7e5c..0000000000 --- a/build/visual-studio/gfx/gfx.vcxproj.filters +++ /dev/null @@ -1,752 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - 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/gpu-printing/gpu-printing.vcxproj b/build/visual-studio/gpu-printing/gpu-printing.vcxproj deleted file mode 100644 index de098edc54..0000000000 --- a/build/visual-studio/gpu-printing/gpu-printing.vcxproj +++ /dev/null @@ -1,314 +0,0 @@ - - - - - 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 - - - - {57C81DD3-4304-213D-AC16-39349871C957} - true - Win32Proj - gpu-printing - - - - 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\gpu-printing\ - gpu-printing - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\gpu-printing\ - gpu-printing - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\gpu-printing\ - gpu-printing - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\gpu-printing\ - gpu-printing - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\gpu-printing\ - gpu-printing - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\gpu-printing\ - gpu-printing - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - 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/gpu-printing/gpu-printing.vcxproj.filters b/build/visual-studio/gpu-printing/gpu-printing.vcxproj.filters deleted file mode 100644 index 5a8283812d..0000000000 --- a/build/visual-studio/gpu-printing/gpu-printing.vcxproj.filters +++ /dev/null @@ -1,35 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/graphics-app-framework/graphics-app-framework.vcxproj b/build/visual-studio/graphics-app-framework/graphics-app-framework.vcxproj deleted file mode 100644 index 4de3469c65..0000000000 --- a/build/visual-studio/graphics-app-framework/graphics-app-framework.vcxproj +++ /dev/null @@ -1,175 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {3565FE5E-4FA3-11EB-AE93-0242AC130002} - true - Win32Proj - graphics-app-framework - 10.0.14393.0 - - - - StaticLibrary - true - Unicode - v140 - - - StaticLibrary - true - Unicode - v140 - - - StaticLibrary - false - Unicode - v140 - - - StaticLibrary - false - Unicode - v140 - - - - - - - - - - - - - - - - - - - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\graphics-app-framework\ - graphics-app-framework - .lib - - - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\graphics-app-framework\ - graphics-app-framework - .lib - - - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\graphics-app-framework\ - graphics-app-framework - .lib - - - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\graphics-app-framework\ - graphics-app-framework - .lib - - - - NotUsing - Level3 - _DEBUG;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external;..\..\..\source;..\..\..\external\imgui;..\..\..\tools\gfx;%(AdditionalIncludeDirectories) - EditAndContinue - Disabled - MultiThreadedDebug - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external;..\..\..\source;..\..\..\external\imgui;..\..\..\tools\gfx;%(AdditionalIncludeDirectories) - EditAndContinue - Disabled - MultiThreadedDebug - - - Windows - true - - - - - NotUsing - Level3 - NDEBUG;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external;..\..\..\source;..\..\..\external\imgui;..\..\..\tools\gfx;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external;..\..\..\source;..\..\..\external\imgui;..\..\..\tools\gfx;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - - - Windows - true - true - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build/visual-studio/graphics-app-framework/graphics-app-framework.vcxproj.filters b/build/visual-studio/graphics-app-framework/graphics-app-framework.vcxproj.filters deleted file mode 100644 index 04601b510c..0000000000 --- a/build/visual-studio/graphics-app-framework/graphics-app-framework.vcxproj.filters +++ /dev/null @@ -1,36 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/hello-world/hello-world.vcxproj b/build/visual-studio/hello-world/hello-world.vcxproj deleted file mode 100644 index 6140b7c64b..0000000000 --- a/build/visual-studio/hello-world/hello-world.vcxproj +++ /dev/null @@ -1,312 +0,0 @@ - - - - - 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 - - - - {010BE414-ED5B-CF56-16C0-BD18027062C0} - true - Win32Proj - hello-world - - - - 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\hello-world\ - hello-world - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\hello-world\ - hello-world - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\hello-world\ - hello-world - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\hello-world\ - hello-world - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\hello-world\ - hello-world - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\hello-world\ - hello-world - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;..\..\..\external\vulkan\include;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;..\..\..\external\vulkan\include;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;..\..\..\external\vulkan\include;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;..\..\..\external\vulkan\include;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;..\..\..\external\vulkan\include;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;..\..\..\external\vulkan\include;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - 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/hello-world/hello-world.vcxproj.filters b/build/visual-studio/hello-world/hello-world.vcxproj.filters deleted file mode 100644 index cc52fbf00f..0000000000 --- a/build/visual-studio/hello-world/hello-world.vcxproj.filters +++ /dev/null @@ -1,29 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - - - Source Files - - - Source Files - - - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/lz4/lz4.vcxproj b/build/visual-studio/lz4/lz4.vcxproj deleted file mode 100644 index c538adb919..0000000000 --- a/build/visual-studio/lz4/lz4.vcxproj +++ /dev/null @@ -1,276 +0,0 @@ - - - - - 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 - - - - {E1EC8075-823E-46E5-BC38-C124CCCDF878} - true - Win32Proj - lz4 - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - true - - - StaticLibrary - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - - - - - - - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\lz4\ - lz4 - .lib - - - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\lz4\ - lz4 - .lib - - - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\lz4\ - lz4 - .lib - - - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\lz4\ - lz4 - .lib - - - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\lz4\ - lz4 - .lib - - - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\lz4\ - lz4 - .lib - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - - - - - - - - \ No newline at end of file diff --git a/build/visual-studio/lz4/lz4.vcxproj.filters b/build/visual-studio/lz4/lz4.vcxproj.filters deleted file mode 100644 index 35826b470c..0000000000 --- a/build/visual-studio/lz4/lz4.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {2839F3DC-1406-4EE8-3D1F-3C90294B8376} - - - {512ED728-3D91-66CD-E616-9F83D2583250} - - - {F78D9302-E386-B254-0CB9-97D9F8109260} - - - - - Header Files - - - - - external\lz4\lib - - - \ No newline at end of file diff --git a/build/visual-studio/miniz/miniz.vcxproj b/build/visual-studio/miniz/miniz.vcxproj deleted file mode 100644 index 6e091585f6..0000000000 --- a/build/visual-studio/miniz/miniz.vcxproj +++ /dev/null @@ -1,276 +0,0 @@ - - - - - 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 - - - - {E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F} - true - Win32Proj - miniz - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - true - - - StaticLibrary - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - - - - - - - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\miniz\ - miniz - .lib - - - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\miniz\ - miniz - .lib - - - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\miniz\ - miniz - .lib - - - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\miniz\ - miniz - .lib - - - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\miniz\ - miniz - .lib - - - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\miniz\ - miniz - .lib - - - - NotUsing - Level3 - _DEBUG;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - NDEBUG;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - - - - - - - - \ No newline at end of file diff --git a/build/visual-studio/model-viewer/model-viewer.vcxproj b/build/visual-studio/model-viewer/model-viewer.vcxproj deleted file mode 100644 index 52c752282b..0000000000 --- a/build/visual-studio/model-viewer/model-viewer.vcxproj +++ /dev/null @@ -1,308 +0,0 @@ - - - - - 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 - - - - {2F8724C6-1BC3-2730-84D5-3F277030D04A} - true - Win32Proj - model-viewer - - - - 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\model-viewer\ - model-viewer - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\model-viewer\ - model-viewer - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\model-viewer\ - model-viewer - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\model-viewer\ - model-viewer - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\model-viewer\ - model-viewer - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\model-viewer\ - model-viewer - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(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/model-viewer/model-viewer.vcxproj.filters b/build/visual-studio/model-viewer/model-viewer.vcxproj.filters deleted file mode 100644 index 9e67b7634c..0000000000 --- a/build/visual-studio/model-viewer/model-viewer.vcxproj.filters +++ /dev/null @@ -1,18 +0,0 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/platform-test/platform-test.vcxproj b/build/visual-studio/platform-test/platform-test.vcxproj deleted file mode 100644 index 7ea0cb6757..0000000000 --- a/build/visual-studio/platform-test/platform-test.vcxproj +++ /dev/null @@ -1,305 +0,0 @@ - - - - - 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 - - - - {F385D6A7-DF6C-989F-88BD-FEBC74831106} - true - Win32Proj - platform-test - - - - 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\platform-test\ - platform-test - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\platform-test\ - platform-test - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\platform-test\ - platform-test - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\platform-test\ - platform-test - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\platform-test\ - platform-test - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\platform-test\ - platform-test - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(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/platform-test/platform-test.vcxproj.filters b/build/visual-studio/platform-test/platform-test.vcxproj.filters deleted file mode 100644 index d2de85c340..0000000000 --- a/build/visual-studio/platform-test/platform-test.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/platform/platform.vcxproj b/build/visual-studio/platform/platform.vcxproj deleted file mode 100644 index e4dbafb12e..0000000000 --- a/build/visual-studio/platform/platform.vcxproj +++ /dev/null @@ -1,316 +0,0 @@ - - - - - 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 - - - - {3565FE5E-4FA3-11EB-AE93-0242AC130002} - true - Win32Proj - platform - 10.0 - - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - true - - - DynamicLibrary - false - Unicode - v142 - - - DynamicLibrary - false - Unicode - v142 - - - DynamicLibrary - false - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - - - - - - - true - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\platform\ - platform - .dll - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\platform\ - platform - .dll - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\platform\ - platform - .dll - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\platform\ - platform - .dll - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\platform\ - platform - .dll - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\platform\ - platform - .dll - - - - NotUsing - Level3 - _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 - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-x86\debug\platform.lib - - - - - NotUsing - Level3 - _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 - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-x64\debug\platform.lib - - - - - NotUsing - Level3 - _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 - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-aarch64\debug\platform.lib - - - - - NotUsing - Level3 - 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 - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-x86\release\platform.lib - - - - - NotUsing - Level3 - 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 - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-x64\release\platform.lib - - - - - NotUsing - Level3 - 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 - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-aarch64\release\platform.lib - - - - - - - - - - - - - - - - - - - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} - - - {222F7498-B40C-4F3F-A704-DDEB91A4484A} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/platform/platform.vcxproj.filters b/build/visual-studio/platform/platform.vcxproj.filters deleted file mode 100644 index 59645671a6..0000000000 --- a/build/visual-studio/platform/platform.vcxproj.filters +++ /dev/null @@ -1,51 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header 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/ray-tracing-pipeline/ray-tracing-pipeline.vcxproj b/build/visual-studio/ray-tracing-pipeline/ray-tracing-pipeline.vcxproj deleted file mode 100644 index 13ef20ac8a..0000000000 --- a/build/visual-studio/ray-tracing-pipeline/ray-tracing-pipeline.vcxproj +++ /dev/null @@ -1,308 +0,0 @@ - - - - - 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 - - - - {17BA8E32-034E-84DA-6C12-DE8E58C5BECC} - true - Win32Proj - ray-tracing-pipeline - - - - 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\ray-tracing-pipeline\ - ray-tracing-pipeline - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\ray-tracing-pipeline\ - ray-tracing-pipeline - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\ray-tracing-pipeline\ - ray-tracing-pipeline - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\ray-tracing-pipeline\ - ray-tracing-pipeline - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\ray-tracing-pipeline\ - ray-tracing-pipeline - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\ray-tracing-pipeline\ - ray-tracing-pipeline - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(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/ray-tracing-pipeline/ray-tracing-pipeline.vcxproj.filters b/build/visual-studio/ray-tracing-pipeline/ray-tracing-pipeline.vcxproj.filters deleted file mode 100644 index e116445c69..0000000000 --- a/build/visual-studio/ray-tracing-pipeline/ray-tracing-pipeline.vcxproj.filters +++ /dev/null @@ -1,18 +0,0 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/ray-tracing/ray-tracing.vcxproj b/build/visual-studio/ray-tracing/ray-tracing.vcxproj deleted file mode 100644 index 819d112c0d..0000000000 --- a/build/visual-studio/ray-tracing/ray-tracing.vcxproj +++ /dev/null @@ -1,308 +0,0 @@ - - - - - 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 - - - - {71AC0F50-5DFD-FA91-8661-E95372118EFB} - true - Win32Proj - ray-tracing - - - - 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\ray-tracing\ - ray-tracing - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\ray-tracing\ - ray-tracing - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\ray-tracing\ - ray-tracing - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\ray-tracing\ - ray-tracing - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\ray-tracing\ - ray-tracing - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\ray-tracing\ - ray-tracing - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(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/ray-tracing/ray-tracing.vcxproj.filters b/build/visual-studio/ray-tracing/ray-tracing.vcxproj.filters deleted file mode 100644 index 774e719170..0000000000 --- a/build/visual-studio/ray-tracing/ray-tracing.vcxproj.filters +++ /dev/null @@ -1,18 +0,0 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/render-test-tool/render-test-tool.vcxproj b/build/visual-studio/render-test-tool/render-test-tool.vcxproj deleted file mode 100644 index 572bcb388d..0000000000 --- a/build/visual-studio/render-test-tool/render-test-tool.vcxproj +++ /dev/null @@ -1,345 +0,0 @@ - - - - - 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 - - - - {61F7EB00-7281-4BF3-9470-7C2EA92620C3} - true - Win32Proj - render-test-tool - 10.0 - - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - true - - - DynamicLibrary - false - Unicode - v142 - - - DynamicLibrary - false - Unicode - v142 - - - DynamicLibrary - false - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - - - - - - - true - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\render-test-tool\ - render-test-tool - .dll - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\render-test-tool\ - render-test-tool - .dll - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\render-test-tool\ - render-test-tool - .dll - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\render-test-tool\ - render-test-tool - .dll - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\render-test-tool\ - render-test-tool - .dll - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\render-test-tool\ - render-test-tool - .dll - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external;..\..\..\external\vulkan\include;..\..\..\source;..\..\..\tools\gfx;..\..\..\tools\platform;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-x86\debug\render-test-tool.lib - - - "$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../../bin/windows-x86/debug/" "windows-x86" - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external;..\..\..\external\vulkan\include;..\..\..\source;..\..\..\tools\gfx;..\..\..\tools\platform;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-x64\debug\render-test-tool.lib - - - "$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../../bin/windows-x64/debug/" "windows-x64" - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external;..\..\..\external\vulkan\include;..\..\..\source;..\..\..\tools\gfx;..\..\..\tools\platform;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-aarch64\debug\render-test-tool.lib - - - "$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/aarch64/" "../../../bin/windows-aarch64/debug/" "windows-aarch64" - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external;..\..\..\external\vulkan\include;..\..\..\source;..\..\..\tools\gfx;..\..\..\tools\platform;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-x86\release\render-test-tool.lib - - - "$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../../bin/windows-x86/release/" "windows-x86" - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external;..\..\..\external\vulkan\include;..\..\..\source;..\..\..\tools\gfx;..\..\..\tools\platform;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-x64\release\render-test-tool.lib - - - "$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../../bin/windows-x64/release/" "windows-x64" - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external;..\..\..\external\vulkan\include;..\..\..\source;..\..\..\tools\gfx;..\..\..\tools\platform;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-aarch64\release\render-test-tool.lib - - - "$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/aarch64/" "../../../bin/windows-aarch64/release/" "windows-aarch64" - - - - - - - - - - - - - - - - - - - - - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126} - - - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} - - - {222F7498-B40C-4F3F-A704-DDEB91A4484A} - - - {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B} - - - {3565FE5E-4FA3-11EB-AE93-0242AC130002} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/render-test-tool/render-test-tool.vcxproj.filters b/build/visual-studio/render-test-tool/render-test-tool.vcxproj.filters deleted file mode 100644 index 28bf0a94ec..0000000000 --- a/build/visual-studio/render-test-tool/render-test-tool.vcxproj.filters +++ /dev/null @@ -1,57 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - 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/run-generators/run-generators.vcxproj b/build/visual-studio/run-generators/run-generators.vcxproj deleted file mode 100644 index dbd3a39475..0000000000 --- a/build/visual-studio/run-generators/run-generators.vcxproj +++ /dev/null @@ -1,343 +0,0 @@ - - - - - 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 - - - - {E145B2B8-CD13-A6BE-B6A7-16E5A2148223} - true - Win32Proj - run-generators - - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - - - - - - - - - - - - - - - - - - - - - - - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\run-generators\ - - - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\run-generators\ - - - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\run-generators\ - - - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\run-generators\ - - - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\run-generators\ - - - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\run-generators\ - - - - - - - - - - - - - - - - - - - - - - - - - Document - "../../../bin/windows-x86/debug/slang-embed" %(Identity) - "../../../bin/windows-x64/debug/slang-embed" %(Identity) - "../../../bin/windows-aarch64/debug/slang-embed" %(Identity) - "../../../bin/windows-x86/release/slang-embed" %(Identity) - "../../../bin/windows-x64/release/slang-embed" %(Identity) - "../../../bin/windows-aarch64/release/slang-embed" %(Identity) - ../../../prelude/slang-cpp-host-prelude.h.cpp - slang-embed %(Identity) - ../../../bin/windows-x86/debug/slang-embed.exe - ../../../bin/windows-x64/debug/slang-embed.exe - ../../../bin/windows-aarch64/debug/slang-embed.exe - ../../../bin/windows-x86/release/slang-embed.exe - ../../../bin/windows-x64/release/slang-embed.exe - ../../../bin/windows-aarch64/release/slang-embed.exe - - - Document - "../../../bin/windows-x86/debug/slang-embed" %(Identity) - "../../../bin/windows-x64/debug/slang-embed" %(Identity) - "../../../bin/windows-aarch64/debug/slang-embed" %(Identity) - "../../../bin/windows-x86/release/slang-embed" %(Identity) - "../../../bin/windows-x64/release/slang-embed" %(Identity) - "../../../bin/windows-aarch64/release/slang-embed" %(Identity) - ../../../prelude/slang-cpp-prelude.h.cpp - slang-embed %(Identity) - ../../../bin/windows-x86/debug/slang-embed.exe - ../../../bin/windows-x64/debug/slang-embed.exe - ../../../bin/windows-aarch64/debug/slang-embed.exe - ../../../bin/windows-x86/release/slang-embed.exe - ../../../bin/windows-x64/release/slang-embed.exe - ../../../bin/windows-aarch64/release/slang-embed.exe - - - Document - "../../../bin/windows-x86/debug/slang-embed" %(Identity) - "../../../bin/windows-x64/debug/slang-embed" %(Identity) - "../../../bin/windows-aarch64/debug/slang-embed" %(Identity) - "../../../bin/windows-x86/release/slang-embed" %(Identity) - "../../../bin/windows-x64/release/slang-embed" %(Identity) - "../../../bin/windows-aarch64/release/slang-embed" %(Identity) - ../../../prelude/slang-cuda-prelude.h.cpp - slang-embed %(Identity) - ../../../bin/windows-x86/debug/slang-embed.exe - ../../../bin/windows-x64/debug/slang-embed.exe - ../../../bin/windows-aarch64/debug/slang-embed.exe - ../../../bin/windows-x86/release/slang-embed.exe - ../../../bin/windows-x64/release/slang-embed.exe - ../../../bin/windows-aarch64/release/slang-embed.exe - - - Document - "../../../bin/windows-x86/debug/slang-embed" %(Identity) - "../../../bin/windows-x64/debug/slang-embed" %(Identity) - "../../../bin/windows-aarch64/debug/slang-embed" %(Identity) - "../../../bin/windows-x86/release/slang-embed" %(Identity) - "../../../bin/windows-x64/release/slang-embed" %(Identity) - "../../../bin/windows-aarch64/release/slang-embed" %(Identity) - ../../../prelude/slang-hlsl-prelude.h.cpp - slang-embed %(Identity) - ../../../bin/windows-x86/debug/slang-embed.exe - ../../../bin/windows-x64/debug/slang-embed.exe - ../../../bin/windows-aarch64/debug/slang-embed.exe - ../../../bin/windows-x86/release/slang-embed.exe - ../../../bin/windows-x64/release/slang-embed.exe - ../../../bin/windows-aarch64/release/slang-embed.exe - - - Document - "../../../bin/windows-x86/debug/slang-embed" %(Identity) - "../../../bin/windows-x64/debug/slang-embed" %(Identity) - "../../../bin/windows-aarch64/debug/slang-embed" %(Identity) - "../../../bin/windows-x86/release/slang-embed" %(Identity) - "../../../bin/windows-x64/release/slang-embed" %(Identity) - "../../../bin/windows-aarch64/release/slang-embed" %(Identity) - ../../../prelude/slang-torch-prelude.h.cpp - slang-embed %(Identity) - ../../../bin/windows-x86/debug/slang-embed.exe - ../../../bin/windows-x64/debug/slang-embed.exe - ../../../bin/windows-aarch64/debug/slang-embed.exe - ../../../bin/windows-x86/release/slang-embed.exe - ../../../bin/windows-x64/release/slang-embed.exe - ../../../bin/windows-aarch64/release/slang-embed.exe - - - Document - "../../../bin/windows-x86/debug/slang-generate" %(Identity) - "../../../bin/windows-x64/debug/slang-generate" %(Identity) - "../../../bin/windows-aarch64/debug/slang-generate" %(Identity) - "../../../bin/windows-x86/release/slang-generate" %(Identity) - "../../../bin/windows-x64/release/slang-generate" %(Identity) - "../../../bin/windows-aarch64/release/slang-generate" %(Identity) - ../../../source/slang/core.meta.slang.h - slang-generate %(Identity) - ../../../bin/windows-x86/debug/slang-generate.exe - ../../../bin/windows-x64/debug/slang-generate.exe - ../../../bin/windows-aarch64/debug/slang-generate.exe - ../../../bin/windows-x86/release/slang-generate.exe - ../../../bin/windows-x64/release/slang-generate.exe - ../../../bin/windows-aarch64/release/slang-generate.exe - - - Document - "../../../bin/windows-x86/debug/slang-generate" %(Identity) - "../../../bin/windows-x64/debug/slang-generate" %(Identity) - "../../../bin/windows-aarch64/debug/slang-generate" %(Identity) - "../../../bin/windows-x86/release/slang-generate" %(Identity) - "../../../bin/windows-x64/release/slang-generate" %(Identity) - "../../../bin/windows-aarch64/release/slang-generate" %(Identity) - ../../../source/slang/diff.meta.slang.h - slang-generate %(Identity) - ../../../bin/windows-x86/debug/slang-generate.exe - ../../../bin/windows-x64/debug/slang-generate.exe - ../../../bin/windows-aarch64/debug/slang-generate.exe - ../../../bin/windows-x86/release/slang-generate.exe - ../../../bin/windows-x64/release/slang-generate.exe - ../../../bin/windows-aarch64/release/slang-generate.exe - - - Document - "../../../bin/windows-x86/debug/slang-generate" %(Identity) - "../../../bin/windows-x64/debug/slang-generate" %(Identity) - "../../../bin/windows-aarch64/debug/slang-generate" %(Identity) - "../../../bin/windows-x86/release/slang-generate" %(Identity) - "../../../bin/windows-x64/release/slang-generate" %(Identity) - "../../../bin/windows-aarch64/release/slang-generate" %(Identity) - ../../../source/slang/glsl.meta.slang.h - slang-generate %(Identity) - ../../../bin/windows-x86/debug/slang-generate.exe - ../../../bin/windows-x64/debug/slang-generate.exe - ../../../bin/windows-aarch64/debug/slang-generate.exe - ../../../bin/windows-x86/release/slang-generate.exe - ../../../bin/windows-x64/release/slang-generate.exe - ../../../bin/windows-aarch64/release/slang-generate.exe - - - Document - "../../../bin/windows-x86/debug/slang-generate" %(Identity) - "../../../bin/windows-x64/debug/slang-generate" %(Identity) - "../../../bin/windows-aarch64/debug/slang-generate" %(Identity) - "../../../bin/windows-x86/release/slang-generate" %(Identity) - "../../../bin/windows-x64/release/slang-generate" %(Identity) - "../../../bin/windows-aarch64/release/slang-generate" %(Identity) - ../../../source/slang/hlsl.meta.slang.h - slang-generate %(Identity) - ../../../bin/windows-x86/debug/slang-generate.exe - ../../../bin/windows-x64/debug/slang-generate.exe - ../../../bin/windows-aarch64/debug/slang-generate.exe - ../../../bin/windows-x86/release/slang-generate.exe - ../../../bin/windows-x64/release/slang-generate.exe - ../../../bin/windows-aarch64/release/slang-generate.exe - - - Document - "../../../bin/windows-x86/debug/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS - "../../../bin/windows-x64/debug/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS - "../../../bin/windows-aarch64/debug/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS - "../../../bin/windows-x86/release/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS - "../../../bin/windows-x64/release/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS - "../../../bin/windows-aarch64/release/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS - ../../../source/slang/slang-generated-obj.h;../../../source/slang/slang-generated-obj-macro.h;../../../source/slang/slang-generated-ast.h;../../../source/slang/slang-generated-ast-macro.h;../../../source/slang/slang-generated-value.h;../../../source/slang/slang-generated-value-macro.h - C++ Extractor %(Identity) - ../../../bin/windows-x86/debug/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h - ../../../bin/windows-x64/debug/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h - ../../../bin/windows-aarch64/debug/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h - ../../../bin/windows-x86/release/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h - ../../../bin/windows-x64/release/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h - ../../../bin/windows-aarch64/release/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h - - - Document - "../../../bin/windows-x86/debug/slang-capability-generator" "%(FullPath)" - "../../../bin/windows-x64/debug/slang-capability-generator" "%(FullPath)" - "../../../bin/windows-aarch64/debug/slang-capability-generator" "%(FullPath)" - "../../../bin/windows-x86/release/slang-capability-generator" "%(FullPath)" - "../../../bin/windows-x64/release/slang-capability-generator" "%(FullPath)" - "../../../bin/windows-aarch64/release/slang-capability-generator" "%(FullPath)" - ../../../source/slang/slang-generated-capability-defs.h - slang-capability-generator %(Identity) - ../../../source/slang/slang-capabilities.capdef;../../../bin/windows-x86/debug/slang-capability-generator.exe - ../../../source/slang/slang-capabilities.capdef;../../../bin/windows-x64/debug/slang-capability-generator.exe - ../../../source/slang/slang-capabilities.capdef;../../../bin/windows-aarch64/debug/slang-capability-generator.exe - ../../../source/slang/slang-capabilities.capdef;../../../bin/windows-x86/release/slang-capability-generator.exe - ../../../source/slang/slang-capabilities.capdef;../../../bin/windows-x64/release/slang-capability-generator.exe - ../../../source/slang/slang-capabilities.capdef;../../../bin/windows-aarch64/release/slang-capability-generator.exe - - - - - - \ No newline at end of file diff --git a/build/visual-studio/run-generators/run-generators.vcxproj.filters b/build/visual-studio/run-generators/run-generators.vcxproj.filters deleted file mode 100644 index c3c8330a85..0000000000 --- a/build/visual-studio/run-generators/run-generators.vcxproj.filters +++ /dev/null @@ -1,71 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - {76FF3A1C-62A1-65F2-4B5C-7946379DEC42} - - - {9A9B9613-86FE-25B8-2F84-5E6E1BC6F13A} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Header Files - - - source\slang - - - \ No newline at end of file diff --git a/build/visual-studio/shader-object/shader-object.vcxproj b/build/visual-studio/shader-object/shader-object.vcxproj deleted file mode 100644 index 71fcd86384..0000000000 --- a/build/visual-studio/shader-object/shader-object.vcxproj +++ /dev/null @@ -1,308 +0,0 @@ - - - - - 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 - - - - {25512BFB-1138-EDF2-BA88-5310A64E6659} - true - Win32Proj - shader-object - - - - 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\shader-object\ - shader-object - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\shader-object\ - shader-object - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\shader-object\ - shader-object - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\shader-object\ - shader-object - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\shader-object\ - shader-object - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\shader-object\ - shader-object - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - 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/shader-object/shader-object.vcxproj.filters b/build/visual-studio/shader-object/shader-object.vcxproj.filters deleted file mode 100644 index a745432985..0000000000 --- a/build/visual-studio/shader-object/shader-object.vcxproj.filters +++ /dev/null @@ -1,18 +0,0 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/shader-toy/shader-toy.vcxproj b/build/visual-studio/shader-toy/shader-toy.vcxproj deleted file mode 100644 index aae117044a..0000000000 --- a/build/visual-studio/shader-toy/shader-toy.vcxproj +++ /dev/null @@ -1,309 +0,0 @@ - - - - - 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 - - - - {0FC5DE93-FBEA-A8FA-E430-2EC6D0F5CDC6} - true - Win32Proj - shader-toy - - - - 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\shader-toy\ - shader-toy - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\shader-toy\ - shader-toy - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\shader-toy\ - shader-toy - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\shader-toy\ - shader-toy - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\shader-toy\ - shader-toy - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\shader-toy\ - shader-toy - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(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/shader-toy/shader-toy.vcxproj.filters b/build/visual-studio/shader-toy/shader-toy.vcxproj.filters deleted file mode 100644 index f952132a82..0000000000 --- a/build/visual-studio/shader-toy/shader-toy.vcxproj.filters +++ /dev/null @@ -1,21 +0,0 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/slang-capability-generator/slang-capability-generator.vcxproj b/build/visual-studio/slang-capability-generator/slang-capability-generator.vcxproj deleted file mode 100644 index 9d052c2be4..0000000000 --- a/build/visual-studio/slang-capability-generator/slang-capability-generator.vcxproj +++ /dev/null @@ -1,296 +0,0 @@ - - - - - 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 - - - - {FD16CA29-C66A-430A-822C-C09655088611} - true - Win32Proj - slang-capability-generator - - - - 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\slang-capability-generator\ - slang-capability-generator - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\slang-capability-generator\ - slang-capability-generator - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\slang-capability-generator\ - slang-capability-generator - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\slang-capability-generator\ - slang-capability-generator - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\slang-capability-generator\ - slang-capability-generator - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\slang-capability-generator\ - slang-capability-generator - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - - - - - - - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126} - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/slang-capability-generator/slang-capability-generator.vcxproj.filters b/build/visual-studio/slang-capability-generator/slang-capability-generator.vcxproj.filters deleted file mode 100644 index e6cf91b2c9..0000000000 --- a/build/visual-studio/slang-capability-generator/slang-capability-generator.vcxproj.filters +++ /dev/null @@ -1,21 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj b/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj deleted file mode 100644 index 4b01037390..0000000000 --- a/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj +++ /dev/null @@ -1,314 +0,0 @@ - - - - - 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 - - - - {CA8A30D1-8FA9-4330-B7F7-84709246D8DC} - true - Win32Proj - slang-cpp-extractor - - - - 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\slang-cpp-extractor\ - slang-cpp-extractor - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\slang-cpp-extractor\ - slang-cpp-extractor - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\slang-cpp-extractor\ - slang-cpp-extractor - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\slang-cpp-extractor\ - slang-cpp-extractor - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\slang-cpp-extractor\ - slang-cpp-extractor - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\slang-cpp-extractor\ - slang-cpp-extractor - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126} - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj.filters b/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj.filters deleted file mode 100644 index aad7317d2b..0000000000 --- a/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj.filters +++ /dev/null @@ -1,75 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - 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/slang-embed/slang-embed.vcxproj b/build/visual-studio/slang-embed/slang-embed.vcxproj deleted file mode 100644 index 3959e28ea7..0000000000 --- a/build/visual-studio/slang-embed/slang-embed.vcxproj +++ /dev/null @@ -1,284 +0,0 @@ - - - - - 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 - - - - {7F773DD9-EB8F-2403-B43C-B49C2014B99C} - true - Win32Proj - slang-embed - - - - 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\slang-embed\ - slang-embed - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\slang-embed\ - slang-embed - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\slang-embed\ - slang-embed - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\slang-embed\ - slang-embed - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\slang-embed\ - slang-embed - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\slang-embed\ - slang-embed - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/slang-embed/slang-embed.vcxproj.filters b/build/visual-studio/slang-embed/slang-embed.vcxproj.filters deleted file mode 100644 index 46cc158917..0000000000 --- a/build/visual-studio/slang-embed/slang-embed.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/slang-generate/slang-generate.vcxproj b/build/visual-studio/slang-generate/slang-generate.vcxproj deleted file mode 100644 index 8aa0c8efab..0000000000 --- a/build/visual-studio/slang-generate/slang-generate.vcxproj +++ /dev/null @@ -1,284 +0,0 @@ - - - - - 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 - - - - {66174227-8541-41FC-A6DF-4764FC66F78E} - true - Win32Proj - slang-generate - - - - 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\slang-generate\ - slang-generate - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\slang-generate\ - slang-generate - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\slang-generate\ - slang-generate - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\slang-generate\ - slang-generate - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\slang-generate\ - slang-generate - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\slang-generate\ - slang-generate - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/slang-generate/slang-generate.vcxproj.filters b/build/visual-studio/slang-generate/slang-generate.vcxproj.filters deleted file mode 100644 index a36c4667fb..0000000000 --- a/build/visual-studio/slang-generate/slang-generate.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/slang-lookup-generator/slang-lookup-generator.vcxproj b/build/visual-studio/slang-lookup-generator/slang-lookup-generator.vcxproj deleted file mode 100644 index 3f83e727ce..0000000000 --- a/build/visual-studio/slang-lookup-generator/slang-lookup-generator.vcxproj +++ /dev/null @@ -1,293 +0,0 @@ - - - - - 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 - - - - {3242BAA7-FC4C-4F76-83BC-E4403099DC1D} - true - Win32Proj - slang-lookup-generator - - - - 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\slang-lookup-generator\ - slang-lookup-generator - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\slang-lookup-generator\ - slang-lookup-generator - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\slang-lookup-generator\ - slang-lookup-generator - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\slang-lookup-generator\ - slang-lookup-generator - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\slang-lookup-generator\ - slang-lookup-generator - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\slang-lookup-generator\ - slang-lookup-generator - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - - - - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126} - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/slang-lookup-generator/slang-lookup-generator.vcxproj.filters b/build/visual-studio/slang-lookup-generator/slang-lookup-generator.vcxproj.filters deleted file mode 100644 index f549685347..0000000000 --- a/build/visual-studio/slang-lookup-generator/slang-lookup-generator.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - \ No newline at end of file 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 deleted file mode 100644 index a9bcfc6a32..0000000000 --- a/build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj +++ /dev/null @@ -1,299 +0,0 @@ - - - - - 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 - - - - {C5ACCA6E-C04D-4B36-8516-3752B3C13C2F} - true - Win32Proj - slang-reflection-test-tool - - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - true - - - DynamicLibrary - false - Unicode - v142 - - - DynamicLibrary - false - Unicode - v142 - - - DynamicLibrary - false - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - - - - - - - true - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\slang-reflection-test-tool\ - slang-reflection-test-tool - .dll - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\slang-reflection-test-tool\ - slang-reflection-test-tool - .dll - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\slang-reflection-test-tool\ - slang-reflection-test-tool - .dll - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\slang-reflection-test-tool\ - slang-reflection-test-tool - .dll - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\slang-reflection-test-tool\ - slang-reflection-test-tool - .dll - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\slang-reflection-test-tool\ - slang-reflection-test-tool - .dll - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-x86\debug\slang-reflection-test-tool.lib - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-x64\debug\slang-reflection-test-tool.lib - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-aarch64\debug\slang-reflection-test-tool.lib - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-x86\release\slang-reflection-test-tool.lib - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-x64\release\slang-reflection-test-tool.lib - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-aarch64\release\slang-reflection-test-tool.lib - - - - - - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj.filters b/build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj.filters deleted file mode 100644 index dc292b0f3a..0000000000 --- a/build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/slang-rt/slang-rt.vcxproj b/build/visual-studio/slang-rt/slang-rt.vcxproj deleted file mode 100644 index 0d88549e26..0000000000 --- a/build/visual-studio/slang-rt/slang-rt.vcxproj +++ /dev/null @@ -1,429 +0,0 @@ - - - - - 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 - - - - {DFC79D72-91DE-434C-871B-B3943B488BEB} - true - Win32Proj - slang-rt - - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - true - - - DynamicLibrary - false - Unicode - v142 - - - DynamicLibrary - false - Unicode - v142 - - - DynamicLibrary - false - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - - - - - - - true - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\slang-rt\ - slang-rt - .dll - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\slang-rt\ - slang-rt - .dll - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\slang-rt\ - slang-rt - .dll - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\slang-rt\ - slang-rt - .dll - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\slang-rt\ - slang-rt - .dll - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\slang-rt\ - slang-rt - .dll - - - - NotUsing - Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) - ..\..\..\external\miniz;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-x86\debug\slang-rt.lib - - - - - NotUsing - Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) - ..\..\..\external\miniz;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-x64\debug\slang-rt.lib - - - - - NotUsing - Level4 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) - ..\..\..\external\miniz;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-aarch64\debug\slang-rt.lib - - - - - NotUsing - Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) - ..\..\..\external\miniz;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-x86\release\slang-rt.lib - - - - - NotUsing - Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) - ..\..\..\external\miniz;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-x64\release\slang-rt.lib - - - - - NotUsing - Level4 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) - ..\..\..\external\miniz;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-aarch64\release\slang-rt.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F} - - - {E1EC8075-823E-46E5-BC38-C124CCCDF878} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/slang-rt/slang-rt.vcxproj.filters b/build/visual-studio/slang-rt/slang-rt.vcxproj.filters deleted file mode 100644 index 3b9e2b59e6..0000000000 --- a/build/visual-studio/slang-rt/slang-rt.vcxproj.filters +++ /dev/null @@ -1,398 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - 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/slang-spirv-embed-generator/slang-spirv-embed-generator.vcxproj b/build/visual-studio/slang-spirv-embed-generator/slang-spirv-embed-generator.vcxproj deleted file mode 100644 index 9cdeec8757..0000000000 --- a/build/visual-studio/slang-spirv-embed-generator/slang-spirv-embed-generator.vcxproj +++ /dev/null @@ -1,293 +0,0 @@ - - - - - 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 - - - - {8DA787CC-0E04-450F-8E29-88EAC5EBE9BB} - true - Win32Proj - slang-spirv-embed-generator - - - - 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\slang-spirv-embed-generator\ - slang-spirv-embed-generator - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\slang-spirv-embed-generator\ - slang-spirv-embed-generator - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\slang-spirv-embed-generator\ - slang-spirv-embed-generator - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\slang-spirv-embed-generator\ - slang-spirv-embed-generator - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\slang-spirv-embed-generator\ - slang-spirv-embed-generator - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\slang-spirv-embed-generator\ - slang-spirv-embed-generator - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - - - - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126} - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/slang-spirv-embed-generator/slang-spirv-embed-generator.vcxproj.filters b/build/visual-studio/slang-spirv-embed-generator/slang-spirv-embed-generator.vcxproj.filters deleted file mode 100644 index 0b113e25a5..0000000000 --- a/build/visual-studio/slang-spirv-embed-generator/slang-spirv-embed-generator.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/slang-test/slang-test.vcxproj b/build/visual-studio/slang-test/slang-test.vcxproj deleted file mode 100644 index 496b1b3139..0000000000 --- a/build/visual-studio/slang-test/slang-test.vcxproj +++ /dev/null @@ -1,317 +0,0 @@ - - - - - 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 - - - - {0C768A18-1D25-4000-9F37-DA5FE99E3B64} - true - Win32Proj - slang-test - - - - 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\slang-test\ - slang-test - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\slang-test\ - slang-test - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\slang-test\ - slang-test - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\slang-test\ - slang-test - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\slang-test\ - slang-test - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\slang-test\ - slang-test - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - - - - - - - - - - - - - - - - - - - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126} - - - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - {E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F} - - - {E1EC8075-823E-46E5-BC38-C124CCCDF878} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/slang-test/slang-test.vcxproj.filters b/build/visual-studio/slang-test/slang-test.vcxproj.filters deleted file mode 100644 index 96d2738975..0000000000 --- a/build/visual-studio/slang-test/slang-test.vcxproj.filters +++ /dev/null @@ -1,57 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - 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/slang-unit-test-tool/slang-unit-test-tool.vcxproj b/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj deleted file mode 100644 index c1d6f395d4..0000000000 --- a/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj +++ /dev/null @@ -1,341 +0,0 @@ - - - - - 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 - - - - {0162864E-7651-4B5E-9105-C571105276EA} - true - Win32Proj - slang-unit-test-tool - - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - true - - - DynamicLibrary - false - Unicode - v142 - - - DynamicLibrary - false - Unicode - v142 - - - DynamicLibrary - false - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - - - - - - - true - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\slang-unit-test-tool\ - slang-unit-test-tool - .dll - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\slang-unit-test-tool\ - slang-unit-test-tool - .dll - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\slang-unit-test-tool\ - slang-unit-test-tool - .dll - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\slang-unit-test-tool\ - slang-unit-test-tool - .dll - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\slang-unit-test-tool\ - slang-unit-test-tool - .dll - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\slang-unit-test-tool\ - slang-unit-test-tool - .dll - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-x86\debug\slang-unit-test-tool.lib - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-x64\debug\slang-unit-test-tool.lib - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-aarch64\debug\slang-unit-test-tool.lib - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-x86\release\slang-unit-test-tool.lib - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-x64\release\slang-unit-test-tool.lib - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-aarch64\release\slang-unit-test-tool.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {E1EC8075-823E-46E5-BC38-C124CCCDF878} - - - {E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F} - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126} - - - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj.filters b/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj.filters deleted file mode 100644 index f3a9c85f87..0000000000 --- a/build/visual-studio/slang-unit-test-tool/slang-unit-test-tool.vcxproj.filters +++ /dev/null @@ -1,107 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - 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/slang/slang.vcxproj b/build/visual-studio/slang/slang.vcxproj deleted file mode 100644 index 183f83abcf..0000000000 --- a/build/visual-studio/slang/slang.vcxproj +++ /dev/null @@ -1,784 +0,0 @@ - - - - - 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 - - - - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} - true - Win32Proj - slang - - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - true - - - DynamicLibrary - false - Unicode - v142 - - - DynamicLibrary - false - Unicode - v142 - - - DynamicLibrary - false - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - - - - - - - true - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\slang\ - slang - .dll - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\slang\ - slang - .dll - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\slang\ - slang - .dll - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\slang\ - slang - .dll - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\slang\ - slang - .dll - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\slang\ - slang - .dll - - - - NotUsing - Level4 - _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;..\..\..\source;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-x86\debug\slang.lib - - - IF EXIST ..\..\..\external\slang-llvm\bin\windows-x86\release\slang-llvm.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-llvm\bin\windows-x86\release\slang-llvm.dll ..\..\..\bin\windows-x86\debug > nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-llvm\bin\windows-x86\release\slang-llvm.dll ..\..\..\bin\windows-x86\debug > nul) -IF EXIST ..\..\..\external\slang-glslang\bin\windows-x86\release\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-glslang\bin\windows-x86\release\slang-glslang.dll ..\..\..\bin\windows-x86\debug > nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-glslang\bin\windows-x86\release\slang-glslang.dll ..\..\..\bin\windows-x86\debug > nul) - - - - - NotUsing - Level4 - _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;..\..\..\source;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-x64\debug\slang.lib - - - IF EXIST ..\..\..\external\slang-llvm\bin\windows-x64\release\slang-llvm.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-llvm\bin\windows-x64\release\slang-llvm.dll ..\..\..\bin\windows-x64\debug > nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-llvm\bin\windows-x64\release\slang-llvm.dll ..\..\..\bin\windows-x64\debug > nul) -IF EXIST ..\..\..\external\slang-glslang\bin\windows-x64\release\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-glslang\bin\windows-x64\release\slang-glslang.dll ..\..\..\bin\windows-x64\debug > nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-glslang\bin\windows-x64\release\slang-glslang.dll ..\..\..\bin\windows-x64\debug > nul) - - - - - NotUsing - Level4 - _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;..\..\..\source;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - ..\..\..\bin\windows-aarch64\debug\slang.lib - - - IF EXIST ..\..\..\external\slang-llvm\bin\windows-aarch64\release\slang-llvm.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-llvm\bin\windows-aarch64\release\slang-llvm.dll ..\..\..\bin\windows-aarch64\debug > nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-llvm\bin\windows-aarch64\release\slang-llvm.dll ..\..\..\bin\windows-aarch64\debug > nul) -IF EXIST ..\..\..\external\slang-glslang\bin\windows-aarch64\release\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-glslang\bin\windows-aarch64\release\slang-glslang.dll ..\..\..\bin\windows-aarch64\debug > nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-glslang\bin\windows-aarch64\release\slang-glslang.dll ..\..\..\bin\windows-aarch64\debug > nul) - - - - - NotUsing - Level4 - 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;..\..\..\source;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-x86\release\slang.lib - - - IF EXIST ..\..\..\external\slang-llvm\bin\windows-x86\release\slang-llvm.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-llvm\bin\windows-x86\release\slang-llvm.dll ..\..\..\bin\windows-x86\release > nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-llvm\bin\windows-x86\release\slang-llvm.dll ..\..\..\bin\windows-x86\release > nul) -IF EXIST ..\..\..\external\slang-glslang\bin\windows-x86\release\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-glslang\bin\windows-x86\release\slang-glslang.dll ..\..\..\bin\windows-x86\release > nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-glslang\bin\windows-x86\release\slang-glslang.dll ..\..\..\bin\windows-x86\release > nul) - - - - - NotUsing - Level4 - 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;..\..\..\source;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-x64\release\slang.lib - - - IF EXIST ..\..\..\external\slang-llvm\bin\windows-x64\release\slang-llvm.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-llvm\bin\windows-x64\release\slang-llvm.dll ..\..\..\bin\windows-x64\release > nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-llvm\bin\windows-x64\release\slang-llvm.dll ..\..\..\bin\windows-x64\release > nul) -IF EXIST ..\..\..\external\slang-glslang\bin\windows-x64\release\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-glslang\bin\windows-x64\release\slang-glslang.dll ..\..\..\bin\windows-x64\release > nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-glslang\bin\windows-x64\release\slang-glslang.dll ..\..\..\bin\windows-x64\release > nul) - - - - - NotUsing - Level4 - 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;..\..\..\source;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - ..\..\..\bin\windows-aarch64\release\slang.lib - - - IF EXIST ..\..\..\external\slang-llvm\bin\windows-aarch64\release\slang-llvm.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-llvm\bin\windows-aarch64\release\slang-llvm.dll ..\..\..\bin\windows-aarch64\release > nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-llvm\bin\windows-aarch64\release\slang-llvm.dll ..\..\..\bin\windows-aarch64\release > nul) -IF EXIST ..\..\..\external\slang-glslang\bin\windows-aarch64\release\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-glslang\bin\windows-aarch64\release\slang-glslang.dll ..\..\..\bin\windows-aarch64\release > nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-glslang\bin\windows-aarch64\release\slang-glslang.dll ..\..\..\bin\windows-aarch64\release > nul) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126} - - - {E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F} - - - {E1EC8075-823E-46E5-BC38-C124CCCDF878} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/slang/slang.vcxproj.filters b/build/visual-studio/slang/slang.vcxproj.filters deleted file mode 100644 index 5d5743c163..0000000000 --- a/build/visual-studio/slang/slang.vcxproj.filters +++ /dev/null @@ -1,1369 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - 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/slangc/slangc.vcxproj b/build/visual-studio/slangc/slangc.vcxproj deleted file mode 100644 index e8de3b89da..0000000000 --- a/build/visual-studio/slangc/slangc.vcxproj +++ /dev/null @@ -1,287 +0,0 @@ - - - - - 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 - - - - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7} - true - Win32Proj - slangc - - - - 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\slangc\ - slangc - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\slangc\ - slangc - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\slangc\ - slangc - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\slangc\ - slangc - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\slangc\ - slangc - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\slangc\ - slangc - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/slangc/slangc.vcxproj.filters b/build/visual-studio/slangc/slangc.vcxproj.filters deleted file mode 100644 index 9d1a6ed93f..0000000000 --- a/build/visual-studio/slangc/slangc.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/slangd/slangd.vcxproj b/build/visual-studio/slangd/slangd.vcxproj deleted file mode 100644 index 346e2bca3c..0000000000 --- a/build/visual-studio/slangd/slangd.vcxproj +++ /dev/null @@ -1,296 +0,0 @@ - - - - - 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 - - - - {B2D63B45-92B0-40F7-B242-CCA4DFD64341} - true - Win32Proj - slangd - - - - 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\slangd\ - slangd - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\slangd\ - slangd - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\slangd\ - slangd - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\slangd\ - slangd - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\slangd\ - slangd - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\slangd\ - slangd - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - - - - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126} - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/slangd/slangd.vcxproj.filters b/build/visual-studio/slangd/slangd.vcxproj.filters deleted file mode 100644 index 95c658398c..0000000000 --- a/build/visual-studio/slangd/slangd.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/test-process/test-process.vcxproj b/build/visual-studio/test-process/test-process.vcxproj deleted file mode 100644 index d0819084a3..0000000000 --- a/build/visual-studio/test-process/test-process.vcxproj +++ /dev/null @@ -1,293 +0,0 @@ - - - - - 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 - - - - {BE412850-4BB9-429A-877C-BFBC4B34186C} - true - Win32Proj - test-process - - - - 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\test-process\ - test-process - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\test-process\ - test-process - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\test-process\ - test-process - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\test-process\ - test-process - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\test-process\ - test-process - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\test-process\ - test-process - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - - - - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126} - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/test-process/test-process.vcxproj.filters b/build/visual-studio/test-process/test-process.vcxproj.filters deleted file mode 100644 index 27a7077985..0000000000 --- a/build/visual-studio/test-process/test-process.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/test-server/test-server.vcxproj b/build/visual-studio/test-server/test-server.vcxproj deleted file mode 100644 index 6c074638ca..0000000000 --- a/build/visual-studio/test-server/test-server.vcxproj +++ /dev/null @@ -1,301 +0,0 @@ - - - - - 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 - - - - {23149706-C12F-4329-B6AA-8266407C32D3} - true - Win32Proj - test-server - - - - 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\test-server\ - test-server - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\test-server\ - test-server - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\test-server\ - test-server - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\test-server\ - test-server - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\test-server\ - test-server - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\test-server\ - test-server - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - - - - - - - - - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126} - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/test-server/test-server.vcxproj.filters b/build/visual-studio/test-server/test-server.vcxproj.filters deleted file mode 100644 index e8578e394d..0000000000 --- a/build/visual-studio/test-server/test-server.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/triangle/triangle.vcxproj b/build/visual-studio/triangle/triangle.vcxproj deleted file mode 100644 index 8406539df7..0000000000 --- a/build/visual-studio/triangle/triangle.vcxproj +++ /dev/null @@ -1,308 +0,0 @@ - - - - - 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 - - - - {3BB99068-27C9-3C39-9082-A1577CB12BD2} - true - Win32Proj - triangle - - - - 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\triangle\ - triangle - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\triangle\ - triangle - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\triangle\ - triangle - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\triangle\ - triangle - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\triangle\ - triangle - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\triangle\ - triangle - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(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/triangle/triangle.vcxproj.filters b/build/visual-studio/triangle/triangle.vcxproj.filters deleted file mode 100644 index 80f1e304e8..0000000000 --- a/build/visual-studio/triangle/triangle.vcxproj.filters +++ /dev/null @@ -1,18 +0,0 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/vk-pipeline-create/vk-pipeline-create.vcxproj b/build/visual-studio/vk-pipeline-create/vk-pipeline-create.vcxproj deleted file mode 100644 index bc62dce2b0..0000000000 --- a/build/visual-studio/vk-pipeline-create/vk-pipeline-create.vcxproj +++ /dev/null @@ -1,306 +0,0 @@ - - - - - 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 - - - - {9ED23316-AE8B-4018-9407-271F4DDB8CBA} - true - Win32Proj - vk-pipeline-create - - - - 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\vk-pipeline-create\ - vk-pipeline-create - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\vk-pipeline-create\ - vk-pipeline-create - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\vk-pipeline-create\ - vk-pipeline-create - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\vk-pipeline-create\ - vk-pipeline-create - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\vk-pipeline-create\ - vk-pipeline-create - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\vk-pipeline-create\ - vk-pipeline-create - .exe - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external\vulkan\include;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external\vulkan\include;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external\vulkan\include;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - false - MultiThreadedDebug - true - stdcpp17 - - - Console - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external\vulkan\include;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external\vulkan\include;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;NOMINMAX;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) - ..\..\..;..\..\..\external\vulkan\include;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - true - stdcpp17 - - - Console - true - true - - - - - - - - - - - - {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/vk-pipeline-create/vk-pipeline-create.vcxproj.filters b/build/visual-studio/vk-pipeline-create/vk-pipeline-create.vcxproj.filters deleted file mode 100644 index 87f7c28942..0000000000 --- a/build/visual-studio/vk-pipeline-create/vk-pipeline-create.vcxproj.filters +++ /dev/null @@ -1,24 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/slang.sln b/slang.sln deleted file mode 100644 index d43d1fe81a..0000000000 --- a/slang.sln +++ /dev/null @@ -1,659 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{FD47AE19-69FD-260F-F2F1-20E65EA61D13}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-test", "build\visual-studio\slang-test\slang-test.vcxproj", "{0C768A18-1D25-4000-9F37-DA5FE99E3B64}" - ProjectSection(ProjectDependencies) = postProject - {C5ACCA6E-C04D-4B36-8516-3752B3C13C2F} = {C5ACCA6E-C04D-4B36-8516-3752B3C13C2F} - {61F7EB00-7281-4BF3-9470-7C2EA92620C3} = {61F7EB00-7281-4BF3-9470-7C2EA92620C3} - {0162864E-7651-4B5E-9105-C571105276EA} = {0162864E-7651-4B5E-9105-C571105276EA} - {092DAB9F-1DA5-4538-ADD7-1A8D1DBFD519} = {092DAB9F-1DA5-4538-ADD7-1A8D1DBFD519} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gfx", "build\visual-studio\gfx\gfx.vcxproj", "{222F7498-B40C-4F3F-A704-DDEB91A4484A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gfx-util", "build\visual-studio\gfx-util\gfx-util.vcxproj", "{F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "platform", "build\visual-studio\platform\platform.vcxproj", "{3565FE5E-4FA3-11EB-AE93-0242AC130002}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-capability-generator", "build\visual-studio\slang-capability-generator\slang-capability-generator.vcxproj", "{FD16CA29-C66A-430A-822C-C09655088611}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-cpp-extractor", "build\visual-studio\slang-cpp-extractor\slang-cpp-extractor.vcxproj", "{CA8A30D1-8FA9-4330-B7F7-84709246D8DC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-embed", "build\visual-studio\slang-embed\slang-embed.vcxproj", "{7F773DD9-EB8F-2403-B43C-B49C2014B99C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-generate", "build\visual-studio\slang-generate\slang-generate.vcxproj", "{66174227-8541-41FC-A6DF-4764FC66F78E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-lookup-generator", "build\visual-studio\slang-lookup-generator\slang-lookup-generator.vcxproj", "{3242BAA7-FC4C-4F76-83BC-E4403099DC1D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-spirv-embed-generator", "build\visual-studio\slang-spirv-embed-generator\slang-spirv-embed-generator.vcxproj", "{8DA787CC-0E04-450F-8E29-88EAC5EBE9BB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slangd", "build\visual-studio\slangd\slangd.vcxproj", "{B2D63B45-92B0-40F7-B242-CCA4DFD64341}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-process", "build\visual-studio\test-process\test-process.vcxproj", "{BE412850-4BB9-429A-877C-BFBC4B34186C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-server", "build\visual-studio\test-server\test-server.vcxproj", "{23149706-C12F-4329-B6AA-8266407C32D3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vk-pipeline-create", "build\visual-studio\vk-pipeline-create\vk-pipeline-create.vcxproj", "{9ED23316-AE8B-4018-9407-271F4DDB8CBA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compiler-core", "build\visual-studio\compiler-core\compiler-core.vcxproj", "{12C1E89D-F5D0-41D3-8E8D-FB3F358F8126}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "build\visual-studio\core\core.vcxproj", "{F9BE7957-8399-899E-0C49-E714FDDD4B65}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{EB5FC2C6-D72D-B6CC-C0C1-26F3AC2E9231}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "autodiff-texture", "build\visual-studio\autodiff-texture\autodiff-texture.vcxproj", "{2F0A3884-1B72-FE51-84DD-12687064153E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpu-com-example", "build\visual-studio\cpu-com-example\cpu-com-example.vcxproj", "{0996B38F-F512-A7D2-1E90-A7E60A6C4366}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpu-hello-world", "build\visual-studio\cpu-hello-world\cpu-hello-world.vcxproj", "{4B47A364-37C4-96A7-6041-97BB4C1D333B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example-base", "build\visual-studio\example-base\example-base.vcxproj", "{37BED5B5-23FA-D81F-8C0C-F1167867813A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpu-printing", "build\visual-studio\gpu-printing\gpu-printing.vcxproj", "{57C81DD3-4304-213D-AC16-39349871C957}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hello-world", "build\visual-studio\hello-world\hello-world.vcxproj", "{010BE414-ED5B-CF56-16C0-BD18027062C0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "model-viewer", "build\visual-studio\model-viewer\model-viewer.vcxproj", "{2F8724C6-1BC3-2730-84D5-3F277030D04A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "platform-test", "build\visual-studio\platform-test\platform-test.vcxproj", "{F385D6A7-DF6C-989F-88BD-FEBC74831106}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ray-tracing", "build\visual-studio\ray-tracing\ray-tracing.vcxproj", "{71AC0F50-5DFD-FA91-8661-E95372118EFB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ray-tracing-pipeline", "build\visual-studio\ray-tracing-pipeline\ray-tracing-pipeline.vcxproj", "{17BA8E32-034E-84DA-6C12-DE8E58C5BECC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shader-object", "build\visual-studio\shader-object\shader-object.vcxproj", "{25512BFB-1138-EDF2-BA88-5310A64E6659}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shader-toy", "build\visual-studio\shader-toy\shader-toy.vcxproj", "{0FC5DE93-FBEA-A8FA-E430-2EC6D0F5CDC6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "triangle", "build\visual-studio\triangle\triangle.vcxproj", "{3BB99068-27C9-3C39-9082-A1577CB12BD2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "generator", "generator", "{F3AB4ED5-5F37-BC99-6848-3F8ED452189A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate-lookup-tables", "build\visual-studio\generate-lookup-tables\generate-lookup-tables.vcxproj", "{5FFA0764-4BF4-30B6-3461-C7C620FA9622}" - ProjectSection(ProjectDependencies) = postProject - {3242BAA7-FC4C-4F76-83BC-E4403099DC1D} = {3242BAA7-FC4C-4F76-83BC-E4403099DC1D} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate-spirv-embed", "build\visual-studio\generate-spirv-embed\generate-spirv-embed.vcxproj", "{FB5DA174-E7EC-2A3E-900B-3F397C793BE4}" - ProjectSection(ProjectDependencies) = postProject - {8DA787CC-0E04-450F-8E29-88EAC5EBE9BB} = {8DA787CC-0E04-450F-8E29-88EAC5EBE9BB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "run-generators", "build\visual-studio\run-generators\run-generators.vcxproj", "{E145B2B8-CD13-A6BE-B6A7-16E5A2148223}" - ProjectSection(ProjectDependencies) = postProject - {CA8A30D1-8FA9-4330-B7F7-84709246D8DC} = {CA8A30D1-8FA9-4330-B7F7-84709246D8DC} - {66174227-8541-41FC-A6DF-4764FC66F78E} = {66174227-8541-41FC-A6DF-4764FC66F78E} - {7F773DD9-EB8F-2403-B43C-B49C2014B99C} = {7F773DD9-EB8F-2403-B43C-B49C2014B99C} - {FD16CA29-C66A-430A-822C-C09655088611} = {FD16CA29-C66A-430A-822C-C09655088611} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lz4", "build\visual-studio\lz4\lz4.vcxproj", "{E1EC8075-823E-46E5-BC38-C124CCCDF878}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniz", "build\visual-studio\miniz\miniz.vcxproj", "{E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang", "build\visual-studio\slang\slang.vcxproj", "{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}" - ProjectSection(ProjectDependencies) = postProject - {E145B2B8-CD13-A6BE-B6A7-16E5A2148223} = {E145B2B8-CD13-A6BE-B6A7-16E5A2148223} - {5FFA0764-4BF4-30B6-3461-C7C620FA9622} = {5FFA0764-4BF4-30B6-3461-C7C620FA9622} - {FB5DA174-E7EC-2A3E-900B-3F397C793BE4} = {FB5DA174-E7EC-2A3E-900B-3F397C793BE4} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-rt", "build\visual-studio\slang-rt\slang-rt.vcxproj", "{DFC79D72-91DE-434C-871B-B3943B488BEB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slangc", "build\visual-studio\slangc\slangc.vcxproj", "{D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test-tool", "test-tool", "{57B5AA5E-C340-1823-CC51-9B17385C7423}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gfx-unit-test-tool", "build\visual-studio\gfx-unit-test-tool\gfx-unit-test-tool.vcxproj", "{092DAB9F-1DA5-4538-ADD7-1A8D1DBFD519}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "render-test-tool", "build\visual-studio\render-test-tool\render-test-tool.vcxproj", "{61F7EB00-7281-4BF3-9470-7C2EA92620C3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-reflection-test-tool", "build\visual-studio\slang-reflection-test-tool\slang-reflection-test-tool.vcxproj", "{C5ACCA6E-C04D-4B36-8516-3752B3C13C2F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-unit-test-tool", "build\visual-studio\slang-unit-test-tool\slang-unit-test-tool.vcxproj", "{0162864E-7651-4B5E-9105-C571105276EA}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|aarch64 = Debug|aarch64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|aarch64 = Release|aarch64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0C768A18-1D25-4000-9F37-DA5FE99E3B64}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {0C768A18-1D25-4000-9F37-DA5FE99E3B64}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {0C768A18-1D25-4000-9F37-DA5FE99E3B64}.Debug|Win32.ActiveCfg = Debug|Win32 - {0C768A18-1D25-4000-9F37-DA5FE99E3B64}.Debug|Win32.Build.0 = Debug|Win32 - {0C768A18-1D25-4000-9F37-DA5FE99E3B64}.Debug|x64.ActiveCfg = Debug|x64 - {0C768A18-1D25-4000-9F37-DA5FE99E3B64}.Debug|x64.Build.0 = Debug|x64 - {0C768A18-1D25-4000-9F37-DA5FE99E3B64}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {0C768A18-1D25-4000-9F37-DA5FE99E3B64}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {0C768A18-1D25-4000-9F37-DA5FE99E3B64}.Release|Win32.ActiveCfg = Release|Win32 - {0C768A18-1D25-4000-9F37-DA5FE99E3B64}.Release|Win32.Build.0 = Release|Win32 - {0C768A18-1D25-4000-9F37-DA5FE99E3B64}.Release|x64.ActiveCfg = Release|x64 - {0C768A18-1D25-4000-9F37-DA5FE99E3B64}.Release|x64.Build.0 = Release|x64 - {222F7498-B40C-4F3F-A704-DDEB91A4484A}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {222F7498-B40C-4F3F-A704-DDEB91A4484A}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {222F7498-B40C-4F3F-A704-DDEB91A4484A}.Debug|Win32.ActiveCfg = Debug|Win32 - {222F7498-B40C-4F3F-A704-DDEB91A4484A}.Debug|Win32.Build.0 = Debug|Win32 - {222F7498-B40C-4F3F-A704-DDEB91A4484A}.Debug|x64.ActiveCfg = Debug|x64 - {222F7498-B40C-4F3F-A704-DDEB91A4484A}.Debug|x64.Build.0 = Debug|x64 - {222F7498-B40C-4F3F-A704-DDEB91A4484A}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {222F7498-B40C-4F3F-A704-DDEB91A4484A}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {222F7498-B40C-4F3F-A704-DDEB91A4484A}.Release|Win32.ActiveCfg = Release|Win32 - {222F7498-B40C-4F3F-A704-DDEB91A4484A}.Release|Win32.Build.0 = Release|Win32 - {222F7498-B40C-4F3F-A704-DDEB91A4484A}.Release|x64.ActiveCfg = Release|x64 - {222F7498-B40C-4F3F-A704-DDEB91A4484A}.Release|x64.Build.0 = Release|x64 - {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B}.Debug|Win32.ActiveCfg = Debug|Win32 - {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B}.Debug|Win32.Build.0 = Debug|Win32 - {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B}.Debug|x64.ActiveCfg = Debug|x64 - {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B}.Debug|x64.Build.0 = Debug|x64 - {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B}.Release|Win32.ActiveCfg = Release|Win32 - {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B}.Release|Win32.Build.0 = Release|Win32 - {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B}.Release|x64.ActiveCfg = Release|x64 - {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B}.Release|x64.Build.0 = Release|x64 - {3565FE5E-4FA3-11EB-AE93-0242AC130002}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {3565FE5E-4FA3-11EB-AE93-0242AC130002}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {3565FE5E-4FA3-11EB-AE93-0242AC130002}.Debug|Win32.ActiveCfg = Debug|Win32 - {3565FE5E-4FA3-11EB-AE93-0242AC130002}.Debug|Win32.Build.0 = Debug|Win32 - {3565FE5E-4FA3-11EB-AE93-0242AC130002}.Debug|x64.ActiveCfg = Debug|x64 - {3565FE5E-4FA3-11EB-AE93-0242AC130002}.Debug|x64.Build.0 = Debug|x64 - {3565FE5E-4FA3-11EB-AE93-0242AC130002}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {3565FE5E-4FA3-11EB-AE93-0242AC130002}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {3565FE5E-4FA3-11EB-AE93-0242AC130002}.Release|Win32.ActiveCfg = Release|Win32 - {3565FE5E-4FA3-11EB-AE93-0242AC130002}.Release|Win32.Build.0 = Release|Win32 - {3565FE5E-4FA3-11EB-AE93-0242AC130002}.Release|x64.ActiveCfg = Release|x64 - {3565FE5E-4FA3-11EB-AE93-0242AC130002}.Release|x64.Build.0 = Release|x64 - {FD16CA29-C66A-430A-822C-C09655088611}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {FD16CA29-C66A-430A-822C-C09655088611}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {FD16CA29-C66A-430A-822C-C09655088611}.Debug|Win32.ActiveCfg = Debug|Win32 - {FD16CA29-C66A-430A-822C-C09655088611}.Debug|Win32.Build.0 = Debug|Win32 - {FD16CA29-C66A-430A-822C-C09655088611}.Debug|x64.ActiveCfg = Debug|x64 - {FD16CA29-C66A-430A-822C-C09655088611}.Debug|x64.Build.0 = Debug|x64 - {FD16CA29-C66A-430A-822C-C09655088611}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {FD16CA29-C66A-430A-822C-C09655088611}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {FD16CA29-C66A-430A-822C-C09655088611}.Release|Win32.ActiveCfg = Release|Win32 - {FD16CA29-C66A-430A-822C-C09655088611}.Release|Win32.Build.0 = Release|Win32 - {FD16CA29-C66A-430A-822C-C09655088611}.Release|x64.ActiveCfg = Release|x64 - {FD16CA29-C66A-430A-822C-C09655088611}.Release|x64.Build.0 = Release|x64 - {CA8A30D1-8FA9-4330-B7F7-84709246D8DC}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {CA8A30D1-8FA9-4330-B7F7-84709246D8DC}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {CA8A30D1-8FA9-4330-B7F7-84709246D8DC}.Debug|Win32.ActiveCfg = Debug|Win32 - {CA8A30D1-8FA9-4330-B7F7-84709246D8DC}.Debug|Win32.Build.0 = Debug|Win32 - {CA8A30D1-8FA9-4330-B7F7-84709246D8DC}.Debug|x64.ActiveCfg = Debug|x64 - {CA8A30D1-8FA9-4330-B7F7-84709246D8DC}.Debug|x64.Build.0 = Debug|x64 - {CA8A30D1-8FA9-4330-B7F7-84709246D8DC}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {CA8A30D1-8FA9-4330-B7F7-84709246D8DC}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {CA8A30D1-8FA9-4330-B7F7-84709246D8DC}.Release|Win32.ActiveCfg = Release|Win32 - {CA8A30D1-8FA9-4330-B7F7-84709246D8DC}.Release|Win32.Build.0 = Release|Win32 - {CA8A30D1-8FA9-4330-B7F7-84709246D8DC}.Release|x64.ActiveCfg = Release|x64 - {CA8A30D1-8FA9-4330-B7F7-84709246D8DC}.Release|x64.Build.0 = Release|x64 - {7F773DD9-EB8F-2403-B43C-B49C2014B99C}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {7F773DD9-EB8F-2403-B43C-B49C2014B99C}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {7F773DD9-EB8F-2403-B43C-B49C2014B99C}.Debug|Win32.ActiveCfg = Debug|Win32 - {7F773DD9-EB8F-2403-B43C-B49C2014B99C}.Debug|Win32.Build.0 = Debug|Win32 - {7F773DD9-EB8F-2403-B43C-B49C2014B99C}.Debug|x64.ActiveCfg = Debug|x64 - {7F773DD9-EB8F-2403-B43C-B49C2014B99C}.Debug|x64.Build.0 = Debug|x64 - {7F773DD9-EB8F-2403-B43C-B49C2014B99C}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {7F773DD9-EB8F-2403-B43C-B49C2014B99C}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {7F773DD9-EB8F-2403-B43C-B49C2014B99C}.Release|Win32.ActiveCfg = Release|Win32 - {7F773DD9-EB8F-2403-B43C-B49C2014B99C}.Release|Win32.Build.0 = Release|Win32 - {7F773DD9-EB8F-2403-B43C-B49C2014B99C}.Release|x64.ActiveCfg = Release|x64 - {7F773DD9-EB8F-2403-B43C-B49C2014B99C}.Release|x64.Build.0 = Release|x64 - {66174227-8541-41FC-A6DF-4764FC66F78E}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {66174227-8541-41FC-A6DF-4764FC66F78E}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {66174227-8541-41FC-A6DF-4764FC66F78E}.Debug|Win32.ActiveCfg = Debug|Win32 - {66174227-8541-41FC-A6DF-4764FC66F78E}.Debug|Win32.Build.0 = Debug|Win32 - {66174227-8541-41FC-A6DF-4764FC66F78E}.Debug|x64.ActiveCfg = Debug|x64 - {66174227-8541-41FC-A6DF-4764FC66F78E}.Debug|x64.Build.0 = Debug|x64 - {66174227-8541-41FC-A6DF-4764FC66F78E}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {66174227-8541-41FC-A6DF-4764FC66F78E}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {66174227-8541-41FC-A6DF-4764FC66F78E}.Release|Win32.ActiveCfg = Release|Win32 - {66174227-8541-41FC-A6DF-4764FC66F78E}.Release|Win32.Build.0 = Release|Win32 - {66174227-8541-41FC-A6DF-4764FC66F78E}.Release|x64.ActiveCfg = Release|x64 - {66174227-8541-41FC-A6DF-4764FC66F78E}.Release|x64.Build.0 = Release|x64 - {3242BAA7-FC4C-4F76-83BC-E4403099DC1D}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {3242BAA7-FC4C-4F76-83BC-E4403099DC1D}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {3242BAA7-FC4C-4F76-83BC-E4403099DC1D}.Debug|Win32.ActiveCfg = Debug|Win32 - {3242BAA7-FC4C-4F76-83BC-E4403099DC1D}.Debug|Win32.Build.0 = Debug|Win32 - {3242BAA7-FC4C-4F76-83BC-E4403099DC1D}.Debug|x64.ActiveCfg = Debug|x64 - {3242BAA7-FC4C-4F76-83BC-E4403099DC1D}.Debug|x64.Build.0 = Debug|x64 - {3242BAA7-FC4C-4F76-83BC-E4403099DC1D}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {3242BAA7-FC4C-4F76-83BC-E4403099DC1D}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {3242BAA7-FC4C-4F76-83BC-E4403099DC1D}.Release|Win32.ActiveCfg = Release|Win32 - {3242BAA7-FC4C-4F76-83BC-E4403099DC1D}.Release|Win32.Build.0 = Release|Win32 - {3242BAA7-FC4C-4F76-83BC-E4403099DC1D}.Release|x64.ActiveCfg = Release|x64 - {3242BAA7-FC4C-4F76-83BC-E4403099DC1D}.Release|x64.Build.0 = Release|x64 - {8DA787CC-0E04-450F-8E29-88EAC5EBE9BB}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {8DA787CC-0E04-450F-8E29-88EAC5EBE9BB}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {8DA787CC-0E04-450F-8E29-88EAC5EBE9BB}.Debug|Win32.ActiveCfg = Debug|Win32 - {8DA787CC-0E04-450F-8E29-88EAC5EBE9BB}.Debug|Win32.Build.0 = Debug|Win32 - {8DA787CC-0E04-450F-8E29-88EAC5EBE9BB}.Debug|x64.ActiveCfg = Debug|x64 - {8DA787CC-0E04-450F-8E29-88EAC5EBE9BB}.Debug|x64.Build.0 = Debug|x64 - {8DA787CC-0E04-450F-8E29-88EAC5EBE9BB}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {8DA787CC-0E04-450F-8E29-88EAC5EBE9BB}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {8DA787CC-0E04-450F-8E29-88EAC5EBE9BB}.Release|Win32.ActiveCfg = Release|Win32 - {8DA787CC-0E04-450F-8E29-88EAC5EBE9BB}.Release|Win32.Build.0 = Release|Win32 - {8DA787CC-0E04-450F-8E29-88EAC5EBE9BB}.Release|x64.ActiveCfg = Release|x64 - {8DA787CC-0E04-450F-8E29-88EAC5EBE9BB}.Release|x64.Build.0 = Release|x64 - {B2D63B45-92B0-40F7-B242-CCA4DFD64341}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {B2D63B45-92B0-40F7-B242-CCA4DFD64341}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {B2D63B45-92B0-40F7-B242-CCA4DFD64341}.Debug|Win32.ActiveCfg = Debug|Win32 - {B2D63B45-92B0-40F7-B242-CCA4DFD64341}.Debug|Win32.Build.0 = Debug|Win32 - {B2D63B45-92B0-40F7-B242-CCA4DFD64341}.Debug|x64.ActiveCfg = Debug|x64 - {B2D63B45-92B0-40F7-B242-CCA4DFD64341}.Debug|x64.Build.0 = Debug|x64 - {B2D63B45-92B0-40F7-B242-CCA4DFD64341}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {B2D63B45-92B0-40F7-B242-CCA4DFD64341}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {B2D63B45-92B0-40F7-B242-CCA4DFD64341}.Release|Win32.ActiveCfg = Release|Win32 - {B2D63B45-92B0-40F7-B242-CCA4DFD64341}.Release|Win32.Build.0 = Release|Win32 - {B2D63B45-92B0-40F7-B242-CCA4DFD64341}.Release|x64.ActiveCfg = Release|x64 - {B2D63B45-92B0-40F7-B242-CCA4DFD64341}.Release|x64.Build.0 = Release|x64 - {BE412850-4BB9-429A-877C-BFBC4B34186C}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {BE412850-4BB9-429A-877C-BFBC4B34186C}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {BE412850-4BB9-429A-877C-BFBC4B34186C}.Debug|Win32.ActiveCfg = Debug|Win32 - {BE412850-4BB9-429A-877C-BFBC4B34186C}.Debug|Win32.Build.0 = Debug|Win32 - {BE412850-4BB9-429A-877C-BFBC4B34186C}.Debug|x64.ActiveCfg = Debug|x64 - {BE412850-4BB9-429A-877C-BFBC4B34186C}.Debug|x64.Build.0 = Debug|x64 - {BE412850-4BB9-429A-877C-BFBC4B34186C}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {BE412850-4BB9-429A-877C-BFBC4B34186C}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {BE412850-4BB9-429A-877C-BFBC4B34186C}.Release|Win32.ActiveCfg = Release|Win32 - {BE412850-4BB9-429A-877C-BFBC4B34186C}.Release|Win32.Build.0 = Release|Win32 - {BE412850-4BB9-429A-877C-BFBC4B34186C}.Release|x64.ActiveCfg = Release|x64 - {BE412850-4BB9-429A-877C-BFBC4B34186C}.Release|x64.Build.0 = Release|x64 - {23149706-C12F-4329-B6AA-8266407C32D3}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {23149706-C12F-4329-B6AA-8266407C32D3}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {23149706-C12F-4329-B6AA-8266407C32D3}.Debug|Win32.ActiveCfg = Debug|Win32 - {23149706-C12F-4329-B6AA-8266407C32D3}.Debug|Win32.Build.0 = Debug|Win32 - {23149706-C12F-4329-B6AA-8266407C32D3}.Debug|x64.ActiveCfg = Debug|x64 - {23149706-C12F-4329-B6AA-8266407C32D3}.Debug|x64.Build.0 = Debug|x64 - {23149706-C12F-4329-B6AA-8266407C32D3}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {23149706-C12F-4329-B6AA-8266407C32D3}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {23149706-C12F-4329-B6AA-8266407C32D3}.Release|Win32.ActiveCfg = Release|Win32 - {23149706-C12F-4329-B6AA-8266407C32D3}.Release|Win32.Build.0 = Release|Win32 - {23149706-C12F-4329-B6AA-8266407C32D3}.Release|x64.ActiveCfg = Release|x64 - {23149706-C12F-4329-B6AA-8266407C32D3}.Release|x64.Build.0 = Release|x64 - {9ED23316-AE8B-4018-9407-271F4DDB8CBA}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {9ED23316-AE8B-4018-9407-271F4DDB8CBA}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {9ED23316-AE8B-4018-9407-271F4DDB8CBA}.Debug|Win32.ActiveCfg = Debug|Win32 - {9ED23316-AE8B-4018-9407-271F4DDB8CBA}.Debug|Win32.Build.0 = Debug|Win32 - {9ED23316-AE8B-4018-9407-271F4DDB8CBA}.Debug|x64.ActiveCfg = Debug|x64 - {9ED23316-AE8B-4018-9407-271F4DDB8CBA}.Debug|x64.Build.0 = Debug|x64 - {9ED23316-AE8B-4018-9407-271F4DDB8CBA}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {9ED23316-AE8B-4018-9407-271F4DDB8CBA}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {9ED23316-AE8B-4018-9407-271F4DDB8CBA}.Release|Win32.ActiveCfg = Release|Win32 - {9ED23316-AE8B-4018-9407-271F4DDB8CBA}.Release|Win32.Build.0 = Release|Win32 - {9ED23316-AE8B-4018-9407-271F4DDB8CBA}.Release|x64.ActiveCfg = Release|x64 - {9ED23316-AE8B-4018-9407-271F4DDB8CBA}.Release|x64.Build.0 = Release|x64 - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126}.Debug|Win32.ActiveCfg = Debug|Win32 - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126}.Debug|Win32.Build.0 = Debug|Win32 - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126}.Debug|x64.ActiveCfg = Debug|x64 - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126}.Debug|x64.Build.0 = Debug|x64 - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126}.Release|Win32.ActiveCfg = Release|Win32 - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126}.Release|Win32.Build.0 = Release|Win32 - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126}.Release|x64.ActiveCfg = Release|x64 - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126}.Release|x64.Build.0 = Release|x64 - {F9BE7957-8399-899E-0C49-E714FDDD4B65}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {F9BE7957-8399-899E-0C49-E714FDDD4B65}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {F9BE7957-8399-899E-0C49-E714FDDD4B65}.Debug|Win32.ActiveCfg = Debug|Win32 - {F9BE7957-8399-899E-0C49-E714FDDD4B65}.Debug|Win32.Build.0 = Debug|Win32 - {F9BE7957-8399-899E-0C49-E714FDDD4B65}.Debug|x64.ActiveCfg = Debug|x64 - {F9BE7957-8399-899E-0C49-E714FDDD4B65}.Debug|x64.Build.0 = Debug|x64 - {F9BE7957-8399-899E-0C49-E714FDDD4B65}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {F9BE7957-8399-899E-0C49-E714FDDD4B65}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {F9BE7957-8399-899E-0C49-E714FDDD4B65}.Release|Win32.ActiveCfg = Release|Win32 - {F9BE7957-8399-899E-0C49-E714FDDD4B65}.Release|Win32.Build.0 = Release|Win32 - {F9BE7957-8399-899E-0C49-E714FDDD4B65}.Release|x64.ActiveCfg = Release|x64 - {F9BE7957-8399-899E-0C49-E714FDDD4B65}.Release|x64.Build.0 = Release|x64 - {2F0A3884-1B72-FE51-84DD-12687064153E}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {2F0A3884-1B72-FE51-84DD-12687064153E}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {2F0A3884-1B72-FE51-84DD-12687064153E}.Debug|Win32.ActiveCfg = Debug|Win32 - {2F0A3884-1B72-FE51-84DD-12687064153E}.Debug|Win32.Build.0 = Debug|Win32 - {2F0A3884-1B72-FE51-84DD-12687064153E}.Debug|x64.ActiveCfg = Debug|x64 - {2F0A3884-1B72-FE51-84DD-12687064153E}.Debug|x64.Build.0 = Debug|x64 - {2F0A3884-1B72-FE51-84DD-12687064153E}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {2F0A3884-1B72-FE51-84DD-12687064153E}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {2F0A3884-1B72-FE51-84DD-12687064153E}.Release|Win32.ActiveCfg = Release|Win32 - {2F0A3884-1B72-FE51-84DD-12687064153E}.Release|Win32.Build.0 = Release|Win32 - {2F0A3884-1B72-FE51-84DD-12687064153E}.Release|x64.ActiveCfg = Release|x64 - {2F0A3884-1B72-FE51-84DD-12687064153E}.Release|x64.Build.0 = Release|x64 - {0996B38F-F512-A7D2-1E90-A7E60A6C4366}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {0996B38F-F512-A7D2-1E90-A7E60A6C4366}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {0996B38F-F512-A7D2-1E90-A7E60A6C4366}.Debug|Win32.ActiveCfg = Debug|Win32 - {0996B38F-F512-A7D2-1E90-A7E60A6C4366}.Debug|Win32.Build.0 = Debug|Win32 - {0996B38F-F512-A7D2-1E90-A7E60A6C4366}.Debug|x64.ActiveCfg = Debug|x64 - {0996B38F-F512-A7D2-1E90-A7E60A6C4366}.Debug|x64.Build.0 = Debug|x64 - {0996B38F-F512-A7D2-1E90-A7E60A6C4366}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {0996B38F-F512-A7D2-1E90-A7E60A6C4366}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {0996B38F-F512-A7D2-1E90-A7E60A6C4366}.Release|Win32.ActiveCfg = Release|Win32 - {0996B38F-F512-A7D2-1E90-A7E60A6C4366}.Release|Win32.Build.0 = Release|Win32 - {0996B38F-F512-A7D2-1E90-A7E60A6C4366}.Release|x64.ActiveCfg = Release|x64 - {0996B38F-F512-A7D2-1E90-A7E60A6C4366}.Release|x64.Build.0 = Release|x64 - {4B47A364-37C4-96A7-6041-97BB4C1D333B}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {4B47A364-37C4-96A7-6041-97BB4C1D333B}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {4B47A364-37C4-96A7-6041-97BB4C1D333B}.Debug|Win32.ActiveCfg = Debug|Win32 - {4B47A364-37C4-96A7-6041-97BB4C1D333B}.Debug|Win32.Build.0 = Debug|Win32 - {4B47A364-37C4-96A7-6041-97BB4C1D333B}.Debug|x64.ActiveCfg = Debug|x64 - {4B47A364-37C4-96A7-6041-97BB4C1D333B}.Debug|x64.Build.0 = Debug|x64 - {4B47A364-37C4-96A7-6041-97BB4C1D333B}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {4B47A364-37C4-96A7-6041-97BB4C1D333B}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {4B47A364-37C4-96A7-6041-97BB4C1D333B}.Release|Win32.ActiveCfg = Release|Win32 - {4B47A364-37C4-96A7-6041-97BB4C1D333B}.Release|Win32.Build.0 = Release|Win32 - {4B47A364-37C4-96A7-6041-97BB4C1D333B}.Release|x64.ActiveCfg = Release|x64 - {4B47A364-37C4-96A7-6041-97BB4C1D333B}.Release|x64.Build.0 = Release|x64 - {37BED5B5-23FA-D81F-8C0C-F1167867813A}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {37BED5B5-23FA-D81F-8C0C-F1167867813A}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {37BED5B5-23FA-D81F-8C0C-F1167867813A}.Debug|Win32.ActiveCfg = Debug|Win32 - {37BED5B5-23FA-D81F-8C0C-F1167867813A}.Debug|Win32.Build.0 = Debug|Win32 - {37BED5B5-23FA-D81F-8C0C-F1167867813A}.Debug|x64.ActiveCfg = Debug|x64 - {37BED5B5-23FA-D81F-8C0C-F1167867813A}.Debug|x64.Build.0 = Debug|x64 - {37BED5B5-23FA-D81F-8C0C-F1167867813A}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {37BED5B5-23FA-D81F-8C0C-F1167867813A}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {37BED5B5-23FA-D81F-8C0C-F1167867813A}.Release|Win32.ActiveCfg = Release|Win32 - {37BED5B5-23FA-D81F-8C0C-F1167867813A}.Release|Win32.Build.0 = Release|Win32 - {37BED5B5-23FA-D81F-8C0C-F1167867813A}.Release|x64.ActiveCfg = Release|x64 - {37BED5B5-23FA-D81F-8C0C-F1167867813A}.Release|x64.Build.0 = Release|x64 - {57C81DD3-4304-213D-AC16-39349871C957}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {57C81DD3-4304-213D-AC16-39349871C957}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {57C81DD3-4304-213D-AC16-39349871C957}.Debug|Win32.ActiveCfg = Debug|Win32 - {57C81DD3-4304-213D-AC16-39349871C957}.Debug|Win32.Build.0 = Debug|Win32 - {57C81DD3-4304-213D-AC16-39349871C957}.Debug|x64.ActiveCfg = Debug|x64 - {57C81DD3-4304-213D-AC16-39349871C957}.Debug|x64.Build.0 = Debug|x64 - {57C81DD3-4304-213D-AC16-39349871C957}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {57C81DD3-4304-213D-AC16-39349871C957}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {57C81DD3-4304-213D-AC16-39349871C957}.Release|Win32.ActiveCfg = Release|Win32 - {57C81DD3-4304-213D-AC16-39349871C957}.Release|Win32.Build.0 = Release|Win32 - {57C81DD3-4304-213D-AC16-39349871C957}.Release|x64.ActiveCfg = Release|x64 - {57C81DD3-4304-213D-AC16-39349871C957}.Release|x64.Build.0 = Release|x64 - {010BE414-ED5B-CF56-16C0-BD18027062C0}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {010BE414-ED5B-CF56-16C0-BD18027062C0}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {010BE414-ED5B-CF56-16C0-BD18027062C0}.Debug|Win32.ActiveCfg = Debug|Win32 - {010BE414-ED5B-CF56-16C0-BD18027062C0}.Debug|Win32.Build.0 = Debug|Win32 - {010BE414-ED5B-CF56-16C0-BD18027062C0}.Debug|x64.ActiveCfg = Debug|x64 - {010BE414-ED5B-CF56-16C0-BD18027062C0}.Debug|x64.Build.0 = Debug|x64 - {010BE414-ED5B-CF56-16C0-BD18027062C0}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {010BE414-ED5B-CF56-16C0-BD18027062C0}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {010BE414-ED5B-CF56-16C0-BD18027062C0}.Release|Win32.ActiveCfg = Release|Win32 - {010BE414-ED5B-CF56-16C0-BD18027062C0}.Release|Win32.Build.0 = Release|Win32 - {010BE414-ED5B-CF56-16C0-BD18027062C0}.Release|x64.ActiveCfg = Release|x64 - {010BE414-ED5B-CF56-16C0-BD18027062C0}.Release|x64.Build.0 = Release|x64 - {2F8724C6-1BC3-2730-84D5-3F277030D04A}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {2F8724C6-1BC3-2730-84D5-3F277030D04A}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {2F8724C6-1BC3-2730-84D5-3F277030D04A}.Debug|Win32.ActiveCfg = Debug|Win32 - {2F8724C6-1BC3-2730-84D5-3F277030D04A}.Debug|Win32.Build.0 = Debug|Win32 - {2F8724C6-1BC3-2730-84D5-3F277030D04A}.Debug|x64.ActiveCfg = Debug|x64 - {2F8724C6-1BC3-2730-84D5-3F277030D04A}.Debug|x64.Build.0 = Debug|x64 - {2F8724C6-1BC3-2730-84D5-3F277030D04A}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {2F8724C6-1BC3-2730-84D5-3F277030D04A}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {2F8724C6-1BC3-2730-84D5-3F277030D04A}.Release|Win32.ActiveCfg = Release|Win32 - {2F8724C6-1BC3-2730-84D5-3F277030D04A}.Release|Win32.Build.0 = Release|Win32 - {2F8724C6-1BC3-2730-84D5-3F277030D04A}.Release|x64.ActiveCfg = Release|x64 - {2F8724C6-1BC3-2730-84D5-3F277030D04A}.Release|x64.Build.0 = Release|x64 - {F385D6A7-DF6C-989F-88BD-FEBC74831106}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {F385D6A7-DF6C-989F-88BD-FEBC74831106}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {F385D6A7-DF6C-989F-88BD-FEBC74831106}.Debug|Win32.ActiveCfg = Debug|Win32 - {F385D6A7-DF6C-989F-88BD-FEBC74831106}.Debug|Win32.Build.0 = Debug|Win32 - {F385D6A7-DF6C-989F-88BD-FEBC74831106}.Debug|x64.ActiveCfg = Debug|x64 - {F385D6A7-DF6C-989F-88BD-FEBC74831106}.Debug|x64.Build.0 = Debug|x64 - {F385D6A7-DF6C-989F-88BD-FEBC74831106}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {F385D6A7-DF6C-989F-88BD-FEBC74831106}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {F385D6A7-DF6C-989F-88BD-FEBC74831106}.Release|Win32.ActiveCfg = Release|Win32 - {F385D6A7-DF6C-989F-88BD-FEBC74831106}.Release|Win32.Build.0 = Release|Win32 - {F385D6A7-DF6C-989F-88BD-FEBC74831106}.Release|x64.ActiveCfg = Release|x64 - {F385D6A7-DF6C-989F-88BD-FEBC74831106}.Release|x64.Build.0 = Release|x64 - {71AC0F50-5DFD-FA91-8661-E95372118EFB}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {71AC0F50-5DFD-FA91-8661-E95372118EFB}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {71AC0F50-5DFD-FA91-8661-E95372118EFB}.Debug|Win32.ActiveCfg = Debug|Win32 - {71AC0F50-5DFD-FA91-8661-E95372118EFB}.Debug|Win32.Build.0 = Debug|Win32 - {71AC0F50-5DFD-FA91-8661-E95372118EFB}.Debug|x64.ActiveCfg = Debug|x64 - {71AC0F50-5DFD-FA91-8661-E95372118EFB}.Debug|x64.Build.0 = Debug|x64 - {71AC0F50-5DFD-FA91-8661-E95372118EFB}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {71AC0F50-5DFD-FA91-8661-E95372118EFB}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {71AC0F50-5DFD-FA91-8661-E95372118EFB}.Release|Win32.ActiveCfg = Release|Win32 - {71AC0F50-5DFD-FA91-8661-E95372118EFB}.Release|Win32.Build.0 = Release|Win32 - {71AC0F50-5DFD-FA91-8661-E95372118EFB}.Release|x64.ActiveCfg = Release|x64 - {71AC0F50-5DFD-FA91-8661-E95372118EFB}.Release|x64.Build.0 = Release|x64 - {17BA8E32-034E-84DA-6C12-DE8E58C5BECC}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {17BA8E32-034E-84DA-6C12-DE8E58C5BECC}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {17BA8E32-034E-84DA-6C12-DE8E58C5BECC}.Debug|Win32.ActiveCfg = Debug|Win32 - {17BA8E32-034E-84DA-6C12-DE8E58C5BECC}.Debug|Win32.Build.0 = Debug|Win32 - {17BA8E32-034E-84DA-6C12-DE8E58C5BECC}.Debug|x64.ActiveCfg = Debug|x64 - {17BA8E32-034E-84DA-6C12-DE8E58C5BECC}.Debug|x64.Build.0 = Debug|x64 - {17BA8E32-034E-84DA-6C12-DE8E58C5BECC}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {17BA8E32-034E-84DA-6C12-DE8E58C5BECC}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {17BA8E32-034E-84DA-6C12-DE8E58C5BECC}.Release|Win32.ActiveCfg = Release|Win32 - {17BA8E32-034E-84DA-6C12-DE8E58C5BECC}.Release|Win32.Build.0 = Release|Win32 - {17BA8E32-034E-84DA-6C12-DE8E58C5BECC}.Release|x64.ActiveCfg = Release|x64 - {17BA8E32-034E-84DA-6C12-DE8E58C5BECC}.Release|x64.Build.0 = Release|x64 - {25512BFB-1138-EDF2-BA88-5310A64E6659}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {25512BFB-1138-EDF2-BA88-5310A64E6659}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {25512BFB-1138-EDF2-BA88-5310A64E6659}.Debug|Win32.ActiveCfg = Debug|Win32 - {25512BFB-1138-EDF2-BA88-5310A64E6659}.Debug|Win32.Build.0 = Debug|Win32 - {25512BFB-1138-EDF2-BA88-5310A64E6659}.Debug|x64.ActiveCfg = Debug|x64 - {25512BFB-1138-EDF2-BA88-5310A64E6659}.Debug|x64.Build.0 = Debug|x64 - {25512BFB-1138-EDF2-BA88-5310A64E6659}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {25512BFB-1138-EDF2-BA88-5310A64E6659}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {25512BFB-1138-EDF2-BA88-5310A64E6659}.Release|Win32.ActiveCfg = Release|Win32 - {25512BFB-1138-EDF2-BA88-5310A64E6659}.Release|Win32.Build.0 = Release|Win32 - {25512BFB-1138-EDF2-BA88-5310A64E6659}.Release|x64.ActiveCfg = Release|x64 - {25512BFB-1138-EDF2-BA88-5310A64E6659}.Release|x64.Build.0 = Release|x64 - {0FC5DE93-FBEA-A8FA-E430-2EC6D0F5CDC6}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {0FC5DE93-FBEA-A8FA-E430-2EC6D0F5CDC6}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {0FC5DE93-FBEA-A8FA-E430-2EC6D0F5CDC6}.Debug|Win32.ActiveCfg = Debug|Win32 - {0FC5DE93-FBEA-A8FA-E430-2EC6D0F5CDC6}.Debug|Win32.Build.0 = Debug|Win32 - {0FC5DE93-FBEA-A8FA-E430-2EC6D0F5CDC6}.Debug|x64.ActiveCfg = Debug|x64 - {0FC5DE93-FBEA-A8FA-E430-2EC6D0F5CDC6}.Debug|x64.Build.0 = Debug|x64 - {0FC5DE93-FBEA-A8FA-E430-2EC6D0F5CDC6}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {0FC5DE93-FBEA-A8FA-E430-2EC6D0F5CDC6}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {0FC5DE93-FBEA-A8FA-E430-2EC6D0F5CDC6}.Release|Win32.ActiveCfg = Release|Win32 - {0FC5DE93-FBEA-A8FA-E430-2EC6D0F5CDC6}.Release|Win32.Build.0 = Release|Win32 - {0FC5DE93-FBEA-A8FA-E430-2EC6D0F5CDC6}.Release|x64.ActiveCfg = Release|x64 - {0FC5DE93-FBEA-A8FA-E430-2EC6D0F5CDC6}.Release|x64.Build.0 = Release|x64 - {3BB99068-27C9-3C39-9082-A1577CB12BD2}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {3BB99068-27C9-3C39-9082-A1577CB12BD2}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {3BB99068-27C9-3C39-9082-A1577CB12BD2}.Debug|Win32.ActiveCfg = Debug|Win32 - {3BB99068-27C9-3C39-9082-A1577CB12BD2}.Debug|Win32.Build.0 = Debug|Win32 - {3BB99068-27C9-3C39-9082-A1577CB12BD2}.Debug|x64.ActiveCfg = Debug|x64 - {3BB99068-27C9-3C39-9082-A1577CB12BD2}.Debug|x64.Build.0 = Debug|x64 - {3BB99068-27C9-3C39-9082-A1577CB12BD2}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {3BB99068-27C9-3C39-9082-A1577CB12BD2}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {3BB99068-27C9-3C39-9082-A1577CB12BD2}.Release|Win32.ActiveCfg = Release|Win32 - {3BB99068-27C9-3C39-9082-A1577CB12BD2}.Release|Win32.Build.0 = Release|Win32 - {3BB99068-27C9-3C39-9082-A1577CB12BD2}.Release|x64.ActiveCfg = Release|x64 - {3BB99068-27C9-3C39-9082-A1577CB12BD2}.Release|x64.Build.0 = Release|x64 - {5FFA0764-4BF4-30B6-3461-C7C620FA9622}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {5FFA0764-4BF4-30B6-3461-C7C620FA9622}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {5FFA0764-4BF4-30B6-3461-C7C620FA9622}.Debug|Win32.ActiveCfg = Debug|Win32 - {5FFA0764-4BF4-30B6-3461-C7C620FA9622}.Debug|Win32.Build.0 = Debug|Win32 - {5FFA0764-4BF4-30B6-3461-C7C620FA9622}.Debug|x64.ActiveCfg = Debug|x64 - {5FFA0764-4BF4-30B6-3461-C7C620FA9622}.Debug|x64.Build.0 = Debug|x64 - {5FFA0764-4BF4-30B6-3461-C7C620FA9622}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {5FFA0764-4BF4-30B6-3461-C7C620FA9622}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {5FFA0764-4BF4-30B6-3461-C7C620FA9622}.Release|Win32.ActiveCfg = Release|Win32 - {5FFA0764-4BF4-30B6-3461-C7C620FA9622}.Release|Win32.Build.0 = Release|Win32 - {5FFA0764-4BF4-30B6-3461-C7C620FA9622}.Release|x64.ActiveCfg = Release|x64 - {5FFA0764-4BF4-30B6-3461-C7C620FA9622}.Release|x64.Build.0 = Release|x64 - {FB5DA174-E7EC-2A3E-900B-3F397C793BE4}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {FB5DA174-E7EC-2A3E-900B-3F397C793BE4}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {FB5DA174-E7EC-2A3E-900B-3F397C793BE4}.Debug|Win32.ActiveCfg = Debug|Win32 - {FB5DA174-E7EC-2A3E-900B-3F397C793BE4}.Debug|Win32.Build.0 = Debug|Win32 - {FB5DA174-E7EC-2A3E-900B-3F397C793BE4}.Debug|x64.ActiveCfg = Debug|x64 - {FB5DA174-E7EC-2A3E-900B-3F397C793BE4}.Debug|x64.Build.0 = Debug|x64 - {FB5DA174-E7EC-2A3E-900B-3F397C793BE4}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {FB5DA174-E7EC-2A3E-900B-3F397C793BE4}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {FB5DA174-E7EC-2A3E-900B-3F397C793BE4}.Release|Win32.ActiveCfg = Release|Win32 - {FB5DA174-E7EC-2A3E-900B-3F397C793BE4}.Release|Win32.Build.0 = Release|Win32 - {FB5DA174-E7EC-2A3E-900B-3F397C793BE4}.Release|x64.ActiveCfg = Release|x64 - {FB5DA174-E7EC-2A3E-900B-3F397C793BE4}.Release|x64.Build.0 = Release|x64 - {E145B2B8-CD13-A6BE-B6A7-16E5A2148223}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {E145B2B8-CD13-A6BE-B6A7-16E5A2148223}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {E145B2B8-CD13-A6BE-B6A7-16E5A2148223}.Debug|Win32.ActiveCfg = Debug|Win32 - {E145B2B8-CD13-A6BE-B6A7-16E5A2148223}.Debug|Win32.Build.0 = Debug|Win32 - {E145B2B8-CD13-A6BE-B6A7-16E5A2148223}.Debug|x64.ActiveCfg = Debug|x64 - {E145B2B8-CD13-A6BE-B6A7-16E5A2148223}.Debug|x64.Build.0 = Debug|x64 - {E145B2B8-CD13-A6BE-B6A7-16E5A2148223}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {E145B2B8-CD13-A6BE-B6A7-16E5A2148223}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {E145B2B8-CD13-A6BE-B6A7-16E5A2148223}.Release|Win32.ActiveCfg = Release|Win32 - {E145B2B8-CD13-A6BE-B6A7-16E5A2148223}.Release|Win32.Build.0 = Release|Win32 - {E145B2B8-CD13-A6BE-B6A7-16E5A2148223}.Release|x64.ActiveCfg = Release|x64 - {E145B2B8-CD13-A6BE-B6A7-16E5A2148223}.Release|x64.Build.0 = Release|x64 - {E1EC8075-823E-46E5-BC38-C124CCCDF878}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {E1EC8075-823E-46E5-BC38-C124CCCDF878}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {E1EC8075-823E-46E5-BC38-C124CCCDF878}.Debug|Win32.ActiveCfg = Debug|Win32 - {E1EC8075-823E-46E5-BC38-C124CCCDF878}.Debug|Win32.Build.0 = Debug|Win32 - {E1EC8075-823E-46E5-BC38-C124CCCDF878}.Debug|x64.ActiveCfg = Debug|x64 - {E1EC8075-823E-46E5-BC38-C124CCCDF878}.Debug|x64.Build.0 = Debug|x64 - {E1EC8075-823E-46E5-BC38-C124CCCDF878}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {E1EC8075-823E-46E5-BC38-C124CCCDF878}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {E1EC8075-823E-46E5-BC38-C124CCCDF878}.Release|Win32.ActiveCfg = Release|Win32 - {E1EC8075-823E-46E5-BC38-C124CCCDF878}.Release|Win32.Build.0 = Release|Win32 - {E1EC8075-823E-46E5-BC38-C124CCCDF878}.Release|x64.ActiveCfg = Release|x64 - {E1EC8075-823E-46E5-BC38-C124CCCDF878}.Release|x64.Build.0 = Release|x64 - {E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}.Debug|Win32.ActiveCfg = Debug|Win32 - {E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}.Debug|Win32.Build.0 = Debug|Win32 - {E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}.Debug|x64.ActiveCfg = Debug|x64 - {E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}.Debug|x64.Build.0 = Debug|x64 - {E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}.Release|Win32.ActiveCfg = Release|Win32 - {E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}.Release|Win32.Build.0 = Release|Win32 - {E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}.Release|x64.ActiveCfg = Release|x64 - {E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}.Release|x64.Build.0 = Release|x64 - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Debug|Win32.ActiveCfg = Debug|Win32 - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Debug|Win32.Build.0 = Debug|Win32 - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Debug|x64.ActiveCfg = Debug|x64 - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Debug|x64.Build.0 = Debug|x64 - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Release|Win32.ActiveCfg = Release|Win32 - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Release|Win32.Build.0 = Release|Win32 - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Release|x64.ActiveCfg = Release|x64 - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808}.Release|x64.Build.0 = Release|x64 - {DFC79D72-91DE-434C-871B-B3943B488BEB}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {DFC79D72-91DE-434C-871B-B3943B488BEB}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {DFC79D72-91DE-434C-871B-B3943B488BEB}.Debug|Win32.ActiveCfg = Debug|Win32 - {DFC79D72-91DE-434C-871B-B3943B488BEB}.Debug|Win32.Build.0 = Debug|Win32 - {DFC79D72-91DE-434C-871B-B3943B488BEB}.Debug|x64.ActiveCfg = Debug|x64 - {DFC79D72-91DE-434C-871B-B3943B488BEB}.Debug|x64.Build.0 = Debug|x64 - {DFC79D72-91DE-434C-871B-B3943B488BEB}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {DFC79D72-91DE-434C-871B-B3943B488BEB}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {DFC79D72-91DE-434C-871B-B3943B488BEB}.Release|Win32.ActiveCfg = Release|Win32 - {DFC79D72-91DE-434C-871B-B3943B488BEB}.Release|Win32.Build.0 = Release|Win32 - {DFC79D72-91DE-434C-871B-B3943B488BEB}.Release|x64.ActiveCfg = Release|x64 - {DFC79D72-91DE-434C-871B-B3943B488BEB}.Release|x64.Build.0 = Release|x64 - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Debug|Win32.ActiveCfg = Debug|Win32 - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Debug|Win32.Build.0 = Debug|Win32 - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Debug|x64.ActiveCfg = Debug|x64 - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Debug|x64.Build.0 = Debug|x64 - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Release|Win32.ActiveCfg = Release|Win32 - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Release|Win32.Build.0 = Release|Win32 - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Release|x64.ActiveCfg = Release|x64 - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Release|x64.Build.0 = Release|x64 - {092DAB9F-1DA5-4538-ADD7-1A8D1DBFD519}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {092DAB9F-1DA5-4538-ADD7-1A8D1DBFD519}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {092DAB9F-1DA5-4538-ADD7-1A8D1DBFD519}.Debug|Win32.ActiveCfg = Debug|Win32 - {092DAB9F-1DA5-4538-ADD7-1A8D1DBFD519}.Debug|Win32.Build.0 = Debug|Win32 - {092DAB9F-1DA5-4538-ADD7-1A8D1DBFD519}.Debug|x64.ActiveCfg = Debug|x64 - {092DAB9F-1DA5-4538-ADD7-1A8D1DBFD519}.Debug|x64.Build.0 = Debug|x64 - {092DAB9F-1DA5-4538-ADD7-1A8D1DBFD519}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {092DAB9F-1DA5-4538-ADD7-1A8D1DBFD519}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {092DAB9F-1DA5-4538-ADD7-1A8D1DBFD519}.Release|Win32.ActiveCfg = Release|Win32 - {092DAB9F-1DA5-4538-ADD7-1A8D1DBFD519}.Release|Win32.Build.0 = Release|Win32 - {092DAB9F-1DA5-4538-ADD7-1A8D1DBFD519}.Release|x64.ActiveCfg = Release|x64 - {092DAB9F-1DA5-4538-ADD7-1A8D1DBFD519}.Release|x64.Build.0 = Release|x64 - {61F7EB00-7281-4BF3-9470-7C2EA92620C3}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {61F7EB00-7281-4BF3-9470-7C2EA92620C3}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {61F7EB00-7281-4BF3-9470-7C2EA92620C3}.Debug|Win32.ActiveCfg = Debug|Win32 - {61F7EB00-7281-4BF3-9470-7C2EA92620C3}.Debug|Win32.Build.0 = Debug|Win32 - {61F7EB00-7281-4BF3-9470-7C2EA92620C3}.Debug|x64.ActiveCfg = Debug|x64 - {61F7EB00-7281-4BF3-9470-7C2EA92620C3}.Debug|x64.Build.0 = Debug|x64 - {61F7EB00-7281-4BF3-9470-7C2EA92620C3}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {61F7EB00-7281-4BF3-9470-7C2EA92620C3}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {61F7EB00-7281-4BF3-9470-7C2EA92620C3}.Release|Win32.ActiveCfg = Release|Win32 - {61F7EB00-7281-4BF3-9470-7C2EA92620C3}.Release|Win32.Build.0 = Release|Win32 - {61F7EB00-7281-4BF3-9470-7C2EA92620C3}.Release|x64.ActiveCfg = Release|x64 - {61F7EB00-7281-4BF3-9470-7C2EA92620C3}.Release|x64.Build.0 = Release|x64 - {C5ACCA6E-C04D-4B36-8516-3752B3C13C2F}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {C5ACCA6E-C04D-4B36-8516-3752B3C13C2F}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {C5ACCA6E-C04D-4B36-8516-3752B3C13C2F}.Debug|Win32.ActiveCfg = Debug|Win32 - {C5ACCA6E-C04D-4B36-8516-3752B3C13C2F}.Debug|Win32.Build.0 = Debug|Win32 - {C5ACCA6E-C04D-4B36-8516-3752B3C13C2F}.Debug|x64.ActiveCfg = Debug|x64 - {C5ACCA6E-C04D-4B36-8516-3752B3C13C2F}.Debug|x64.Build.0 = Debug|x64 - {C5ACCA6E-C04D-4B36-8516-3752B3C13C2F}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {C5ACCA6E-C04D-4B36-8516-3752B3C13C2F}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {C5ACCA6E-C04D-4B36-8516-3752B3C13C2F}.Release|Win32.ActiveCfg = Release|Win32 - {C5ACCA6E-C04D-4B36-8516-3752B3C13C2F}.Release|Win32.Build.0 = Release|Win32 - {C5ACCA6E-C04D-4B36-8516-3752B3C13C2F}.Release|x64.ActiveCfg = Release|x64 - {C5ACCA6E-C04D-4B36-8516-3752B3C13C2F}.Release|x64.Build.0 = Release|x64 - {0162864E-7651-4B5E-9105-C571105276EA}.Debug|aarch64.ActiveCfg = Debug aarch64|ARM64 - {0162864E-7651-4B5E-9105-C571105276EA}.Debug|aarch64.Build.0 = Debug aarch64|ARM64 - {0162864E-7651-4B5E-9105-C571105276EA}.Debug|Win32.ActiveCfg = Debug|Win32 - {0162864E-7651-4B5E-9105-C571105276EA}.Debug|Win32.Build.0 = Debug|Win32 - {0162864E-7651-4B5E-9105-C571105276EA}.Debug|x64.ActiveCfg = Debug|x64 - {0162864E-7651-4B5E-9105-C571105276EA}.Debug|x64.Build.0 = Debug|x64 - {0162864E-7651-4B5E-9105-C571105276EA}.Release|aarch64.ActiveCfg = Release aarch64|ARM64 - {0162864E-7651-4B5E-9105-C571105276EA}.Release|aarch64.Build.0 = Release aarch64|ARM64 - {0162864E-7651-4B5E-9105-C571105276EA}.Release|Win32.ActiveCfg = Release|Win32 - {0162864E-7651-4B5E-9105-C571105276EA}.Release|Win32.Build.0 = Release|Win32 - {0162864E-7651-4B5E-9105-C571105276EA}.Release|x64.ActiveCfg = Release|x64 - {0162864E-7651-4B5E-9105-C571105276EA}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {0C768A18-1D25-4000-9F37-DA5FE99E3B64} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13} - {222F7498-B40C-4F3F-A704-DDEB91A4484A} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13} - {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13} - {3565FE5E-4FA3-11EB-AE93-0242AC130002} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13} - {FD16CA29-C66A-430A-822C-C09655088611} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13} - {CA8A30D1-8FA9-4330-B7F7-84709246D8DC} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13} - {7F773DD9-EB8F-2403-B43C-B49C2014B99C} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13} - {66174227-8541-41FC-A6DF-4764FC66F78E} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13} - {3242BAA7-FC4C-4F76-83BC-E4403099DC1D} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13} - {8DA787CC-0E04-450F-8E29-88EAC5EBE9BB} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13} - {B2D63B45-92B0-40F7-B242-CCA4DFD64341} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13} - {BE412850-4BB9-429A-877C-BFBC4B34186C} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13} - {23149706-C12F-4329-B6AA-8266407C32D3} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13} - {9ED23316-AE8B-4018-9407-271F4DDB8CBA} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13} - {2F0A3884-1B72-FE51-84DD-12687064153E} = {EB5FC2C6-D72D-B6CC-C0C1-26F3AC2E9231} - {0996B38F-F512-A7D2-1E90-A7E60A6C4366} = {EB5FC2C6-D72D-B6CC-C0C1-26F3AC2E9231} - {4B47A364-37C4-96A7-6041-97BB4C1D333B} = {EB5FC2C6-D72D-B6CC-C0C1-26F3AC2E9231} - {37BED5B5-23FA-D81F-8C0C-F1167867813A} = {EB5FC2C6-D72D-B6CC-C0C1-26F3AC2E9231} - {57C81DD3-4304-213D-AC16-39349871C957} = {EB5FC2C6-D72D-B6CC-C0C1-26F3AC2E9231} - {010BE414-ED5B-CF56-16C0-BD18027062C0} = {EB5FC2C6-D72D-B6CC-C0C1-26F3AC2E9231} - {2F8724C6-1BC3-2730-84D5-3F277030D04A} = {EB5FC2C6-D72D-B6CC-C0C1-26F3AC2E9231} - {F385D6A7-DF6C-989F-88BD-FEBC74831106} = {EB5FC2C6-D72D-B6CC-C0C1-26F3AC2E9231} - {71AC0F50-5DFD-FA91-8661-E95372118EFB} = {EB5FC2C6-D72D-B6CC-C0C1-26F3AC2E9231} - {17BA8E32-034E-84DA-6C12-DE8E58C5BECC} = {EB5FC2C6-D72D-B6CC-C0C1-26F3AC2E9231} - {25512BFB-1138-EDF2-BA88-5310A64E6659} = {EB5FC2C6-D72D-B6CC-C0C1-26F3AC2E9231} - {0FC5DE93-FBEA-A8FA-E430-2EC6D0F5CDC6} = {EB5FC2C6-D72D-B6CC-C0C1-26F3AC2E9231} - {3BB99068-27C9-3C39-9082-A1577CB12BD2} = {EB5FC2C6-D72D-B6CC-C0C1-26F3AC2E9231} - {5FFA0764-4BF4-30B6-3461-C7C620FA9622} = {F3AB4ED5-5F37-BC99-6848-3F8ED452189A} - {FB5DA174-E7EC-2A3E-900B-3F397C793BE4} = {F3AB4ED5-5F37-BC99-6848-3F8ED452189A} - {E145B2B8-CD13-A6BE-B6A7-16E5A2148223} = {F3AB4ED5-5F37-BC99-6848-3F8ED452189A} - {092DAB9F-1DA5-4538-ADD7-1A8D1DBFD519} = {57B5AA5E-C340-1823-CC51-9B17385C7423} - {61F7EB00-7281-4BF3-9470-7C2EA92620C3} = {57B5AA5E-C340-1823-CC51-9B17385C7423} - {C5ACCA6E-C04D-4B36-8516-3752B3C13C2F} = {57B5AA5E-C340-1823-CC51-9B17385C7423} - {0162864E-7651-4B5E-9105-C571105276EA} = {57B5AA5E-C340-1823-CC51-9B17385C7423} - EndGlobalSection -EndGlobal From cabe7b75ea02f262930ae1dfd81be6dc76872d75 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 8 Mar 2024 00:13:00 +0800 Subject: [PATCH 003/137] remove deps file --- deps/target-deps.json | 93 ------------------------------------------- 1 file changed, 93 deletions(-) delete mode 100644 deps/target-deps.json diff --git a/deps/target-deps.json b/deps/target-deps.json deleted file mode 100644 index ddd29b78a9..0000000000 --- a/deps/target-deps.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "project": { - "name" : "slang", - "dependencies" : [ - { - "name" : "slang-llvm", - "baseUrl" : "https://github.com/shader-slang/slang-llvm/releases/download/v13.x-42/", - "optional" : true, - "packages" : - { - "windows-x86_64" : { "type" : "url", "path" : "slang-llvm-13.x-42-win64.zip" }, - "windows-x86" : { "type": "url", "path" : "slang-llvm-13.x-42-win32.zip" }, - "linux-x86_64" : { "type": "url", "path" : "slang-llvm-v13.x-42-linux-x86_64-release.zip" }, - "macosx-x86_64" : { "type": "url", "path" : "slang-llvm-v13.x-42-macosx-x86_64-release.zip" } - } - }, - { - "name" : "slang-glslang", - "baseUrl" : "https://github.com/shader-slang/slang-glslang/releases/download/v13.0.0.x-i/slang-glslang-13.0.0.x-i-", - "optional" : true, - "packages" : - { - "windows-x86_64" : { "type" : "url", "path" : "windows-x64-release.zip" }, - "windows-x86" : { "type": "url", "path" : "windows-win32-release.zip" }, - "linux-x86_64" : { "type": "url", "path" : "linux-x64-release.zip" }, - "linux-x86" : { "type": "url", "path" : "linux-x86-release.zip" }, - "macosx-x86_64" : { "type": "url", "path" : "macosx-x86_64-release.zip" }, - "windows-aarch64" : { "type" : "url", "path" : "windows-aarch64-release.zip" } - } - }, - { - "name" : "dxc", - "type" : "submodule" - }, - { - "name" : "vulkan", - "type" : "submodule" - }, - { - "name" : "tinyobjloader", - "type" : "submodule" - }, - { - "name" : "stb", - "type" : "submodule" - }, - { - "name" : "spirv-tools-generated", - "type" : "submodule" - }, - { - "name" : "spirv-tools", - "type" : "submodule" - }, - { - "name" : "spirv-headers", - "type" : "submodule" - }, - { - "name" : "spirv", - "type" : "submodule" - }, - { - "name" : "slang-binaries", - "type" : "submodule" - }, - { - "name" : "miniz", - "type" : "submodule" - }, - { - "name" : "lz4", - "type" : "submodule" - }, - { - "name" : "imgui", - "type" : "submodule" - }, - { - "name" : "glslang-generated", - "type" : "submodule" - }, - { - "name" : "glslang", - "type" : "submodule" - }, - { - "name" : "glm", - "type" : "submodule" - } - ] - } -} From b3c582849470003c48b21d7ebc5971181b1bea27 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 8 Mar 2024 00:15:14 +0800 Subject: [PATCH 004/137] Remove premake driving bat files --- make-slang-tag-version.bat | 5 ---- test.bat | 58 -------------------------------------- test.ps1 | 1 - 3 files changed, 64 deletions(-) delete mode 100644 make-slang-tag-version.bat delete mode 100644 test.bat delete mode 100644 test.ps1 diff --git a/make-slang-tag-version.bat b/make-slang-tag-version.bat deleted file mode 100644 index 3382783fa1..0000000000 --- a/make-slang-tag-version.bat +++ /dev/null @@ -1,5 +0,0 @@ -@echo off -:: Generate slang version files -git describe --tags > slang-tag-version.txt -set /p SLANG_TAG_VERSION= slang-tag-version.h diff --git a/test.bat b/test.bat deleted file mode 100644 index 6c6e885800..0000000000 --- a/test.bat +++ /dev/null @@ -1,58 +0,0 @@ -@echo off -setlocal -pushd %~dp0 - -:: Argument parsing loop, for arguments that we need to handle at the .bat level - -:ARGLOOP - -if "%1"=="-debug" ( - set SLANG_TEST_CONFIG=Debug - shift - goto :ARGLOOP -) -if "%1"=="-release" ( - set SLANG_TEST_CONFIG=Release - shift - goto :ARGLOOP -) -if "%1"=="-platform" ( - set SLANG_TEST_PLATFORM=%2 - shift - shift - goto :ARGLOOP -) -if "%1"=="-configuration" ( - set SLANG_TEST_CONFIG=%2 - shift - shift - goto :ARGLOOP -) - -:: When done with arguments, we'll just fall through here - - - - -:: Set root directory to the directory where `test.bat` resides -:: (which should be the root of the source tree) -SET "SLANG_TEST_ROOT=%~dp0" - -:: If platform and configuration haven't been set, then set -:: them to default values. -IF "%SLANG_TEST_PLATFORM%" == "" ( SET "SLANG_TEST_PLATFORM=x86" ) -IF "%SLANG_TEST_CONFIG%" == "" ( SET "SLANG_TEST_CONFIG=Debug" ) - -:: If the user specified a platform of "Win32" swap that to "x86" -:: to match how we are generating our output directories. -IF "%SLANG_TEST_PLATFORM%"=="Win32" ( Set "SLANG_TEST_PLATFORM=x86" ) - -:: Establish the directory where the binaries to be tested reside -set "SLANG_TEST_BIN_DIR=%SLANG_TEST_ROOT%bin\windows-%SLANG_TEST_PLATFORM%\%SLANG_TEST_CONFIG%\" - -:: ensure that any built tools are visible -SET "PATH=%PATH%;%SLANG_TEST_BIN_DIR%" - -:: TODO: Maybe we should actually invoke `msbuild` to make sure all the code is up to date? - -"%SLANG_TEST_BIN_DIR%slang-test.exe" -bindir "%SLANG_TEST_BIN_DIR%\" %* diff --git a/test.ps1 b/test.ps1 deleted file mode 100644 index 9a53035ba0..0000000000 --- a/test.ps1 +++ /dev/null @@ -1 +0,0 @@ -& ".\bin\windows-x64\release\slang-test.exe" tests/ -use-test-server -emit-spirv-directly -expected-failure-list tests/expected-failure.txt -api vk 2>&1; \ No newline at end of file From cd803c7631477a81ee46b0d5307c13592f7e7ffa Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 8 Mar 2024 00:18:09 +0800 Subject: [PATCH 005/137] Full test matrix under CMake --- .github/workflows/ci.yml | 86 ++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 48 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a60a047f1a..78bbf3ca39 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,60 +12,50 @@ jobs: build: strategy: matrix: - # Until we switch to CMake fully, just run something minimal + os: [linux, macos, windows] + compiler: ['gcc', 'clang', 'cl'] + config: ['debug', 'release'] + platform: ['x64'] + full-gpu-tests: [false] + exclude: + # Exclude invalid or undesired os/compiler + - { os: linux, compiler: cl } + - { os: macos, compiler: cl } + - { os: macos, compiler: gcc } + - { os: windows, compiler: gcc } + - { os: windows, compiler: clang } + # or os/config combinations + - { os: macos, config: debug } include: + - { os: linux, runs-on: ubuntu-20.04 } + - { os: windows, runs-on: windows-latest } + - { os: macos, runs-on: macos-latest } + # Set a test category depending on the config, smoke by default, + # quick or full conditionally otherwise + - test-category: smoke + - { os: windows, test-category: quick } + - { config: release, test-category: full } + # Only CL has werror + - warnings-as-errors: false + - { compiler: cl, warnings-as-errors: true } + # Self-hosted aarch64 build - os: linux compiler: gcc - platform: x64 - config: debug + platform: aarch64 + config: release warnings-as-errors: false test-category: smoke full-gpu-tests: false - runs-on: ubuntu-20.04 - # os: [linux, macos, windows] - # compiler: ['gcc', 'clang', 'cl'] - # config: ['debug', 'release'] - # platform: ['x64'] - # full-gpu-tests: [false] - # exclude: - # # Exclude invalid or undesired os/compiler - # - { os: linux, compiler: cl } - # - { os: macos, compiler: cl } - # - { os: macos, compiler: gcc } - # - { os: windows, compiler: gcc } - # - { os: windows, compiler: clang } - # # or os/config combinations - # - { os: macos, config: debug } - # include: - # - { os: linux, runs-on: ubuntu-20.04 } - # - { os: windows, runs-on: windows-latest } - # - { os: macos, runs-on: macos-latest } - # # Set a test category depending on the config, smoke by default, - # # quick or full conditionally otherwise - # - test-category: smoke - # - { os: windows, test-category: quick } - # - { config: release, test-category: full } - # # Only CL has werror - # - warnings-as-errors: false - # - { compiler: cl, warnings-as-errors: true } - # # Self-hosted aarch64 build - # - os: linux - # compiler: gcc - # platform: aarch64 - # config: release - # warnings-as-errors: false - # test-category: smoke - # full-gpu-tests: false - # runs-on: [self-hosted, Linux, ARM64] - # # Self-hosted full gpu build - # - os: windows - # compiler: cl - # platform: x64 - # config: release - # warnings-as-errors: false - # test-category: full - # full-gpu-tests: true - # runs-on: [Windows, self-hosted] + runs-on: [self-hosted, Linux, ARM64] + # Self-hosted full gpu build + - os: windows + compiler: cl + platform: x64 + config: release + warnings-as-errors: false + test-category: full + full-gpu-tests: true + runs-on: [Windows, self-hosted] fail-fast: false runs-on: ${{ matrix.runs-on }} From 9bc8ba841996f8c57cbc3e146060225819fa7718 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 8 Mar 2024 00:35:28 +0800 Subject: [PATCH 006/137] Remove premake based ci workflows --- .github/workflows/ci.yml | 1 + .github/workflows/linux-arm64.yml | 59 ----------------- .github/workflows/linux.yml | 75 ---------------------- .github/workflows/macos.yml | 72 --------------------- .github/workflows/verify-solution-file.yml | 25 -------- .github/workflows/windows-selfhosted.yml | 52 --------------- .github/workflows/windows.yml | 74 --------------------- 7 files changed, 1 insertion(+), 357 deletions(-) delete mode 100644 .github/workflows/linux-arm64.yml delete mode 100644 .github/workflows/linux.yml delete mode 100644 .github/workflows/macos.yml delete mode 100644 .github/workflows/verify-solution-file.yml delete mode 100644 .github/workflows/windows-selfhosted.yml delete mode 100644 .github/workflows/windows.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 78bbf3ca39..a69fb5a10b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,6 +100,7 @@ jobs: - name: Test Slang run: | export SLANG_RUN_SPIRV_VALIDATION=1 + export SLANG_USE_SPV_SOURCE_LANGUAGE_UNKNOWN=1 failed=0 if [[ "${{matrix.full-gpu-tests}}" == "true" ]]; then $bin_dir/slang-test \ diff --git a/.github/workflows/linux-arm64.yml b/.github/workflows/linux-arm64.yml deleted file mode 100644 index a35672c5f0..0000000000 --- a/.github/workflows/linux-arm64.yml +++ /dev/null @@ -1,59 +0,0 @@ -name: Linux/ARM64 Build and Test - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true -jobs: - build: - - runs-on: ['self-hosted', 'Linux', 'ARM64'] - strategy: - matrix: - configuration: ['release'] - compiler: ['gcc'] - platform: ['aarch64'] - steps: - - uses: actions/checkout@v3 - with: - submodules: 'true' - fetch-depth: '0' - - name: build - run: | - CC=${{matrix.compiler}} - CONFIGURATION=${{matrix.configuration}} - ARCH=${{matrix.platform}} - TARGETARCH=${{matrix.platform}} - if [[ "$CC" == "clang" ]]; then - CFLAGS=-Werror - CPPFLAGS=-Werror - CXXFLAGS=-Werror - fi - source ./github_build.sh - - uses: actions/upload-artifact@v3 - with: - name: slang-build-${{matrix.configuration}}-${{matrix.platform}}-${{matrix.compiler}} - path: | - slang.h - slang-com-helper.h - slang-com-ptr.h - slang-tag-version.h - slang-gfx.h - prelude/*.h - bin/**/*.dll - bin/**/*.exe - bin/**/*.so - bin/**/slangc - bin/**/slangd - docs/*.md - - name: test - run: - CONFIGURATION=${{matrix.configuration}} - CC=${{matrix.compiler}} - ARCH=${{matrix.platform}} - PATH="${PATH:+${PATH}:}$(pwd)/external/slang-binaries/spirv-tools/$(uname -m)-linux/bin" - source .github/github_test.sh diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml deleted file mode 100644 index 8180965f91..0000000000 --- a/.github/workflows/linux.yml +++ /dev/null @@ -1,75 +0,0 @@ -name: Linux Build CI - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true -jobs: - build: - - runs-on: ubuntu-20.04 - strategy: - matrix: - configuration: ['debug', 'release'] - compiler: ['gcc', 'clang'] - platform: ['x64'] - steps: - - name: select gcc 10 - run: | - sudo update-alternatives \ - --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \ - --slave /usr/bin/g++ g++ /usr/bin/g++-10 \ - --slave /usr/bin/gcc-ar gcc-ar /usr/bin/gcc-ar-10 \ - --slave /usr/bin/gcc-nm gcc-nm /usr/bin/gcc-nm-10 \ - --slave /usr/bin/gcc-ranlib gcc-ranlib /usr/bin/gcc-ranlib-10 \ - --slave /usr/bin/gcov gcov /usr/bin/gcov-10 \ - --slave /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-10 \ - --slave /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-10 - - uses: actions/checkout@v3 - with: - submodules: 'true' - fetch-depth: '0' - - uses: robinraju/release-downloader@v1.7 - with: - latest: true - repository: "shader-slang/swiftshader" - fileName: "vk_swiftshader_linux_${{matrix.platform}}.zip" - - name: build - run: | - CC=${{matrix.compiler}} - CONFIGURATION=${{matrix.configuration}} - ARCH=${{matrix.platform}} - TARGETARCH=${{matrix.platform}} - if [[ "$CC" == "clang" ]]; then - CFLAGS=-Werror - CPPFLAGS=-Werror - CXXFLAGS=-Werror - fi - source ./github_build.sh - - uses: actions/upload-artifact@v3 - with: - name: slang-build-${{matrix.configuration}}-${{matrix.platform}}-${{matrix.compiler}} - path: | - slang.h - slang-com-helper.h - slang-com-ptr.h - slang-tag-version.h - slang-gfx.h - prelude/*.h - bin/**/*.dll - bin/**/*.exe - bin/**/*.so - bin/**/slangc - bin/**/slangd - docs/*.md - - name: test - run: - CONFIGURATION=${{matrix.configuration}} - CC=${{matrix.compiler}} - ARCH=${{matrix.platform}} - PATH="${PATH:+${PATH}:}$(pwd)/external/slang-binaries/spirv-tools/$(uname -m)-linux/bin" - source .github/github_test.sh diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml deleted file mode 100644 index 30a3fe0037..0000000000 --- a/.github/workflows/macos.yml +++ /dev/null @@ -1,72 +0,0 @@ -name: MacOS Build CI - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true -jobs: - build: - name: MacOS Build CI - runs-on: macos-latest - - strategy: - matrix: - configuration: ['release'] # 'debug' - compiler: ['clang'] - platform: ['x64'] - targetPlatform: ['x64'] - steps: - - uses: actions/checkout@v3 - with: - submodules: 'true' - fetch-depth: '0' - - name: build - run: | - CC=${{matrix.compiler}} - CONFIGURATION=${{matrix.configuration}} - ARCH=${{matrix.platform}} - TARGETARCH=${{matrix.targetPlatform}} - CPPFLAGS=-Werror - CFLAGS=-Werror - CXXFLAGS=-Werror - source ./github_macos_build.sh - - name: Package - id: package - run: | - export SLANG_OS_NAME=macos - export SLANG_ARCH_NAME=${{matrix.targetPlatform}} - export TAG_NAME=`git describe --tags` - export SLANG_TAG=${TAG_NAME#v} - echo "tag:$TAG_NAME" - echo "slang-tag:$SLANG_TAG" - export SLANG_BINARY_ARCHIVE=slang-${SLANG_TAG}-${SLANG_OS_NAME}-${SLANG_ARCH_NAME}.zip - echo "creating zip" - 7z a ${SLANG_BINARY_ARCHIVE} slang.h - 7z a ${SLANG_BINARY_ARCHIVE} slang-com-helper.h - 7z a ${SLANG_BINARY_ARCHIVE} slang-com-ptr.h - 7z a ${SLANG_BINARY_ARCHIVE} slang-tag-version.h - 7z a ${SLANG_BINARY_ARCHIVE} slang-gfx.h - 7z a ${SLANG_BINARY_ARCHIVE} prelude/*.h - 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/libslang.dylib - 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/libslang-glslang.dylib - 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/libgfx.dylib - 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/slangc - 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/slangd - 7z a ${SLANG_BINARY_ARCHIVE} docs/*.md - echo "SLANG_BINARY_ARCHIVE=${SLANG_BINARY_ARCHIVE}" >> $GITHUB_OUTPUT - - uses: actions/upload-artifact@v3 - with: - name: slang-build-${{matrix.configuration}}-${{matrix.targetPlatform}}-${{matrix.compiler}} - path: | - ${{ steps.package.outputs.SLANG_BINARY_ARCHIVE }} - - name: test - if: ${{ matrix.targetPlatform != 'aarch64' }} - run: - CONFIGURATION=${{matrix.configuration}} - CC=${{matrix.compiler}} - ARCH=${{matrix.targetPlatform}} - source .github/github_test.sh diff --git a/.github/workflows/verify-solution-file.yml b/.github/workflows/verify-solution-file.yml deleted file mode 100644 index df4503dadd..0000000000 --- a/.github/workflows/verify-solution-file.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Verify-VSProjects - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - build: - runs-on: windows-latest - steps: - - uses: actions/checkout@v3 - with: - submodules: 'true' - fetch-depth: '1' - - name: verify - run: | - & .\premake.bat vs2019 --deps=true - $diff = & git diff - if ($diff.length -ne 0) - { - $diff - throw "error: vs project file verification failed." - } diff --git a/.github/workflows/windows-selfhosted.yml b/.github/workflows/windows-selfhosted.yml deleted file mode 100644 index 2c82a2fa81..0000000000 --- a/.github/workflows/windows-selfhosted.yml +++ /dev/null @@ -1,52 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Full GPU Tests (Windows) - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - build: - runs-on: [Windows, self-hosted] - timeout-minutes: 100 - continue-on-error: true - strategy: - fail-fast: false - matrix: - configuration: ['Release'] - platform: ['x64'] - include: - - platform: x64 - testPlatform: x64 - - platform: x64 - testCategory: full - steps: - - uses: actions/checkout@v3 - with: - submodules: 'true' - fetch-depth: '0' - - name: setup-msbuild - uses: microsoft/setup-msbuild@v1 - - name: build - run: | - .\premake.bat vs2019 --arch=${{matrix.platform}} --deps=true --no-progress=true --enable-cuda=true - - .\make-slang-tag-version.bat - - MSBuild.exe slang.sln -v:m -m -property:Configuration=${{matrix.configuration}} -property:Platform=${{matrix.platform}} -maxcpucount:12 - - name: test-spirv-direct - run: | - $ErrorActionPreference = "SilentlyContinue" - where.exe spirv-dis - spirv-dis --version - $env:SLANG_RUN_SPIRV_VALIDATION='1' - .\bin\windows-${{matrix.testPlatform}}\${{matrix.configuration}}\slang-test.exe tests/ -use-test-server -server-count 8 -emit-spirv-directly -expected-failure-list tests/expected-failure.txt -api vk 2>&1 - - - name: test - run: | - $ErrorActionPreference = "SilentlyContinue" - .\bin\windows-${{matrix.testPlatform}}\${{matrix.configuration}}\slang-test.exe -use-test-server -server-count 8 -api all-cpu - diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml deleted file mode 100644 index 3dc4abfb56..0000000000 --- a/.github/workflows/windows.yml +++ /dev/null @@ -1,74 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Windows Build CI - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true -jobs: - build: - runs-on: windows-latest - strategy: - matrix: - configuration: ['Debug', 'Release'] - platform: ['Win32', 'x64'] - include: - - platform: Win32 - testPlatform: x86 - - platform: x64 - testPlatform: x64 - - testCategory: quick - - platform: x64 - testCategory: full - - configuration: Debug - testCategory: smoke - steps: - - uses: actions/checkout@v3 - with: - submodules: 'true' - fetch-depth: '0' - - uses: robinraju/release-downloader@v1.7 - with: - latest: true - repository: "shader-slang/swiftshader" - fileName: "vk_swiftshader_windows_${{matrix.testPlatform}}.zip" - - name: setup-msbuild - uses: microsoft/setup-msbuild@v1 - - name: build - run: | - .\premake.bat vs2019 --enable-embed-stdlib=true --arch=${{matrix.platform}} --deps=true --no-progress=true - - .\make-slang-tag-version.bat - - MSBuild.exe slang.sln -v:m -m -property:Configuration=${{matrix.configuration}} -property:Platform=${{matrix.platform}} -property:WindowsTargetPlatformVersion=10.0.19041.0 -warnAsError - - uses: actions/upload-artifact@v3 - with: - name: slang-build-${{matrix.configuration}}-${{matrix.platform}}-${{matrix.compiler}} - path: | - slang.h - slang-com-helper.h - slang-com-ptr.h - slang-tag-version.h - slang-gfx.h - prelude/*.h - bin/**/*.dll - bin/**/*.exe - bin/**/*.so - bin/**/slangc - bin/**/slangd - docs/*.md - - name: test - run: | - $slangTestBinDir = ".\bin\windows-${{matrix.testPlatform}}\${{matrix.configuration}}\"; - $spirvToolsBinDir = ".\external\slang-binaries\spirv-tools\windows-${{matrix.testPlatform}}\bin\"; - $env:Path += ";$slangTestBinDir;$spirvToolsBinDir"; - $env:SLANG_RUN_SPIRV_VALIDATION='1'; - $env:SLANG_USE_SPV_SOURCE_LANGUAGE_UNKNOWN='1'; - Expand-Archive "vk_swiftshader_windows_${{matrix.testPlatform}}.zip" -DestinationPath $slangTestBinDir; - & "$slangTestBinDir\slang-test.exe" -api all-dx12 -appveyor -bindir "$slangTestBinDir\" -platform ${{matrix.testPlatform}} -configuration ${{matrix.configuration}} -category ${{matrix.testCategory}} -expected-failure-list tests/expected-failure-github.txt 2>&1; - From bedc08084e16c024427b4d747cf45cb6d496d367 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 8 Mar 2024 01:08:56 +0800 Subject: [PATCH 007/137] Wiggle CI --- .github/actions/common-setup/action.yml | 13 +++++++------ .github/workflows/ci.yml | 1 - 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index 60c81b0074..e3563e6307 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -5,8 +5,6 @@ description: Performs setup common to all our actions inputs: os: required: true - runs-on: - required: true compiler: required: true platform: @@ -40,10 +38,13 @@ runs: # infer C++ compiler CXX=${CXX/gcc/g++} CXX=${CXX/clang/clang++} - # Correct version on older ubuntu - if [[ "${{inputs.runs-on}}" == ubuntu-20.04 ]]; then - CC=${CC/gcc/gcc-10} - CXX=${CXX/g++/g++-10} + # Correct gcc version on older ubuntu + if [ "${{inputs.os}}" == "linux" ]; then + gcc_version=$(gcc -dumpversion | cut -d'.' -f1) + if [ "$gcc_version" -lt 10 ]; then + CC=${CC/gcc/gcc-10} + CXX=${CXX/g++/g++-10} + fi fi # Export echo "CC=$CC" >> "$GITHUB_ENV" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a69fb5a10b..10f7354f9b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,7 +72,6 @@ jobs: uses: ./.github/actions/common-setup with: os: ${{matrix.os}} - runs-on: ${{matrix.runs-on}} compiler: ${{matrix.compiler}} platform: ${{matrix.platform}} config: ${{matrix.config}} From 8a7acd01297c2536a4b5fda4120e87539112e272 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 8 Mar 2024 09:04:21 +0800 Subject: [PATCH 008/137] remove cmake from ci name --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10f7354f9b..ca865f5e77 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: CI (CMake) +name: build on: push: From a6bdace5deab6c3fedec0288309f6f47ba43a0a0 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 8 Mar 2024 09:21:54 +0800 Subject: [PATCH 009/137] find frameworks correctly on osx --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 49d2ab2f41..883aa41126 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -458,6 +458,8 @@ if(SLANG_ENABLE_GFX) core imgui $<$:X11::X11> + "$<$:-framework Cocoa>" + "$<$:-framework QuartzCore>" ${CMAKE_DL_LIBS} LINK_WITH_FRAMEWORK Cocoa From 60a954b74da3a2bc4e791339aabb82235292efd0 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 8 Mar 2024 09:04:21 +0800 Subject: [PATCH 010/137] remove cmake from ci name --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca865f5e77..775721feaa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: build +name: CI on: push: From ddc1fd77d32b12cad95f931209e2a7dabfad9082 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 2 Apr 2024 15:47:28 +0800 Subject: [PATCH 011/137] Cope with sccache not being available --- .github/actions/common-setup/action.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index e3563e6307..203f43c7a9 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -21,6 +21,9 @@ runs: with: key: ${{github.job}}-${{inputs.os}}-${{inputs.compiler}}-${{inputs.platform}}-${{inputs.config}} variant: sccache + # Opportunistically use sccache, it's not available for example on self + # hosted runners or ARM + continue-on-error: true - shell: bash run: | # Set up system dependencies @@ -50,9 +53,11 @@ runs: echo "CC=$CC" >> "$GITHUB_ENV" echo "CXX=$CXX" >> "$GITHUB_ENV" - # Set CMake to use sccache - echo "CMAKE_CXX_COMPILER_LAUNCHER=sccache" >> "$GITHUB_ENV" - echo "CMAKE_C_COMPILER_LAUNCHER=sccache" >> "$GITHUB_ENV" + # Set CMake to use sccache if it's available + if command -v sccache; then + echo "CMAKE_CXX_COMPILER_LAUNCHER=sccache" >> "$GITHUB_ENV" + echo "CMAKE_C_COMPILER_LAUNCHER=sccache" >> "$GITHUB_ENV" + fi # Some useful variables config=${{inputs.config}} From 1be48229d6219b4368de5d650b0d667ef46576e7 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 2 Apr 2024 17:43:09 +0800 Subject: [PATCH 012/137] cmake based falcor tests --- .github/workflows/falcor-test.yml | 52 +++++++++++++++++++------------ 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/.github/workflows/falcor-test.yml b/.github/workflows/falcor-test.yml index 1e094f1636..f7484d47d8 100644 --- a/.github/workflows/falcor-test.yml +++ b/.github/workflows/falcor-test.yml @@ -1,5 +1,3 @@ -# This is a basic workflow to help you get started with Actions - name: Falcor Tests on: @@ -12,27 +10,39 @@ concurrency: cancel-in-progress: true jobs: build: - runs-on: [Windows, self-hosted, falcor] timeout-minutes: 100 continue-on-error: true strategy: fail-fast: false matrix: - configuration: ['Release'] - platform: ['x64'] include: - - platform: x64 - testPlatform: x64 - - platform: x64 - testCategory: full + # Self-hosted falcor tests + - os: windows + compiler: cl + platform: x64 + config: release + warnings-as-errors: false + test-category: full + full-gpu-tests: false + runs-on: [Windows, self-hosted, falcor] + runs-on: ${{ matrix.runs-on }} + defaults: + run: + shell: bash steps: - uses: actions/checkout@v3 with: submodules: 'true' fetch-depth: '0' - - name: setup-msbuild - uses: microsoft/setup-msbuild@v1 + - name: Setup + uses: ./.github/actions/common-setup + with: + os: ${{matrix.os}} + compiler: ${{matrix.compiler}} + platform: ${{matrix.platform}} + config: ${{matrix.config}} - name: setup-falcor + shell: pwsh run: | mkdir FalcorBin cd FalcorBin @@ -43,25 +53,27 @@ jobs: Copy-Item -Path 'C:\Falcor\media_internal' -Destination '.\' -Recurse Copy-Item -Path 'C:\Falcor\scripts' -Destination '.\' -Recurse cd ..\ - - name: build + - name: Build Slang run: | - .\premake.bat vs2019 --arch=${{matrix.platform}} --deps=true --no-progress=true --enable-cuda=true - - .\make-slang-tag-version.bat - - MSBuild.exe slang.sln -v:m -m -property:Configuration=${{matrix.configuration}} -property:Platform=${{matrix.platform}} -property:WindowsTargetPlatformVersion=10.0.19041.0 -maxcpucount:12 - - Copy-Item -Path '.\bin\windows-${{matrix.platform}}\${{matrix.configuration}}\*' -Destination '.\FalcorBin\build\windows-vs2022\bin\Release\' -Recurse -Exclude ("*.pdb") + cmake --preset default --fresh \ + -DSLANG_SLANG_LLVM_FLAVOR=USE_SYSTEM_LLVM \ + -DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}} \ + -DSLANG_ENABLE_CUDA=1 + cmake --workflow --preset "${{matrix.config}}" + - name: Copy Slang to Falcor + run: | + cp --recursive --target-directory ./FalcorBin/build/windows-vs2022/bin/Release build/Release/bin/* - name: falcor-unit-test + shell: pwsh run: | $ErrorActionPreference = "SilentlyContinue" cd .\FalcorBin\tests python ./testing/run_unit_tests.py --config windows-vs2022-Release -t "-slow" cd ../../ - name: falcor-image-test + shell: pwsh run: | $ErrorActionPreference = "SilentlyContinue" cd .\FalcorBin\tests python ./testing/run_image_tests.py --config windows-vs2022-Release --run-only cd ../../ - From d25eb2bd659773b04a3ba307baebe768c7b484d2 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 2 Apr 2024 18:40:36 +0800 Subject: [PATCH 013/137] ci wobble --- .github/actions/common-setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index 203f43c7a9..5d98e10850 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -54,7 +54,7 @@ runs: echo "CXX=$CXX" >> "$GITHUB_ENV" # Set CMake to use sccache if it's available - if command -v sccache; then + if type -P sccache &> /dev/null; then echo "CMAKE_CXX_COMPILER_LAUNCHER=sccache" >> "$GITHUB_ENV" echo "CMAKE_C_COMPILER_LAUNCHER=sccache" >> "$GITHUB_ENV" fi From b5ac005ab838f60c82fd5aee0b6634ae430a0d94 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 3 Apr 2024 15:21:44 +0800 Subject: [PATCH 014/137] only install ninja if necessary --- .github/actions/common-setup/action.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index 5d98e10850..8016d32961 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -29,11 +29,13 @@ runs: # Set up system dependencies # Install Ninja - case "${{inputs.os}}" in - linux*) sudo apt-get install -y ninja-build;; - windows*) choco install ninja;; - macos*) brew install ninja;; - esac + if ! command -v ninja; then + case "${{inputs.os}}" in + linux*) sudo apt-get install -y ninja-build;; + windows*) choco install ninja;; + macos*) brew install ninja;; + esac + fi # Set compiler CC=${{inputs.compiler}} @@ -54,7 +56,7 @@ runs: echo "CXX=$CXX" >> "$GITHUB_ENV" # Set CMake to use sccache if it's available - if type -P sccache &> /dev/null; then + if command -v sccache; then echo "CMAKE_CXX_COMPILER_LAUNCHER=sccache" >> "$GITHUB_ENV" echo "CMAKE_C_COMPILER_LAUNCHER=sccache" >> "$GITHUB_ENV" fi From 56743eaf02177a84d9800524699c9a2fe5804663 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Apr 2024 15:24:37 +0800 Subject: [PATCH 015/137] more appropriate cache name --- .github/actions/common-setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index 8016d32961..e5011e5307 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -77,7 +77,7 @@ runs: with: path: ${{ github.workspace }}/build/llvm-project-install # Use os*compiler*platform in lieu of an ABI key here, which is what we really want - key: ${{ inputs.os }}-${{ inputs.compiler }}-${{ inputs.platform }}-${{ hashFiles('external/build-llvm.sh') }} + key: llvm-${{ inputs.os }}-${{ inputs.compiler }}-${{ inputs.platform }}-${{ hashFiles('external/build-llvm.sh') }} - name: Build LLVM if: steps.cache-llvm.outputs.cache-hit != 'true' shell: bash From b30efc81889e86d48abf3206793cf88272f5d27e Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Apr 2024 17:00:26 +0800 Subject: [PATCH 016/137] Remove premake from build instructions --- docs/building.md | 189 ----------------------------------------------- 1 file changed, 189 deletions(-) diff --git a/docs/building.md b/docs/building.md index 89ee9a9984..b21aa21ebe 100644 --- a/docs/building.md +++ b/docs/building.md @@ -1,194 +1,5 @@ # Building Slang From Source -We support building with both Premake and CMake. Both systems are described below. - -# Building Slang with Premake - -## Windows Using Visual Studio - -If you are using Visual Studio on Windows, then you can just open `slang.sln` and build your desired platform/configuration. `slang.sln` and associated project files are actually just generated using [`premake5`](https://premake.github.io/). See instructions in premake section below for further explanation. - -Whilst using the provided `slang.sln` solution is a fast and easy way to get a build to work, it does not make all binary dependencies available which can add features and improve performance (such as [slang-llvm](https://github.com/shader-slang/slang-llvm)). To get the binary dependencies create the solution using [`premake5`](https://premake.github.io/) described in a later section. - -## Other Targets - -Slang uses [`premake5`](https://premake.github.io/) to generate projects (such as `Makefile`s) that can then be used to build Slang binaries from source. - -For Linux and other targets the section below on `premake` describes the process. - -Some targets below are described as 'unofficial'. In practice this means that they are not tested as part of contiguous integration. Thus unfortunately it is quite possible from time to time for them to break on a merge of a PR. That said, if broken it is likely only very minor changes are needed to make them work again. - -### Generated Files - -Slang as part of it's build process generates header files, which are then used to compile the main Slang project. If you use `premake` to create your project, it will automatically generate these files before compiling the rest of the Slang. These are the current header generations which are created via the `slang-generate` and other tools... - -* core.meta.slang -> core.meta.slang.h -* hlsl.meta.slang -> hlsl.meta.slang.h - -Other files that are generated have `generated` as part of their name. - -It may be necessary or desirable to create a build of Slang without using `premake`. - -One way to do this would be to first compile slang-generate and then invoke it directly or as a dependency in your build. Another perhaps simpler way would be to first compile the same Slang source on another system that does support `premake`, or using a preexisting build mechanism (such as Visual Studio projects on Windows). Then copy the generated header files to your target system. This is appropriate because the generated files are indentical across platforms. It does of course mean that if `core.meta.slang` or `hlsl.meta.slang` files change the headers will need to be regenerated. - -## Premake - -Slang uses the tool [`premake5`](https://premake.github.io/) in order to generate projects that can be built on different targets. On Linux premake will generate Makefile/s and on windows it will generate a Visual Studio solution. Information on invoking premake for different kinds of targets can be found [here](https://github.com/premake/premake-core/wiki/Using-Premake). - -Slang includes `premake5` as part of `slang-binaries` which is in the `external` directory. For the external directory to be setup it is necessary to have updated submodules with `git submodule update --init`. - -If you are on a unix-like operating system such as OSX/Linux, it may be necesary to make premake5 executable. Use - -``` -% chmod u+x external/slang-binaries/premake/***path to premake version and os***/premake5 -``` - -Alternatively you can download and install [`premake5`](https://premake.github.io/) on your build system. - -Run `premake5` with `--help` to in the root of the Slang project to see available command line options (assuming `premake5` is in your `PATH`): - -``` -% premake5 --help -``` - -To download and use binaries for a particular architecture the [slang-pack](https://github.com/shader-slang/slang-binaries/tree/master/lua-modules) package manager can be invoked via the additional `--deps` and `--arch` options. If `--arch` isn't specified it defaults to `x64`. On Windows targets, the Visual Studio platform setting should be consistent with the `--arch` option such that the appropriate binary dependencies are available. The `--deps=true` option just indicates that on invoking premake it should make the binary dependencies for the `arch` available. - -Supported `--arch` options are - -* x64 -* x86 -* aarch64 -* arm - -For Unix like targets that might have `clang` or `gcc` compilers available you can select which one via the `-cc` option. For example... - -``` -% premake5 gmake2 --cc=clang --deps=true --arch=x64 -``` - -or - -``` -% premake5 gmake2 --cc=gcc --deps=true --arch=x64 -``` - -If you want to build the [`glslang`](https://github.com/KhronosGroup/glslang) library that Slang uses, add the option `--build-glslang=true`. - -# Projects using `make` - -The Slang project does not include Makefiles by default - they need to be generated via `premake`. Please read the section on your target operating system on how to use `premake` to create Makefiles. - -If building a Makefile based project, for example on Linux, OSX or [Cygwin](https://cygwin.com/), the configuration needs to be specified when invoking make, the following are typical... - -``` -% make config=release_x64 -% make config=debug_x64 -% make config=release_x86 -% make config=debug_x86 -% make config=release_aarch64 -% make config=debug_aarch64 -``` - -To check what compiler is being used/command line options you can add `verbose=1` to `make` command line. For example - -``` -% make config=debug_x64 verbose=1 -``` - -### Windows - -First download and install [`premake5`](https://premake.github.io/) on your build system. Open up a command line and go to the root directory of the slang source tree (ie the directory containing `slang.h`). - -Assuming premake5 is in your `PATH`, you can create a Visual Studio 2017 project for Slang with the following command line - -``` -% premake5 vs2017 --deps=true --arch=x64 -``` - -For Visual Studio 2019 use - -``` -% premake5 vs2019 --deps=true --arch=x64 -``` - -These should create a slang.sln in the same directory and which you can then open in the appropriate Visual Studio. Building will build all of Slang, examples and it's test infrastructure. - -### Linux - -On Linux we need to generate Makefiles using `premake`. Please read the `premake` section for more details. - -In the terminal go to the root directory of the slang source tree (ie the directory containing `slang.h`). Assuming `premake5` is in your `PATH` use - -``` -% premake5 gmake2 --deps=true --arch=x64 -``` - -To create a release build use - -``` -% make config=release_x64 -``` - -You can vary the compiler to use via the --cc option with 'gcc' or 'clang' for example - -### Mac OSX - -Note that OSX isn't an official target. - -On Mac OSX to generate Makefiles or an XCode project we use `premake`. Please read the `premake` section for more details. - -``` -% premake5 gmake2 --deps=true --arch=x64 -``` - -If you want to build `glslang` (necessary for Slang to output SPIR-V for example), then the additional `--build-glslang` option should be used - -``` -% premake5 gmake2 --build-glslang=true --deps=true --arch=x64 -``` - -To build for release you can use... - -``` -% make config=release_x64 -``` - -Slang can also be built within the Xcode IDE. Invoke `premake` as follows - -``` -% premake5 xcode4 --deps=true --arch=x64 -``` - -Then open the `slang.xcworkspace` project inside of Xcode and build. - -### Cygwin - -Note that Cygwin isn't an official target. - -One issue with building on [Cygwin](https://cygwin.com/), is that there isn't a binary version of `premake` currently available. It may be possible to make this work by building `premake` from source, and then just doing `premake5 gmake2`. Here we use another approach - using the windows `premake` to create a Cygwin project. To do this use the command line... - -``` -% premake5 --target-detail=cygwin gmake2 --deps=true --arch=x64 -``` - -## Testing - -When slang is built from source it also builds tools to be able to test the Slang compiler. Testing is achieved using the `slang-test` tool. The binaries are placed in the appropriate directory underneath `bin`. It is important that you initiate the test binary from the root directory of the slang source tree, such that all tests can be correctly located. - -For example to run the tests on a windows release x64 build from the command line, in the root directory of slang source tree you can use... - -``` -% bin\windows-x64\release\slang-test -``` - -Note that on windows if you want to run all of the tests from inside visual studio, it is necessary to set the `Working Directory` under "slang-test project" > "Configuration Properties" > "Debugging" > "Working Directory" to the root directory of the slang source tree. You can do this by setting it to `$(ProjectDir)/../..` for all configurations. - -If you only see 'unit-tests' being run (unit tests are prefixed with 'unit-tests/') then the working directory is not correctly set. Most tests are text files describing the test held in the `tests` directory in the root of the slang project. - -See the [documentation on testing](../tools/slang-test/README.md) for more information. - -# Building Slang with CMake - ### TLDR `cmake --workflow --preset release` to configure, build, and package a release From 9d2496dc783d26e043a2028d05c04b2443255645 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Apr 2024 17:13:03 +0800 Subject: [PATCH 017/137] Add some docs on ci setup --- docs/ci.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 docs/ci.md diff --git a/docs/ci.md b/docs/ci.md new file mode 100644 index 0000000000..bfb101dff3 --- /dev/null +++ b/docs/ci.md @@ -0,0 +1,18 @@ +# Our CI + +There are github actions for testing building and testing slang. + +## Tests + +Most configurations run a restricted set of tests, however on some self hosted runners we run the full test suite, as well as running Falcor's test suite with the new slang build. + +## Building LLVM + +We require a static build of LLVM for building slang-llvm, we build and cache this in all workflow runs. Since this changes infrequently, the cache is almost always hit. A cold build takes about an hour on the slowest platform. The cached output is a few hundred MB, so conceivably if we add many more platforms we might be caching more than the 10GB github allowance, which would necessitate being a bit more complicated in building and tracking outputs here. + +For slang-llvm, this is handled the same as any other dependency, except on Windows Debug builds, where we are required by the differences in Debug/Release standard libraries to always make a release build, this is noted in the ci action yaml file. + +## sccache + +The CI actions use sccache, keyed on compiler and platform, this runs on all configurations and significantly speeds up small source change builds. This cache can be safely missed without a large impact on build times. + From 21c6ad13a7875fb129cff578962e8fb45c295047 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Apr 2024 17:34:25 +0800 Subject: [PATCH 018/137] remove premake from regression tests --- .github/workflows/compile-regression-test.yml | 51 +++++++++++-------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/.github/workflows/compile-regression-test.yml b/.github/workflows/compile-regression-test.yml index ff55985605..eb8784d098 100644 --- a/.github/workflows/compile-regression-test.yml +++ b/.github/workflows/compile-regression-test.yml @@ -1,5 +1,3 @@ -# This is a basic workflow to help you get started with Actions - name: Compile Regression-Test on: @@ -12,37 +10,46 @@ concurrency: cancel-in-progress: true jobs: build: - runs-on: [self-hosted, Windows, regression-test] timeout-minutes: 100 continue-on-error: true strategy: fail-fast: false matrix: - configuration: ['Release'] - platform: ['x64'] include: - - platform: x64 - testPlatform: x64 - - platform: x64 - testCategory: full + # Self-hosted falcor tests + - os: windows + compiler: cl + platform: x64 + config: release + warnings-as-errors: false + test-category: full + full-gpu-tests: false + runs-on: [Windows, self-hosted, regression-test] + runs-on: ${{ matrix.runs-on }} + defaults: + run: + shell: bash steps: - uses: actions/checkout@v3 with: submodules: 'true' fetch-depth: '0' - - name: setup-msbuild - uses: microsoft/setup-msbuild@v1 - - name: build + - name: Setup + uses: ./.github/actions/common-setup + with: + os: ${{matrix.os}} + compiler: ${{matrix.compiler}} + platform: ${{matrix.platform}} + config: ${{matrix.config}} + - name: Build Slang run: | - .\premake.bat vs2019 --arch=${{matrix.platform}} --deps=true --no-progress=true --enable-cuda=true - - .\make-slang-tag-version.bat - - MSBuild.exe slang.sln -v:m -m -property:Configuration=${{matrix.configuration}} -property:Platform=${{matrix.platform}} -property:WindowsTargetPlatformVersion=10.0.19041.0 -maxcpucount:12 - + cmake --preset default --fresh \ + -DSLANG_SLANG_LLVM_FLAVOR=USE_SYSTEM_LLVM \ + -DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}} \ + -DSLANG_ENABLE_CUDA=1 + cmake --workflow --preset "${{matrix.config}}" - name: Run compile and validation test run: | - $gitbash = 'C:\Program Files\git\bin\bash.exe' - cp -r 'C:\slang_compile_test_suite_a' .\ - cd .\slang_compile_test_suite_a - & $gitbash compile_all_slang.sh + cp -r /c/slang_compile_test_suite_a . + cd slang_compile_test_suite_a + bash ./compile_all_slang.sh From 9753213b36ee4e2466387c944c4536c77755f6d7 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Apr 2024 17:34:34 +0800 Subject: [PATCH 019/137] remove premake from perf test --- .../workflows/falcor-compiler-perf-test.yml | 44 ++++++++++++------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/.github/workflows/falcor-compiler-perf-test.yml b/.github/workflows/falcor-compiler-perf-test.yml index cfd1837bd4..412c8e0bc2 100644 --- a/.github/workflows/falcor-compiler-perf-test.yml +++ b/.github/workflows/falcor-compiler-perf-test.yml @@ -12,33 +12,46 @@ concurrency: cancel-in-progress: true jobs: build: - runs-on: [Windows, self-hosted, perf] timeout-minutes: 100 continue-on-error: true strategy: fail-fast: false matrix: - configuration: ['Release'] - platform: ['x64'] include: - - platform: x64 - testPlatform: x64 - - platform: x64 - testCategory: full + # Self-hosted falcor tests + - os: windows + compiler: cl + platform: x64 + config: release + warnings-as-errors: false + test-category: full + full-gpu-tests: false + runs-on: [Windows, self-hosted, perf] + runs-on: ${{ matrix.runs-on }} + defaults: + run: + shell: bash steps: - uses: actions/checkout@v3 with: submodules: 'true' fetch-depth: '0' - - name: setup-msbuild - uses: microsoft/setup-msbuild@v1 - - name: build - run: | - .\premake.bat vs2019 --arch=${{matrix.platform}} --deps=true --no-progress=true --enable-cuda=true - .\make-slang-tag-version.bat + - name: Setup + uses: ./.github/actions/common-setup + with: + os: ${{matrix.os}} + compiler: ${{matrix.compiler}} + platform: ${{matrix.platform}} + config: ${{matrix.config}} - MSBuild.exe slang.sln -v:m -m -property:Configuration=${{matrix.configuration}} -property:Platform=${{matrix.platform}} -property:WindowsTargetPlatformVersion=10.0.19041.0 -maxcpucount:12 + - name: Build Slang + run: | + cmake --preset default --fresh \ + -DSLANG_SLANG_LLVM_FLAVOR=USE_SYSTEM_LLVM \ + -DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}} \ + -DSLANG_ENABLE_CUDA=1 + cmake --workflow --preset "${{matrix.config}}" - uses: robinraju/release-downloader@v1.9 id: download @@ -70,8 +83,9 @@ jobs: extract: false - name: run falcor-compiler-perf-test + shell: pwsh run: | $filename = '${{ fromJson(steps.download.outputs.downloaded_files)[0] }}' Expand-Archive $filename -DestinationPath .\falcor-perf-test - $env:PATH += ";.\bin\windows-${{matrix.testPlatform}}\${{matrix.configuration}}"; + $env:PATH += ";.\build\${{matrix.config}}\bin"; .\falcor-perf-test\bin\Release\falcor_perftest.exe From b13c5e01f51eac0389f08c13c10b8f38a3360805 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Apr 2024 13:33:06 +0800 Subject: [PATCH 020/137] Set SLANGC_PATH --- .github/workflows/compile-regression-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/compile-regression-test.yml b/.github/workflows/compile-regression-test.yml index eb8784d098..6a175c5e3d 100644 --- a/.github/workflows/compile-regression-test.yml +++ b/.github/workflows/compile-regression-test.yml @@ -52,4 +52,5 @@ jobs: run: | cp -r /c/slang_compile_test_suite_a . cd slang_compile_test_suite_a + export SLANGC_PATH="$bin_dir/slangc.exe" bash ./compile_all_slang.sh From 5ed4339ecc228231ae56b118f51fbd6bc5fb188a Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Apr 2024 14:16:12 +0800 Subject: [PATCH 021/137] ci wobble --- .github/workflows/compile-regression-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/compile-regression-test.yml b/.github/workflows/compile-regression-test.yml index 6a175c5e3d..521efa5811 100644 --- a/.github/workflows/compile-regression-test.yml +++ b/.github/workflows/compile-regression-test.yml @@ -53,4 +53,6 @@ jobs: cp -r /c/slang_compile_test_suite_a . cd slang_compile_test_suite_a export SLANGC_PATH="$bin_dir/slangc.exe" + which spirv-val || echo "no spirv-val" + which spirv-val.exe || echo "no spirv-val.exe" bash ./compile_all_slang.sh From d00081f9ae9b13c807879bab338fcabc5cac4e98 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Apr 2024 14:41:44 +0800 Subject: [PATCH 022/137] bump slang-binaries --- external/slang-binaries | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/slang-binaries b/external/slang-binaries index a68cd45144..2e1c4fc598 160000 --- a/external/slang-binaries +++ b/external/slang-binaries @@ -1 +1 @@ -Subproject commit a68cd451448c1a480dd3df339b64457d7e46c342 +Subproject commit 2e1c4fc5983229c1bcaea77d7bdb6dad24a3fb7e From 669fce8faafe284b5663d94e79f467137e261a3e Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Apr 2024 14:47:46 +0800 Subject: [PATCH 023/137] ci wobble --- .github/workflows/compile-regression-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/compile-regression-test.yml b/.github/workflows/compile-regression-test.yml index 521efa5811..6000c69c7a 100644 --- a/.github/workflows/compile-regression-test.yml +++ b/.github/workflows/compile-regression-test.yml @@ -55,4 +55,5 @@ jobs: export SLANGC_PATH="$bin_dir/slangc.exe" which spirv-val || echo "no spirv-val" which spirv-val.exe || echo "no spirv-val.exe" + spirv-val --version bash ./compile_all_slang.sh From cbfa8e413cb8375d8c9bef95bb63fc45b0d567bb Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Apr 2024 15:28:35 +0800 Subject: [PATCH 024/137] Bump spirv tools --- external/slang-binaries | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/slang-binaries b/external/slang-binaries index 2e1c4fc598..ae6616fa0e 160000 --- a/external/slang-binaries +++ b/external/slang-binaries @@ -1 +1 @@ -Subproject commit 2e1c4fc5983229c1bcaea77d7bdb6dad24a3fb7e +Subproject commit ae6616fa0e3fb0a8e343e55e9e4d63b5eecfdf68 From 8332f5bb7d3336f8eb10dab6a494b09793023cbb Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Thu, 11 Apr 2024 15:13:03 +0800 Subject: [PATCH 025/137] dont use timestamp in cache --- .github/actions/common-setup/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index e5011e5307..e4aa23e879 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -21,6 +21,7 @@ runs: with: key: ${{github.job}}-${{inputs.os}}-${{inputs.compiler}}-${{inputs.platform}}-${{inputs.config}} variant: sccache + append-timestamp: false # Opportunistically use sccache, it's not available for example on self # hosted runners or ARM continue-on-error: true From 13a1b0534e13de68d55d26793be44e96671efeea Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Thu, 11 Apr 2024 15:13:10 +0800 Subject: [PATCH 026/137] remote debug code --- .github/workflows/compile-regression-test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/compile-regression-test.yml b/.github/workflows/compile-regression-test.yml index 6000c69c7a..6a175c5e3d 100644 --- a/.github/workflows/compile-regression-test.yml +++ b/.github/workflows/compile-regression-test.yml @@ -53,7 +53,4 @@ jobs: cp -r /c/slang_compile_test_suite_a . cd slang_compile_test_suite_a export SLANGC_PATH="$bin_dir/slangc.exe" - which spirv-val || echo "no spirv-val" - which spirv-val.exe || echo "no spirv-val.exe" - spirv-val --version bash ./compile_all_slang.sh From dbfcd28840887aa4294a0459a2432e47039d9bec Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Thu, 11 Apr 2024 15:19:17 +0800 Subject: [PATCH 027/137] cache key wobble --- .github/actions/common-setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index e4aa23e879..b24eabe762 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -19,7 +19,7 @@ runs: - name: Set up sccache uses: hendrikmuhs/ccache-action@v1.2 with: - key: ${{github.job}}-${{inputs.os}}-${{inputs.compiler}}-${{inputs.platform}}-${{inputs.config}} + key: ${{inputs.os}}-${{inputs.compiler}}-${{inputs.platform}}-${{inputs.config}} variant: sccache append-timestamp: false # Opportunistically use sccache, it's not available for example on self From 02d670d9b77e40c5ab39b119d5d9607312bfd3e2 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 12 Apr 2024 12:22:19 +0800 Subject: [PATCH 028/137] Install sccache after building llvm --- .github/actions/common-setup/action.yml | 34 ++++++++++++++----------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index b24eabe762..87c49105b2 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -16,15 +16,6 @@ runs: steps: - name: Set up MSVC dev tools on Windows uses: ilammy/msvc-dev-cmd@v1 - - name: Set up sccache - uses: hendrikmuhs/ccache-action@v1.2 - with: - key: ${{inputs.os}}-${{inputs.compiler}}-${{inputs.platform}}-${{inputs.config}} - variant: sccache - append-timestamp: false - # Opportunistically use sccache, it's not available for example on self - # hosted runners or ARM - continue-on-error: true - shell: bash run: | # Set up system dependencies @@ -56,12 +47,6 @@ runs: echo "CC=$CC" >> "$GITHUB_ENV" echo "CXX=$CXX" >> "$GITHUB_ENV" - # Set CMake to use sccache if it's available - if command -v sccache; then - echo "CMAKE_CXX_COMPILER_LAUNCHER=sccache" >> "$GITHUB_ENV" - echo "CMAKE_C_COMPILER_LAUNCHER=sccache" >> "$GITHUB_ENV" - fi - # Some useful variables config=${{inputs.config}} Config=$(echo "${{inputs.config}}" | sed 's/debug/Debug/;s/release/Release/') @@ -88,12 +73,31 @@ runs: with: path: ${{ github.workspace }}/build/llvm-project-install key: ${{ steps.cache-llvm.outputs.cache-primary-key }} + + # Run this after building llvm, it's pointless to fill the caches with + # infrequent llvm build products + - name: Set up sccache + uses: hendrikmuhs/ccache-action@v1.2 + with: + key: ${{inputs.os}}-${{inputs.compiler}}-${{inputs.platform}}-${{inputs.config}} + variant: sccache + append-timestamp: false + # Opportunistically use sccache, it's not available for example on self + # hosted runners or ARM + continue-on-error: true + - name: Set environment variable for CMake shell: bash run: | echo "LLVM_DIR=${{ github.workspace }}/build/llvm-project-install" >> "$GITHUB_ENV" echo "Clang_DIR=${{ github.workspace }}/build/llvm-project-install" >> "$GITHUB_ENV" + # Set CMake to use sccache if it's available + if command -v sccache; then + echo "CMAKE_CXX_COMPILER_LAUNCHER=sccache" >> "$GITHUB_ENV" + echo "CMAKE_C_COMPILER_LAUNCHER=sccache" >> "$GITHUB_ENV" + fi + # Install swiftshader - uses: robinraju/release-downloader@v1.8 continue-on-error: true From dfac0d612d124073d6d3bc9725f617a2d23a913e Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 12 Apr 2024 12:22:27 +0800 Subject: [PATCH 029/137] Do not build llvm tools --- external/build-llvm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/build-llvm.sh b/external/build-llvm.sh index a01158e783..142d30ee2f 100755 --- a/external/build-llvm.sh +++ b/external/build-llvm.sh @@ -108,7 +108,7 @@ cmake_arguments_for_slang=( # Requirements for Slang -DLLVM_ENABLE_PROJECTS=clang "-DLLVM_TARGETS_TO_BUILD=X86;ARM;AArch64" - -DLLVM_BUILD_TOOLS=1 + -DLLVM_BUILD_TOOLS=0 ) build_dir=$source_dir/build mkdir -p "$build_dir" From bfd69fa1d12ad7a03827e66c6d72d352683c37d3 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 16 Apr 2024 13:30:31 +0800 Subject: [PATCH 030/137] ci wobble --- .github/workflows/falcor-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/falcor-test.yml b/.github/workflows/falcor-test.yml index f7484d47d8..784c7ceb5c 100644 --- a/.github/workflows/falcor-test.yml +++ b/.github/workflows/falcor-test.yml @@ -68,6 +68,8 @@ jobs: run: | $ErrorActionPreference = "SilentlyContinue" cd .\FalcorBin\tests + ls + ls testing python ./testing/run_unit_tests.py --config windows-vs2022-Release -t "-slow" cd ../../ - name: falcor-image-test From 3077e4b5780853d0033e74f335209538259f2c3f Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 16 Apr 2024 13:38:36 +0800 Subject: [PATCH 031/137] ci wobble --- .github/workflows/falcor-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/falcor-test.yml b/.github/workflows/falcor-test.yml index 784c7ceb5c..74d9953009 100644 --- a/.github/workflows/falcor-test.yml +++ b/.github/workflows/falcor-test.yml @@ -70,6 +70,7 @@ jobs: cd .\FalcorBin\tests ls ls testing + python --version python ./testing/run_unit_tests.py --config windows-vs2022-Release -t "-slow" cd ../../ - name: falcor-image-test From f11ae52ff60a5394bc5feadcf9fe80d337532f68 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 16 Apr 2024 13:45:50 +0800 Subject: [PATCH 032/137] ci wobble --- .github/workflows/falcor-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/falcor-test.yml b/.github/workflows/falcor-test.yml index 74d9953009..545598e6f4 100644 --- a/.github/workflows/falcor-test.yml +++ b/.github/workflows/falcor-test.yml @@ -71,6 +71,8 @@ jobs: ls ls testing python --version + python ./testing/run_unit_tests.py --help + python ./testing/run_unit_tests.py --list-configs python ./testing/run_unit_tests.py --config windows-vs2022-Release -t "-slow" cd ../../ - name: falcor-image-test From 0430ee9545980c442458dc55169f0d1edc53d6b6 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 16 Apr 2024 13:51:31 +0800 Subject: [PATCH 033/137] ci wobble --- .github/workflows/falcor-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/falcor-test.yml b/.github/workflows/falcor-test.yml index 545598e6f4..ad6c7ab77a 100644 --- a/.github/workflows/falcor-test.yml +++ b/.github/workflows/falcor-test.yml @@ -73,6 +73,7 @@ jobs: python --version python ./testing/run_unit_tests.py --help python ./testing/run_unit_tests.py --list-configs + python ./testing/run_unit_tests.py --config windows-vs2022-Release python ./testing/run_unit_tests.py --config windows-vs2022-Release -t "-slow" cd ../../ - name: falcor-image-test From 2e2b6f464c3c3d3945c556df0afed8e8db7e30db Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 16 Apr 2024 15:44:03 +0800 Subject: [PATCH 034/137] ci wobble --- .github/workflows/falcor-test.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/falcor-test.yml b/.github/workflows/falcor-test.yml index ad6c7ab77a..f7484d47d8 100644 --- a/.github/workflows/falcor-test.yml +++ b/.github/workflows/falcor-test.yml @@ -68,12 +68,6 @@ jobs: run: | $ErrorActionPreference = "SilentlyContinue" cd .\FalcorBin\tests - ls - ls testing - python --version - python ./testing/run_unit_tests.py --help - python ./testing/run_unit_tests.py --list-configs - python ./testing/run_unit_tests.py --config windows-vs2022-Release python ./testing/run_unit_tests.py --config windows-vs2022-Release -t "-slow" cd ../../ - name: falcor-image-test From 76e911373dae9eddbae31c9a76ce9f766da585d2 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 24 Apr 2024 13:43:39 +0800 Subject: [PATCH 035/137] Tests spirv via glsl in ci --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 775721feaa..4998046596 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -111,7 +111,7 @@ jobs: $bin_dir/slang-test \ -use-test-server \ -server-count 8 \ - -emit-spirv-directly \ + -emit-spirv-via-glsl \ -api vk \ -category ${{ matrix.test-category }} \ -expected-failure-list tests/expected-failure.txt || From 50e54042f045e708c41600acd5fe194872846cc5 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Thu, 25 Apr 2024 14:35:09 +0800 Subject: [PATCH 036/137] Define SLANG_ENABLE_XLIB=1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 883aa41126..16d1b461e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -465,7 +465,7 @@ if(SLANG_ENABLE_GFX) Cocoa QuartzCore EXTRA_COMPILE_DEFINITIONS_PRIVATE - $<$:SLANG_ENABLE_XLIB> + $<$:SLANG_ENABLE_XLIB=1> INCLUDE_FROM_PRIVATE gfx INCLUDE_DIRECTORIES_PUBLIC tools/platform EXPORT_MACRO_PREFIX SLANG_PLATFORM From 7a0d165804eced9528b191f182aac8d37a57f1cb Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Thu, 25 Apr 2024 14:38:40 +0800 Subject: [PATCH 037/137] osx builds on aarch64 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 113ef882cb..0bf087a282 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: include: - { os: linux, runs-on: ubuntu-20.04 } - { os: windows, runs-on: windows-latest } - - { os: macos, runs-on: macos-latest } + - { os: macos, runs-on: macos-latest, platform: aarch64 } # Set a test category depending on the config, smoke by default, # quick or full conditionally otherwise - test-category: smoke From 23da35dffe460da2ef239a8f53b43ed2277efafd Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Thu, 25 Apr 2024 14:48:09 +0800 Subject: [PATCH 038/137] ci wobble --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0bf087a282..baa5f88633 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,9 @@ jobs: include: - { os: linux, runs-on: ubuntu-20.04 } - { os: windows, runs-on: windows-latest } - - { os: macos, runs-on: macos-latest, platform: aarch64 } + - { os: macos, runs-on: macos-latest } + - platform: x64 + - { os: macos, platform: aarch64 } # Set a test category depending on the config, smoke by default, # quick or full conditionally otherwise - test-category: smoke From 23f60f0310efad67e5916e46a953bbcbea8982f6 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Thu, 25 Apr 2024 14:50:59 +0800 Subject: [PATCH 039/137] ci wobble --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index baa5f88633..63ebd20a96 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,6 @@ jobs: os: [linux, macos, windows] compiler: [gcc, clang, cl] config: [debug, release] - platform: [x64] full-gpu-tests: [false] exclude: # Exclude invalid or undesired os/compiler @@ -30,6 +29,7 @@ jobs: - { os: linux, runs-on: ubuntu-20.04 } - { os: windows, runs-on: windows-latest } - { os: macos, runs-on: macos-latest } + # Default to x64, but aarch64 on osx - platform: x64 - { os: macos, platform: aarch64 } # Set a test category depending on the config, smoke by default, From 59a909c2c23fa32edd655b7dd35fa209eba0b46a Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Thu, 25 Apr 2024 15:03:01 +0800 Subject: [PATCH 040/137] ci wobble --- .github/workflows/ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 63ebd20a96..a1b07cf3a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,7 @@ jobs: os: [linux, macos, windows] compiler: [gcc, clang, cl] config: [debug, release] + platform: [x64, aarch64] full-gpu-tests: [false] exclude: # Exclude invalid or undesired os/compiler @@ -25,13 +26,14 @@ jobs: - { os: windows, compiler: clang } # or os/config combinations - { os: macos, config: debug } + # Default to x64, but aarch64 on osx + - { os: linux, platform: aarch64 } + - { os: windows, platform: aarch64 } + - { os: macos, platform: x64 } include: - { os: linux, runs-on: ubuntu-20.04 } - { os: windows, runs-on: windows-latest } - { os: macos, runs-on: macos-latest } - # Default to x64, but aarch64 on osx - - platform: x64 - - { os: macos, platform: aarch64 } # Set a test category depending on the config, smoke by default, # quick or full conditionally otherwise - test-category: smoke From dc097686bee1733ca7abe04aa536de8161af065f Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Thu, 25 Apr 2024 15:52:31 +0800 Subject: [PATCH 041/137] ci wobble --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a1b07cf3a9..1b20625099 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: - { os: windows, compiler: gcc } - { os: windows, compiler: clang } # or os/config combinations - - { os: macos, config: debug } + # - { os: macos, config: debug } # Default to x64, but aarch64 on osx - { os: linux, platform: aarch64 } - { os: windows, platform: aarch64 } From 60feff7c40a4f7369ff1248c851f4040c1227c34 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Thu, 25 Apr 2024 16:46:42 +0800 Subject: [PATCH 042/137] ci wobble --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b20625099..79c92542a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: # Exclude invalid or undesired os/compiler - { os: linux, compiler: cl } - { os: macos, compiler: cl } - - { os: macos, compiler: gcc } + # - { os: macos, compiler: gcc } - { os: windows, compiler: gcc } - { os: windows, compiler: clang } # or os/config combinations From 2f694e74980e760df6deaa3e5250ba5d28034632 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Thu, 25 Apr 2024 16:53:03 +0800 Subject: [PATCH 043/137] ci wobble --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 79c92542a7..4b2b7a3156 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: # Default to x64, but aarch64 on osx - { os: linux, platform: aarch64 } - { os: windows, platform: aarch64 } - - { os: macos, platform: x64 } + # - { os: macos, platform: x64 } include: - { os: linux, runs-on: ubuntu-20.04 } - { os: windows, runs-on: windows-latest } From 28cfc05a334ac0a7621fe9207246426a8b8f2975 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 5 Jul 2024 16:46:11 +0800 Subject: [PATCH 044/137] package documentation and metadata with cmake --- CMakeLists.txt | 23 +++++++++-------------- CMakePresets.json | 19 +++++++++++++------ 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a53e3e158..b39b9b5aac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -553,6 +553,15 @@ if(SLANG_ENABLE_GFX) ) endif() +# +# Installing any documentation +# + +file(GLOB_RECURSE docs CONFIGURE_DEPENDS docs/*.md) +if(docs) + install(FILES ${docs} DESTINATION ${CMAKE_INSTALL_DOCDIR}) +endif() + # # The test executables and runtime-loaded modules # @@ -789,18 +798,4 @@ endif() # # Packaging # -set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) -set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE ON) -install(FILES - "${slang_SOURCE_DIR}/README.md" - "${slang_SOURCE_DIR}/LICENSE" - DESTINATION . - COMPONENT metadata - EXCLUDE_FROM_ALL -) -install(DIRECTORY - "${slang_SOURCE_DIR}/docs/" - DESTINATION share/doc/slang -) - include(CPack) diff --git a/CMakePresets.json b/CMakePresets.json index 27fe83109c..de1959c282 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -35,8 +35,16 @@ "generator": "Visual Studio 17 2022" }, { - "name": "slang-llvm", + "name": "single-component", "inherits": "default", + "description": "configure to package a single component", + "cacheVariables": { + "CPACK_ARCHIVE_COMPONENT_INSTALL": "ON" + } + }, + { + "name": "slang-llvm", + "inherits": "single-component", "description": "Build slang-llvm from the system LLVM", "cacheVariables": { "SLANG_SLANG_LLVM_FLAVOR": "USE_SYSTEM_LLVM" @@ -57,7 +65,7 @@ { "name": "generators", "inherits": "release", - "configurePreset": "default", + "configurePreset": "single-component", "targets": [ "all-generators" ] @@ -80,8 +88,7 @@ "ZIP" ], "variables": { - "CPACK_PACKAGE_FILE_NAME": "slang", - "CPACK_COMPONENTS_ALL": "Unspecified;metadata" + "CPACK_PACKAGE_FILE_NAME": "slang" } }, { @@ -103,7 +110,7 @@ { "name": "generators", "inherits": "release", - "configurePreset": "default", + "configurePreset": "single-component", "variables": { "CPACK_COMPONENTS_ALL": "generators" } @@ -157,7 +164,7 @@ "steps": [ { "type": "configure", - "name": "default" + "name": "single-component" }, { "type": "build", From 2ad13c77b7148bbc09285f27cb605b210d312505 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 5 Jul 2024 19:15:31 +0800 Subject: [PATCH 045/137] ci wobble --- tests/bindings/nested-parameter-block-2.slang | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/bindings/nested-parameter-block-2.slang b/tests/bindings/nested-parameter-block-2.slang index 38ce9232e2..59580f17d9 100644 --- a/tests/bindings/nested-parameter-block-2.slang +++ b/tests/bindings/nested-parameter-block-2.slang @@ -37,6 +37,10 @@ ParameterBlock pb2; [numthreads(4,1,1)] void computeMain(uint3 sv_dispatchThreadID : SV_DispatchThreadID) { - // CHECK: 4 + // CHECK: type: uint32_t + // CHECK-NEXT: 4 + // CHECK-NEXT: 4 + // CHECK-NEXT: 4 + // CHECK-NEXT: 4 pb2.resultBuffer[sv_dispatchThreadID.x] = scene.sceneCb.value.x + scene.data[0].x + scene.material.cb.value.x + scene.material.data[0].x; } From 47ccb64f7db26c15912260dfd8b956ced455fd17 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 5 Jul 2024 19:56:16 +0800 Subject: [PATCH 046/137] Split hlsl double intrinsic tests --- .../scalar-double-.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-abs.slang | 10 ++++++++++ .../scalar-double-abs.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-acos.slang | 10 ++++++++++ .../scalar-double-acos.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-asdouble.slang | 10 ++++++++++ .../scalar-double-asdouble.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-asin.slang | 10 ++++++++++ .../scalar-double-asin.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-asuint.slang | 13 +++++++++++++ .../scalar-double-asuint.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-atan.slang | 10 ++++++++++ .../scalar-double-atan.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-atan2.slang | 10 ++++++++++ .../scalar-double-atan2.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-ceil.slang | 10 ++++++++++ .../scalar-double-ceil.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-clamp.slang | 10 ++++++++++ .../scalar-double-clamp.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-cos.slang | 10 ++++++++++ .../scalar-double-cos.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-exp.slang | 10 ++++++++++ .../scalar-double-exp.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-exp2.slang | 10 ++++++++++ .../scalar-double-exp2.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-floor.slang | 10 ++++++++++ .../scalar-double-floor.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-frac.slang | 10 ++++++++++ .../scalar-double-frac.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-ldexp.slang | 10 ++++++++++ .../scalar-double-ldexp.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-lerp.slang | 10 ++++++++++ .../scalar-double-lerp.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-log.slang | 10 ++++++++++ .../scalar-double-log.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-log10.slang | 10 ++++++++++ .../scalar-double-log10.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-log2.slang | 10 ++++++++++ .../scalar-double-log2.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-max.slang | 10 ++++++++++ .../scalar-double-max.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-min.slang | 10 ++++++++++ .../scalar-double-min.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-pow.slang | 10 ++++++++++ .../scalar-double-pow.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-rcp.slang | 10 ++++++++++ .../scalar-double-rcp.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-rsqrt.slang | 10 ++++++++++ .../scalar-double-rsqrt.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-saturate.slang | 10 ++++++++++ .../scalar-double-saturate.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-sign.slang | 10 ++++++++++ .../scalar-double-sign.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-sin.slang | 10 ++++++++++ .../scalar-double-sin.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-sincos.slang | 13 +++++++++++++ .../scalar-double-sincos.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-smoothstep.slang | 10 ++++++++++ .../scalar-double-smoothstep.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-sqrt.slang | 10 ++++++++++ .../scalar-double-sqrt.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-step.slang | 10 ++++++++++ .../scalar-double-step.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-tan.slang | 10 ++++++++++ .../scalar-double-tan.slang.expected.txt | 5 +++++ tests/hlsl-intrinsic/scalar-double-trunc.slang | 10 ++++++++++ .../scalar-double-trunc.slang.expected.txt | 5 +++++ 67 files changed, 506 insertions(+) create mode 100644 tests/hlsl-intrinsic/scalar-double-.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-abs.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-abs.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-acos.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-acos.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-asdouble.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-asdouble.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-asin.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-asin.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-asuint.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-asuint.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-atan.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-atan.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-atan2.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-atan2.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-ceil.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-ceil.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-clamp.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-clamp.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-cos.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-cos.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-exp.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-exp.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-exp2.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-exp2.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-floor.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-floor.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-frac.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-frac.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-ldexp.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-ldexp.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-lerp.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-lerp.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-log.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-log.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-log10.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-log10.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-log2.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-log2.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-max.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-max.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-min.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-min.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-pow.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-pow.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-rcp.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-rcp.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-rsqrt.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-rsqrt.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-saturate.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-saturate.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-sign.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-sign.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-sin.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-sin.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-sincos.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-sincos.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-smoothstep.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-smoothstep.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-sqrt.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-sqrt.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-step.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-step.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-tan.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-tan.slang.expected.txt create mode 100644 tests/hlsl-intrinsic/scalar-double-trunc.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-trunc.slang.expected.txt diff --git a/tests/hlsl-intrinsic/scalar-double-.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-.slang.expected.txt new file mode 100644 index 0000000000..8f4fc17f6f --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +150 +300 +600 +1200 diff --git a/tests/hlsl-intrinsic/scalar-double-abs.slang b/tests/hlsl-intrinsic/scalar-double-abs.slang new file mode 100644 index 0000000000..c4b7e65edb --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-abs.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(abs(double(i) - 1.5) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-abs.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-abs.slang.expected.txt new file mode 100644 index 0000000000..3aab68509c --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-abs.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +150 +50 +50 +150 diff --git a/tests/hlsl-intrinsic/scalar-double-acos.slang b/tests/hlsl-intrinsic/scalar-double-acos.slang new file mode 100644 index 0000000000..da875f895a --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-acos.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(acos(double(i) / 3.0) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-acos.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-acos.slang.expected.txt new file mode 100644 index 0000000000..ad46300403 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-acos.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +157 +123 +84 +0 diff --git a/tests/hlsl-intrinsic/scalar-double-asdouble.slang b/tests/hlsl-intrinsic/scalar-double-asdouble.slang new file mode 100644 index 0000000000..1aca3867a0 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-asdouble.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(asdouble(uint(i * 2), uint(i * 2 + 1)) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-asdouble.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-asdouble.slang.expected.txt new file mode 100644 index 0000000000..b9efb5a97f --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-asdouble.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +0 +0 +0 diff --git a/tests/hlsl-intrinsic/scalar-double-asin.slang b/tests/hlsl-intrinsic/scalar-double-asin.slang new file mode 100644 index 0000000000..37a493fac3 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-asin.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(asin(double(i) / 3.0) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-asin.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-asin.slang.expected.txt new file mode 100644 index 0000000000..b5bc8a81c6 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-asin.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +33 +72 +157 diff --git a/tests/hlsl-intrinsic/scalar-double-asuint.slang b/tests/hlsl-intrinsic/scalar-double-asuint.slang new file mode 100644 index 0000000000..b2fab7c7d3 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-asuint.slang @@ -0,0 +1,13 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + uint low, high; + asuint(double(i), low, high); + outputBuffer[i * 2] = int(low); + outputBuffer[i * 2 + 1] = int(high); +} diff --git a/tests/hlsl-intrinsic/scalar-double-asuint.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-asuint.slang.expected.txt new file mode 100644 index 0000000000..3d08e2c516 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-asuint.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +0 +0 +1072693248 diff --git a/tests/hlsl-intrinsic/scalar-double-atan.slang b/tests/hlsl-intrinsic/scalar-double-atan.slang new file mode 100644 index 0000000000..02af3f7ea0 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-atan.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(atan(double(i)) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-atan.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-atan.slang.expected.txt new file mode 100644 index 0000000000..ca43262d19 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-atan.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +78 +110 +124 diff --git a/tests/hlsl-intrinsic/scalar-double-atan2.slang b/tests/hlsl-intrinsic/scalar-double-atan2.slang new file mode 100644 index 0000000000..f806ef8d22 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-atan2.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(atan2(double(i), 2.0) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-atan2.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-atan2.slang.expected.txt new file mode 100644 index 0000000000..0314fa6355 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-atan2.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +46 +78 +98 diff --git a/tests/hlsl-intrinsic/scalar-double-ceil.slang b/tests/hlsl-intrinsic/scalar-double-ceil.slang new file mode 100644 index 0000000000..73f7862cff --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-ceil.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(ceil(double(i) - 0.5) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-ceil.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-ceil.slang.expected.txt new file mode 100644 index 0000000000..4dfaed3077 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-ceil.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +100 +200 +300 diff --git a/tests/hlsl-intrinsic/scalar-double-clamp.slang b/tests/hlsl-intrinsic/scalar-double-clamp.slang new file mode 100644 index 0000000000..f123c52b45 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-clamp.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(clamp(double(i), 1.0, 2.0) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-clamp.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-clamp.slang.expected.txt new file mode 100644 index 0000000000..3f065bde20 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-clamp.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +100 +100 +200 +200 diff --git a/tests/hlsl-intrinsic/scalar-double-cos.slang b/tests/hlsl-intrinsic/scalar-double-cos.slang new file mode 100644 index 0000000000..c7f0abe25a --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-cos.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(cos(double(i)) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-cos.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-cos.slang.expected.txt new file mode 100644 index 0000000000..1e70b8eff3 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-cos.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +100 +54 +-41 +-98 diff --git a/tests/hlsl-intrinsic/scalar-double-exp.slang b/tests/hlsl-intrinsic/scalar-double-exp.slang new file mode 100644 index 0000000000..6748bbcddd --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-exp.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(exp(double(i)) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-exp.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-exp.slang.expected.txt new file mode 100644 index 0000000000..3ba256bdbf --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-exp.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +100 +271 +738 +2008 diff --git a/tests/hlsl-intrinsic/scalar-double-exp2.slang b/tests/hlsl-intrinsic/scalar-double-exp2.slang new file mode 100644 index 0000000000..2bf2d5db74 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-exp2.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(exp2(double(i)) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-exp2.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-exp2.slang.expected.txt new file mode 100644 index 0000000000..0cd9199636 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-exp2.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +100 +200 +400 +800 diff --git a/tests/hlsl-intrinsic/scalar-double-floor.slang b/tests/hlsl-intrinsic/scalar-double-floor.slang new file mode 100644 index 0000000000..75f0792844 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-floor.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(floor(double(i) + 0.5) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-floor.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-floor.slang.expected.txt new file mode 100644 index 0000000000..4dfaed3077 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-floor.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +100 +200 +300 diff --git a/tests/hlsl-intrinsic/scalar-double-frac.slang b/tests/hlsl-intrinsic/scalar-double-frac.slang new file mode 100644 index 0000000000..85aa81cb98 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-frac.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(frac(double(i) * 1.5) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-frac.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-frac.slang.expected.txt new file mode 100644 index 0000000000..6b1afa87da --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-frac.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +50 +0 +50 diff --git a/tests/hlsl-intrinsic/scalar-double-ldexp.slang b/tests/hlsl-intrinsic/scalar-double-ldexp.slang new file mode 100644 index 0000000000..ebd1c9d6c1 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-ldexp.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(ldexp(1.5, int(i)) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-ldexp.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-ldexp.slang.expected.txt new file mode 100644 index 0000000000..8f4fc17f6f --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-ldexp.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +150 +300 +600 +1200 diff --git a/tests/hlsl-intrinsic/scalar-double-lerp.slang b/tests/hlsl-intrinsic/scalar-double-lerp.slang new file mode 100644 index 0000000000..e304b4e67d --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-lerp.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(lerp(-100.0, 100.0, double(i) / 3.0) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-lerp.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-lerp.slang.expected.txt new file mode 100644 index 0000000000..2a7b8f7108 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-lerp.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +-10000 +-3333 +3333 +10000 diff --git a/tests/hlsl-intrinsic/scalar-double-log.slang b/tests/hlsl-intrinsic/scalar-double-log.slang new file mode 100644 index 0000000000..8dbc018150 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-log.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(log(double(i) + 1.0) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-log.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-log.slang.expected.txt new file mode 100644 index 0000000000..e4a6603c41 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-log.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +69 +109 +138 diff --git a/tests/hlsl-intrinsic/scalar-double-log10.slang b/tests/hlsl-intrinsic/scalar-double-log10.slang new file mode 100644 index 0000000000..e68088302f --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-log10.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(log10(double(i) + 1.0) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-log10.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-log10.slang.expected.txt new file mode 100644 index 0000000000..318d50830a --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-log10.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +30 +47 +60 diff --git a/tests/hlsl-intrinsic/scalar-double-log2.slang b/tests/hlsl-intrinsic/scalar-double-log2.slang new file mode 100644 index 0000000000..ca06ab05af --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-log2.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(log2(double(i) + 1.0) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-log2.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-log2.slang.expected.txt new file mode 100644 index 0000000000..2edb160613 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-log2.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +100 +158 +200 diff --git a/tests/hlsl-intrinsic/scalar-double-max.slang b/tests/hlsl-intrinsic/scalar-double-max.slang new file mode 100644 index 0000000000..e5e1f3156c --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-max.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(max(1.0, double(i) / 2.0) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-max.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-max.slang.expected.txt new file mode 100644 index 0000000000..1637644658 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-max.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +100 +100 +100 +150 diff --git a/tests/hlsl-intrinsic/scalar-double-min.slang b/tests/hlsl-intrinsic/scalar-double-min.slang new file mode 100644 index 0000000000..a90d116651 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-min.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(min(1.0, double(i) / 2.0) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-min.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-min.slang.expected.txt new file mode 100644 index 0000000000..c0bbd3650b --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-min.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +50 +100 +100 diff --git a/tests/hlsl-intrinsic/scalar-double-pow.slang b/tests/hlsl-intrinsic/scalar-double-pow.slang new file mode 100644 index 0000000000..3c48c2dacf --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-pow.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(pow(double(i), 2.0) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-pow.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-pow.slang.expected.txt new file mode 100644 index 0000000000..b36b3d5279 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-pow.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +100 +400 +900 diff --git a/tests/hlsl-intrinsic/scalar-double-rcp.slang b/tests/hlsl-intrinsic/scalar-double-rcp.slang new file mode 100644 index 0000000000..c3a48bbacd --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-rcp.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(rcp(1.0 + double(i)) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-rcp.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-rcp.slang.expected.txt new file mode 100644 index 0000000000..9410cd126e --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-rcp.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +100 +50 +33 +25 diff --git a/tests/hlsl-intrinsic/scalar-double-rsqrt.slang b/tests/hlsl-intrinsic/scalar-double-rsqrt.slang new file mode 100644 index 0000000000..ef17263d73 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-rsqrt.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(rsqrt(1.0 + double(i)) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-rsqrt.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-rsqrt.slang.expected.txt new file mode 100644 index 0000000000..5fddbd630c --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-rsqrt.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +100 +70 +57 +50 diff --git a/tests/hlsl-intrinsic/scalar-double-saturate.slang b/tests/hlsl-intrinsic/scalar-double-saturate.slang new file mode 100644 index 0000000000..ac4679f205 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-saturate.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(saturate((double(i) - 1.5) / 2.0) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-saturate.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-saturate.slang.expected.txt new file mode 100644 index 0000000000..e5e38de913 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-saturate.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +0 +25 +75 diff --git a/tests/hlsl-intrinsic/scalar-double-sign.slang b/tests/hlsl-intrinsic/scalar-double-sign.slang new file mode 100644 index 0000000000..7db652fa2d --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-sign.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(sign(double(i) - 1.5) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-sign.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-sign.slang.expected.txt new file mode 100644 index 0000000000..359497898e --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-sign.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +-100 +-100 +100 +100 diff --git a/tests/hlsl-intrinsic/scalar-double-sin.slang b/tests/hlsl-intrinsic/scalar-double-sin.slang new file mode 100644 index 0000000000..d580b1ff16 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-sin.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(sin(double(i)) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-sin.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-sin.slang.expected.txt new file mode 100644 index 0000000000..2d9da37bc8 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-sin.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +84 +90 +14 diff --git a/tests/hlsl-intrinsic/scalar-double-sincos.slang b/tests/hlsl-intrinsic/scalar-double-sincos.slang new file mode 100644 index 0000000000..2afcf8f8b4 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-sincos.slang @@ -0,0 +1,13 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + double s, c; + sincos(double(i), s, c); + outputBuffer[i * 2] = int(s * 100); + outputBuffer[i * 2 + 1] = int(c * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-sincos.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-sincos.slang.expected.txt new file mode 100644 index 0000000000..b854d62093 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-sincos.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +100 +84 +54 diff --git a/tests/hlsl-intrinsic/scalar-double-smoothstep.slang b/tests/hlsl-intrinsic/scalar-double-smoothstep.slang new file mode 100644 index 0000000000..c90d1dcd02 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-smoothstep.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(smoothstep(1.0, 2.0, double(i)) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-smoothstep.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-smoothstep.slang.expected.txt new file mode 100644 index 0000000000..30fafd76e2 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-smoothstep.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +0 +100 +100 diff --git a/tests/hlsl-intrinsic/scalar-double-sqrt.slang b/tests/hlsl-intrinsic/scalar-double-sqrt.slang new file mode 100644 index 0000000000..bff3a3d6f1 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-sqrt.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(sqrt(double(i)) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-sqrt.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-sqrt.slang.expected.txt new file mode 100644 index 0000000000..a95f0d2cad --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-sqrt.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +100 +141 +173 diff --git a/tests/hlsl-intrinsic/scalar-double-step.slang b/tests/hlsl-intrinsic/scalar-double-step.slang new file mode 100644 index 0000000000..b248a1c821 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-step.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(step(1.5, double(i)) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-step.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-step.slang.expected.txt new file mode 100644 index 0000000000..30fafd76e2 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-step.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +0 +100 +100 diff --git a/tests/hlsl-intrinsic/scalar-double-tan.slang b/tests/hlsl-intrinsic/scalar-double-tan.slang new file mode 100644 index 0000000000..5c1c14e567 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-tan.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(tan(double(i)) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-tan.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-tan.slang.expected.txt new file mode 100644 index 0000000000..79085b2c5c --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-tan.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +155 +-218 +-14 diff --git a/tests/hlsl-intrinsic/scalar-double-trunc.slang b/tests/hlsl-intrinsic/scalar-double-trunc.slang new file mode 100644 index 0000000000..6b04bd6a50 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-trunc.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(trunc(double(i) + 0.5) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-trunc.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-trunc.slang.expected.txt new file mode 100644 index 0000000000..4dfaed3077 --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-trunc.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +100 +200 +300 From 28c41c13f3b37a4ddc4afe4197dacc247d47e2ef Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 5 Jul 2024 19:58:06 +0800 Subject: [PATCH 047/137] ci wobble --- .github/workflows/falcor-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/falcor-test.yml b/.github/workflows/falcor-test.yml index f7484d47d8..3944dd15b8 100644 --- a/.github/workflows/falcor-test.yml +++ b/.github/workflows/falcor-test.yml @@ -62,7 +62,7 @@ jobs: cmake --workflow --preset "${{matrix.config}}" - name: Copy Slang to Falcor run: | - cp --recursive --target-directory ./FalcorBin/build/windows-vs2022/bin/Release build/Release/bin/* + cp --verbose --recursive --target-directory ./FalcorBin/build/windows-vs2022/bin/Release build/Release/bin/* - name: falcor-unit-test shell: pwsh run: | From bcf60c7a110e667b763e08bd95823d3ea231be20 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 5 Jul 2024 20:41:17 +0800 Subject: [PATCH 048/137] Correct type for double log10 Fixes https://github.com/shader-slang/slang/issues/4549 --- prelude/slang-cpp-scalar-intrinsics.h | 2 +- tests/hlsl-intrinsic/scalar-double-log10.slang | 10 ++++++++++ .../scalar-double-log10.slang.expected.txt | 5 +++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 tests/hlsl-intrinsic/scalar-double-log10.slang create mode 100644 tests/hlsl-intrinsic/scalar-double-log10.slang.expected.txt diff --git a/prelude/slang-cpp-scalar-intrinsics.h b/prelude/slang-cpp-scalar-intrinsics.h index 8fc90fac8c..55001cb217 100644 --- a/prelude/slang-cpp-scalar-intrinsics.h +++ b/prelude/slang-cpp-scalar-intrinsics.h @@ -266,7 +266,7 @@ double F64_cosh(double f); double F64_tanh(double f); double F64_log2(double f); double F64_log(double f); -double F64_log10(float f); +double F64_log10(double f); double F64_exp2(double f); double F64_exp(double f); double F64_abs(double f); diff --git a/tests/hlsl-intrinsic/scalar-double-log10.slang b/tests/hlsl-intrinsic/scalar-double-log10.slang new file mode 100644 index 0000000000..e68088302f --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-log10.slang @@ -0,0 +1,10 @@ +//TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(in uint i : SV_GroupIndex) +{ + outputBuffer[i] = int(log10(double(i) + 1.0) * 100); +} diff --git a/tests/hlsl-intrinsic/scalar-double-log10.slang.expected.txt b/tests/hlsl-intrinsic/scalar-double-log10.slang.expected.txt new file mode 100644 index 0000000000..318d50830a --- /dev/null +++ b/tests/hlsl-intrinsic/scalar-double-log10.slang.expected.txt @@ -0,0 +1,5 @@ +type: int32_t +0 +30 +47 +60 From 4dfb530f3ff9f8a70fcb9a5c0a5abad03f2b6756 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 5 Jul 2024 21:06:25 +0800 Subject: [PATCH 049/137] remove working test from expected failures --- tests/expected-failure-github.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/expected-failure-github.txt b/tests/expected-failure-github.txt index 200d5a27e2..83d016f304 100644 --- a/tests/expected-failure-github.txt +++ b/tests/expected-failure-github.txt @@ -1,4 +1,3 @@ -tests/cpu-program/gfx-smoke.slang (cpu) tests/language-feature/spirv-asm/imageoperands-warning.slang (vk) tests/language-feature/saturated-cooperation/simple.slang (vk) tests/language-feature/saturated-cooperation/fuse3.slang (vk) From 288df12b537cadaf605e236067d6228c25268145 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 5 Jul 2024 21:06:33 +0800 Subject: [PATCH 050/137] add broken test to expected failures --- tests/expected-failure-github.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/expected-failure-github.txt b/tests/expected-failure-github.txt index 83d016f304..f157d2b9af 100644 --- a/tests/expected-failure-github.txt +++ b/tests/expected-failure-github.txt @@ -5,4 +5,5 @@ tests/language-feature/saturated-cooperation/fuse-product.slang (vk) tests/language-feature/saturated-cooperation/fuse.slang (vk) tests/bugs/byte-address-buffer-interlocked-add-f32.slang (vk) tests/serialization/obfuscated-serialized-module-test.slang.2 syn (mtl) -tests/render/cross-compile-entry-point.slang.2 syn (mtl) \ No newline at end of file +tests/render/cross-compile-entry-point.slang.2 syn (mtl) +tests/bindings/nested-parameter-block-2.slang.3 syn (mtl) From 7db48e89cf4e5b8093e28ca70cbc8f79accfdc8d Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 5 Jul 2024 22:15:37 +0800 Subject: [PATCH 051/137] smaller build for falcor tests --- .github/workflows/falcor-compiler-perf-test.yml | 5 ++++- .github/workflows/falcor-test.yml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/falcor-compiler-perf-test.yml b/.github/workflows/falcor-compiler-perf-test.yml index 412c8e0bc2..92202b23a6 100644 --- a/.github/workflows/falcor-compiler-perf-test.yml +++ b/.github/workflows/falcor-compiler-perf-test.yml @@ -50,7 +50,10 @@ jobs: cmake --preset default --fresh \ -DSLANG_SLANG_LLVM_FLAVOR=USE_SYSTEM_LLVM \ -DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}} \ - -DSLANG_ENABLE_CUDA=1 + -DSLANG_ENABLE_CUDA=1 \ + -DSLANG_ENABLE_EXAMPLES=0 \ + -DSLANG_ENABLE_GFX=0 \ + -DSLANG_ENABLE_TESTS=0 cmake --workflow --preset "${{matrix.config}}" - uses: robinraju/release-downloader@v1.9 diff --git a/.github/workflows/falcor-test.yml b/.github/workflows/falcor-test.yml index 3944dd15b8..18df69dab2 100644 --- a/.github/workflows/falcor-test.yml +++ b/.github/workflows/falcor-test.yml @@ -58,7 +58,10 @@ jobs: cmake --preset default --fresh \ -DSLANG_SLANG_LLVM_FLAVOR=USE_SYSTEM_LLVM \ -DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}} \ - -DSLANG_ENABLE_CUDA=1 + -DSLANG_ENABLE_CUDA=1 \ + -DSLANG_ENABLE_EXAMPLES=0 \ + -DSLANG_ENABLE_GFX=0 \ + -DSLANG_ENABLE_TESTS=0 cmake --workflow --preset "${{matrix.config}}" - name: Copy Slang to Falcor run: | From 2d61ff331723942f5a0c8a31def24bcf5c099d3a Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 5 Jul 2024 22:28:06 +0800 Subject: [PATCH 052/137] ci wobble --- .github/workflows/falcor-compiler-perf-test.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/falcor-compiler-perf-test.yml b/.github/workflows/falcor-compiler-perf-test.yml index 92202b23a6..412c8e0bc2 100644 --- a/.github/workflows/falcor-compiler-perf-test.yml +++ b/.github/workflows/falcor-compiler-perf-test.yml @@ -50,10 +50,7 @@ jobs: cmake --preset default --fresh \ -DSLANG_SLANG_LLVM_FLAVOR=USE_SYSTEM_LLVM \ -DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}} \ - -DSLANG_ENABLE_CUDA=1 \ - -DSLANG_ENABLE_EXAMPLES=0 \ - -DSLANG_ENABLE_GFX=0 \ - -DSLANG_ENABLE_TESTS=0 + -DSLANG_ENABLE_CUDA=1 cmake --workflow --preset "${{matrix.config}}" - uses: robinraju/release-downloader@v1.9 From 3a358ad871e30ad0165fa2d89292004b4a7d3cf4 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 5 Jul 2024 23:40:52 +0800 Subject: [PATCH 053/137] A few exclusions in ci --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 51c2fba88f..f217b687bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: # Exclude invalid or undesired os/compiler - { os: linux, compiler: cl } - { os: macos, compiler: cl } - # - { os: macos, compiler: gcc } + - { os: macos, compiler: gcc } - { os: windows, compiler: gcc } - { os: windows, compiler: clang } # or os/config combinations @@ -29,7 +29,7 @@ jobs: # Default to x64, but aarch64 on osx - { os: linux, platform: aarch64 } - { os: windows, platform: aarch64 } - # - { os: macos, platform: x64 } + - { os: macos, platform: x64 } include: - { os: linux, runs-on: ubuntu-20.04 } - { os: windows, runs-on: windows-latest } From b3c4cbc8a87545aad7561be0b78afa61cf72eaf5 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 5 Jul 2024 23:41:16 +0800 Subject: [PATCH 054/137] wip, release script --- .github/workflows/release-linux.yml | 68 ----------------------- .github/workflows/release.yml | 86 +++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 68 deletions(-) delete mode 100644 .github/workflows/release-linux.yml create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml deleted file mode 100644 index 3c7d1c75e2..0000000000 --- a/.github/workflows/release-linux.yml +++ /dev/null @@ -1,68 +0,0 @@ -on: - push: - # Sequence of patterns matched against refs/tags - tags: - - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 - -name: Linux Release - -jobs: - build: - name: Upload Release Asset - runs-on: ubuntu-20.04 - strategy: - matrix: - configuration: ['release'] - compiler: ['gcc'] - platform: ['x64'] - targetPlatform: ['x64'] - steps: - - name: select gcc 10 - run: | - sudo update-alternatives \ - --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \ - --slave /usr/bin/g++ g++ /usr/bin/g++-10 \ - --slave /usr/bin/gcc-ar gcc-ar /usr/bin/gcc-ar-10 \ - --slave /usr/bin/gcc-nm gcc-nm /usr/bin/gcc-nm-10 \ - --slave /usr/bin/gcc-ranlib gcc-ranlib /usr/bin/gcc-ranlib-10 \ - --slave /usr/bin/gcov gcov /usr/bin/gcov-10 \ - --slave /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-10 \ - --slave /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-10 - - name: Checkout code - uses: actions/checkout@v3 - with: - submodules: 'true' - fetch-depth: '0' - - name: Build release project - id: build - run: | - echo "starting to build..." - export CC=${{matrix.compiler}} - export CONFIGURATION=${{matrix.configuration}} - export ARCH=${{matrix.platform}} - export TARGETARCH=${{matrix.targetPlatform}} - echo "building..." - source ./github_build.sh - echo "creating binary archieves..." - export SLANG_OS_NAME=linux - export SLANG_ARCH_NAME=`uname -p` - export TAG_NAME=`git describe --tags` - export SLANG_TAG=${TAG_NAME#v} - echo "tag:$TAG_NAME" - echo "slang-tag:$SLANG_TAG" - export SLANG_BINARY_ARCHIVE=slang-${SLANG_TAG}-${SLANG_OS_NAME}-${SLANG_ARCH_NAME}.zip - export SLANG_BINARY_ARCHIVE_TAR=slang-${SLANG_TAG}-${SLANG_OS_NAME}-${SLANG_ARCH_NAME}.tar.gz - echo "creating zip" - zip -r ${SLANG_BINARY_ARCHIVE} bin/*/*/slangc bin/*/*/slangd bin/*/*/libslang.so bin/*/*/libslang-glslang.so bin/*/*/libgfx.so bin/*/*/libslang-llvm.so docs/*.md README.md LICENSE slang.h slang-com-helper.h slang-com-ptr.h slang-tag-version.h slang-gfx.h prelude/*.h - echo "creating tar" - tar -czf ${SLANG_BINARY_ARCHIVE_TAR} bin/*/*/slangc bin/*/*/slangd bin/*/*/libslang.so bin/*/*/libslang-glslang.so bin/*/*/libgfx.so bin/*/*/libslang-llvm.so docs/*.md README.md LICENSE slang.h slang-com-helper.h slang-com-ptr.h slang-tag-version.h slang-gfx.h prelude/*.h - echo "SLANG_BINARY_ARCHIVE=${SLANG_BINARY_ARCHIVE}" >> $GITHUB_OUTPUT - echo "SLANG_BINARY_ARCHIVE_TAR=${SLANG_BINARY_ARCHIVE_TAR}" >> $GITHUB_OUTPUT - - name: UploadBinary - uses: softprops/action-gh-release@v1 - with: - files: | - ${{ steps.build.outputs.SLANG_BINARY_ARCHIVE }} - ${{ steps.build.outputs.SLANG_BINARY_ARCHIVE_TAR }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000000..edf2787da1 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,86 @@ +name: Release + +on: + push: + tags: + - 'v*' + +jobs: + build: + strategy: + matrix: + os: [linux, macos, windows] + config: [release] + platform: [x64, aarch64] + test-category: [smoke] + include: + - {os: linux, runs-on: ubuntu-20.04, compiler: gcc} + - {os: windows, runs-on: windows-latest, compiler: cl} + - {os: macos, runs-on: macos-latest, compiler: clang} + fail-fast: false + runs-on: ${{ matrix.runs-on }} + + defaults: + run: + shell: bash + + steps: + - uses: actions/checkout@v3 + with: + submodules: 'true' + fetch-depth: '0' + - name: Setup + uses: ./.github/actions/common-setup + with: + os: ${{matrix.os}} + compiler: ${{matrix.compiler}} + platform: ${{matrix.platform}} + config: ${{matrix.config}} + - name: Build Slang + id: build + run: | + if [[ "${{ matrix.os }}" =~ "windows" && "${{ matrix.config }}" != "release" ]]; then + # Doing a debug build will try to link against a release built llvm, this + # is a problem on Windows, so make slang-llvm in release build and use + # that as though it's a fetched binary via these presets. + cmake --workflow --preset slang-llvm + # Configure, pointing to our just-generated slang-llvm archive + cmake --preset default --fresh \ + -DSLANG_SLANG_LLVM_FLAVOR=FETCH_BINARY \ + -DSLANG_SLANG_LLVM_BINARY_URL=$(pwd)/build/dist-release/slang-slang-llvm.zip \ + -DSLANG_ENABLE_EXAMPLES=OFF \ + -DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}} + cmake --workflow --preset "${{matrix.config}}" + else + # Otherwise, use the system llvm we have just build or got from the + # cache in the setup phase + cmake --preset default --fresh \ + -DSLANG_SLANG_LLVM_FLAVOR=USE_SYSTEM_LLVM \ + -DSLANG_ENABLE_EXAMPLES=OFF \ + -DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}} + cmake --workflow --preset "${{matrix.config}}" + fi + + # For the release, also generate a tar.gz file + cpack --preset release -G TGZ + + triggering_ref=${{ github.ref_name }} + version=${triggering_ref#v} + os_name=${{ matrix.os }} + arch_name=${{ matrix.platform }} + arch_name=${arch_name/x64/x86_64} + base=$(pwd)/slang-${version}-${os_name}-${arch_name} + + mv "$(pwd)/build/dist-${config}/slang.zip" "${base}.zip" + echo "SLANG_BINARY_ARCHIVE_ZIP=${base}.zip" >> $GITHUB_OUTPUT + + mv "$(pwd)/build/dist-${config}/slang.tar.gz" "${base}.tar.gz" + echo "SLANG_BINARY_ARCHIVE_TAR=${base}.tar.gz" >> $GITHUB_OUTPUT + - name: UploadBinary + uses: softprops/action-gh-release@v1 + with: + files: | + ${{ steps.build.outputs.SLANG_BINARY_ARCHIVE_ZIP }} + ${{ steps.build.outputs.SLANG_BINARY_ARCHIVE_TAR }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 89fc36fa531a6f93f9b89da4fa52d7801e66a554 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 5 Jul 2024 23:50:59 +0800 Subject: [PATCH 055/137] Enable examples in ci --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f217b687bc..1b20625099 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,7 +90,6 @@ jobs: cmake --preset default --fresh \ -DSLANG_SLANG_LLVM_FLAVOR=FETCH_BINARY \ -DSLANG_SLANG_LLVM_BINARY_URL=$(pwd)/build/dist-release/slang-slang-llvm.zip \ - -DSLANG_ENABLE_EXAMPLES=OFF \ -DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}} cmake --workflow --preset "${{matrix.config}}" else @@ -98,7 +97,6 @@ jobs: # cache in the setup phase cmake --preset default --fresh \ -DSLANG_SLANG_LLVM_FLAVOR=USE_SYSTEM_LLVM \ - -DSLANG_ENABLE_EXAMPLES=OFF \ -DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}} cmake --workflow --preset "${{matrix.config}}" fi From 8e543347306b0469ce9f7f17dd9df35be2a14e79 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 13:31:11 +0800 Subject: [PATCH 056/137] neaten release script --- .github/workflows/release.yml | 43 ++++++++++++++++------------------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index edf2787da1..c34ff0a2e7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,32 +37,27 @@ jobs: platform: ${{matrix.platform}} config: ${{matrix.config}} - name: Build Slang - id: build run: | if [[ "${{ matrix.os }}" =~ "windows" && "${{ matrix.config }}" != "release" ]]; then - # Doing a debug build will try to link against a release built llvm, this - # is a problem on Windows, so make slang-llvm in release build and use - # that as though it's a fetched binary via these presets. - cmake --workflow --preset slang-llvm - # Configure, pointing to our just-generated slang-llvm archive - cmake --preset default --fresh \ - -DSLANG_SLANG_LLVM_FLAVOR=FETCH_BINARY \ - -DSLANG_SLANG_LLVM_BINARY_URL=$(pwd)/build/dist-release/slang-slang-llvm.zip \ - -DSLANG_ENABLE_EXAMPLES=OFF \ - -DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}} - cmake --workflow --preset "${{matrix.config}}" - else - # Otherwise, use the system llvm we have just build or got from the - # cache in the setup phase - cmake --preset default --fresh \ - -DSLANG_SLANG_LLVM_FLAVOR=USE_SYSTEM_LLVM \ - -DSLANG_ENABLE_EXAMPLES=OFF \ - -DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}} - cmake --workflow --preset "${{matrix.config}}" - fi + echo "Please see ci.yml for the steps to make debug builds work on Windows" &>2 + exit 1 + endif + cmake --workflow --preset generators --fresh + mkdir build-platform-generators + cmake --install build --config Release --component generators --prefix build-platform-generators + + cmake --preset default --fresh \ + -DSLANG_GENERATORS_PATH=build-platform-generators/bin \ + -DCMAKE_TOOLCHAIN_FILE=cmake/TC-linux-aarch64.cmake \ + -DSLANG_ENABLE_EXAMPLES=OFF + cmake --workflow --preset "${{matrix.config}}" + + - name: Package Slang + id: package + run: | # For the release, also generate a tar.gz file - cpack --preset release -G TGZ + cpack --preset release -G TGZ triggering_ref=${{ github.ref_name }} version=${triggering_ref#v} @@ -80,7 +75,7 @@ jobs: uses: softprops/action-gh-release@v1 with: files: | - ${{ steps.build.outputs.SLANG_BINARY_ARCHIVE_ZIP }} - ${{ steps.build.outputs.SLANG_BINARY_ARCHIVE_TAR }} + ${{ steps.package.outputs.SLANG_BINARY_ARCHIVE_ZIP }} + ${{ steps.package.outputs.SLANG_BINARY_ARCHIVE_TAR }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From e23553eda036d59a66bafe62d63262eab85ac0d9 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 13:31:43 +0800 Subject: [PATCH 057/137] Correct building docs --- docs/building.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/building.md b/docs/building.md index b21aa21ebe..767c9a3ca3 100644 --- a/docs/building.md +++ b/docs/building.md @@ -138,10 +138,10 @@ pass the install path to the cross building CMake invocation using # build the generators cmake --workflow --preset generators --fresh mkdir my-build-platform-generators -unzip build/dist-release/slang-generators.zip -d my-build-platform-generators +cmake --install build --config Release --component generators --prefix my-build-platform-generators # reconfigure, pointing to these generators cmake \ - --preset release \ + --preset default \ --fresh \ -DSLANG_GENERATORS_PATH=my-build-platform-generators/bin \ -Dwhatever-other-necessary-options-for-your-cross-build From eed8970c973e347a1165ce21e0bcf4b06c0b3dc8 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 13:32:04 +0800 Subject: [PATCH 058/137] Only use xlib vulkan when slang_enable_xlib is true --- tools/gfx/vulkan/vk-module.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/gfx/vulkan/vk-module.h b/tools/gfx/vulkan/vk-module.h index 4677bbe507..062c953f64 100644 --- a/tools/gfx/vulkan/vk-module.h +++ b/tools/gfx/vulkan/vk-module.h @@ -10,7 +10,9 @@ #elif SLANG_APPLE_FAMILY # define VK_USE_PLATFORM_METAL_EXT 1 #else -# define VK_USE_PLATFORM_XLIB_KHR 1 +# if SLANG_ENABLE_XLIB +# define VK_USE_PLATFORM_XLIB_KHR 1 +# endif #endif #define VK_NO_PROTOTYPES From 1176d6755a6a2573ec42c8ce7a2ec912142377c7 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Sat, 6 Jul 2024 13:44:53 +0800 Subject: [PATCH 059/137] bump slang-llvm version --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b39b9b5aac..57c910161e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,11 +135,11 @@ macro(slang_llvm_binary_url_option version filename) ) endmacro() if(CMAKE_SYSTEM_NAME MATCHES "Windows") - slang_llvm_binary_url_option("v13.x-42" "slang-llvm-13.x-42-win64.zip") + slang_llvm_binary_url_option("v13.x-43" "slang-llvm-13.x-42-win64.zip") elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin") - slang_llvm_binary_url_option("v13.x-42" "slang-llvm-v13.x-42-macosx-x86_64-release.zip") + slang_llvm_binary_url_option("v13.x-43" "slang-llvm-v13.x-42-macosx-x86_64-release.zip") else() - slang_llvm_binary_url_option("v13.x-42" "slang-llvm-v13.x-42-linux-x86_64-release.zip") + slang_llvm_binary_url_option("v13.x-43" "slang-llvm-v13.x-42-linux-x86_64-release.zip") endif() # From bed77d78dc94287538ca1143f475dea945bcf3ee Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 13:53:03 +0800 Subject: [PATCH 060/137] Remove toolchain file use --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c34ff0a2e7..900cc8271c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,7 +49,6 @@ jobs: cmake --preset default --fresh \ -DSLANG_GENERATORS_PATH=build-platform-generators/bin \ - -DCMAKE_TOOLCHAIN_FILE=cmake/TC-linux-aarch64.cmake \ -DSLANG_ENABLE_EXAMPLES=OFF cmake --workflow --preset "${{matrix.config}}" From 9a7087537d3afd4d8c21852a743ce6c2bc24a284 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 13:53:38 +0800 Subject: [PATCH 061/137] Bump slang-llvm preset version --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 57c910161e..a5cbd42186 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,11 +135,11 @@ macro(slang_llvm_binary_url_option version filename) ) endmacro() if(CMAKE_SYSTEM_NAME MATCHES "Windows") - slang_llvm_binary_url_option("v13.x-43" "slang-llvm-13.x-42-win64.zip") + slang_llvm_binary_url_option("v13.x-43" "slang-llvm-13.x-43-win64.zip") elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin") - slang_llvm_binary_url_option("v13.x-43" "slang-llvm-v13.x-42-macosx-x86_64-release.zip") + slang_llvm_binary_url_option("v13.x-43" "slang-llvm-v13.x-43-macosx-x86_64-release.zip") else() - slang_llvm_binary_url_option("v13.x-43" "slang-llvm-v13.x-42-linux-x86_64-release.zip") + slang_llvm_binary_url_option("v13.x-43" "slang-llvm-v13.x-43-linux-x86_64-release.zip") endif() # From 84953c79cef79bff1bdfcd27ccb834267744d831 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 13:53:51 +0800 Subject: [PATCH 062/137] slash direction --- docs/building.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/building.md b/docs/building.md index 767c9a3ca3..c2492330ed 100644 --- a/docs/building.md +++ b/docs/building.md @@ -41,7 +41,7 @@ cmake --build --preset release # or --preset debug For Visual Studio run: ```bash cmake --preset vs2022 # or --preset vs2019 -start devenv .\build\slang.sln # to optionally open the project in Visual Studio +start devenv ./build/slang.sln # to optionally open the project in Visual Studio cmake --build --preset release # to build from the CLI ``` From 89ff38eea63b46183c3018fd9958ccbc645ef131 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 13:56:19 +0800 Subject: [PATCH 063/137] Improve build directions --- docs/building.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/building.md b/docs/building.md index c2492330ed..54e039136b 100644 --- a/docs/building.md +++ b/docs/building.md @@ -138,8 +138,9 @@ pass the install path to the cross building CMake invocation using # build the generators cmake --workflow --preset generators --fresh mkdir my-build-platform-generators -cmake --install build --config Release --component generators --prefix my-build-platform-generators +cmake --install build --config Release --prefix my-build-platform-generators --component generators # reconfigure, pointing to these generators +# Here is also where you should set up any cross compiling environment cmake \ --preset default \ --fresh \ From 3a7a3ee97cf16708821cf404f00d412593c2a4a0 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 13:56:34 +0800 Subject: [PATCH 064/137] Add msvc cross build documentation --- docs/building.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/docs/building.md b/docs/building.md index 54e039136b..aba486a4e4 100644 --- a/docs/building.md +++ b/docs/building.md @@ -150,3 +150,29 @@ cmake \ cmake --workflow --preset release ``` +### Example cross compiling with MSVC to windows-aarch64 + +One option is to build using the ninja generator, which requires providing the +native and cross environments via `vcvarsall.bat` + +```bash +vcvarsall.bat +cmake --workflow --preset generators --fresh +mkdir generators +cmake --install build --prefix generators --component generators +vsvarsall.bat x64_arm64 +cmake --preset default --fresh -DSLANG_GENERATORS_PATH=generators/bin +cmake --workflow --preset release +``` + +Another option is to build using the Visual Studio generator which can find +this automatically + +``` +cmake --preset vs2022 # or --preset vs2019 +cmake --build --preset generators # to build from the CLI +cmake --install build --prefix generators --component generators +rm -rf build # The Visual Studio generator will complain if this is left over from a previous build +cmake --preset vs2022 --fresh -A arm64 -DSLANG_GENERATORS_PATH=generators/bin +cmake --build --preset release +``` From d5673f121312e94c9226052303acfd8ee0b15a54 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 13:58:22 +0800 Subject: [PATCH 065/137] Disable old release files --- .github/workflows/release-linux-arm64.yml | 5 ----- .github/workflows/release-linux-glibc-2-17.yml | 5 ----- .github/workflows/release-macos.yml | 5 ----- .github/workflows/release-windows.yml | 5 ----- 4 files changed, 20 deletions(-) diff --git a/.github/workflows/release-linux-arm64.yml b/.github/workflows/release-linux-arm64.yml index aa7b8f832d..380aa7b267 100644 --- a/.github/workflows/release-linux-arm64.yml +++ b/.github/workflows/release-linux-arm64.yml @@ -1,8 +1,3 @@ -on: - push: - # Sequence of patterns matched against refs/tags - tags: - - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 name: Linux ARM64 Release diff --git a/.github/workflows/release-linux-glibc-2-17.yml b/.github/workflows/release-linux-glibc-2-17.yml index 128a13d45a..8fd4023b7e 100644 --- a/.github/workflows/release-linux-glibc-2-17.yml +++ b/.github/workflows/release-linux-glibc-2-17.yml @@ -1,8 +1,3 @@ -on: - push: - # Sequence of patterns matched against refs/tags - tags: - - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 name: centos7-gcc9 Release jobs: diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index 9df540007d..2d998a7a4e 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -1,8 +1,3 @@ -on: - push: - # Sequence of patterns matched against refs/tags - tags: - - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 name: MacOS Release diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index f4cacd873e..424dc9a4ac 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -1,8 +1,3 @@ -on: - push: - # Sequence of patterns matched against refs/tags - tags: - - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 name: Windows Release From 3d5cc60efe9d149f53695a213b9c563faaacf50a Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 14:04:12 +0800 Subject: [PATCH 066/137] Smaller set of releases for test --- .github/workflows/release.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 900cc8271c..95acbd0c9d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,14 +9,17 @@ jobs: build: strategy: matrix: - os: [linux, macos, windows] - config: [release] - platform: [x64, aarch64] - test-category: [smoke] include: - - {os: linux, runs-on: ubuntu-20.04, compiler: gcc} - - {os: windows, runs-on: windows-latest, compiler: cl} - - {os: macos, runs-on: macos-latest, compiler: clang} + - {os: linux, config: release, platform: aarch64, test-category: smoke, runs-on: ubuntu-20.04, compiler: gcc, build-slang-llvm: false} + # os: [linux, macos, windows] + # config: [release] + # platform: [x64, aarch64] + # test-category: [smoke] + # include: + # - {os: linux, runs-on: ubuntu-20.04, compiler: gcc} + # - {os: windows, runs-on: windows-latest, compiler: cl} + # - {os: macos, runs-on: macos-latest, compiler: clang} + # - {platform: aarch64, build-slang-llvm: false} fail-fast: false runs-on: ${{ matrix.runs-on }} From 1ba28879197372aebcae02a4b35f4fb7b1b1d09d Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 14:21:24 +0800 Subject: [PATCH 067/137] Allow not building llvm --- .github/actions/common-setup/action.yml | 13 +++++++++---- .github/workflows/release.yml | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index 87c49105b2..83bace827c 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -11,6 +11,8 @@ inputs: required: true config: required: true + build-llvm: + required: true runs: using: composite steps: @@ -60,16 +62,17 @@ runs: # Try to restore a LLVM install, and build it otherwise - uses: actions/cache/restore@v3 id: cache-llvm + if: inputs.build-llvm == 'true' with: path: ${{ github.workspace }}/build/llvm-project-install # Use os*compiler*platform in lieu of an ABI key here, which is what we really want key: llvm-${{ inputs.os }}-${{ inputs.compiler }}-${{ inputs.platform }}-${{ hashFiles('external/build-llvm.sh') }} - name: Build LLVM - if: steps.cache-llvm.outputs.cache-hit != 'true' + if: inputs.build-llvm == 'true' && steps.cache-llvm.outputs.cache-hit != 'true' shell: bash run: ./external/build-llvm.sh --install-prefix "${{ github.workspace }}/build/llvm-project-install" - uses: actions/cache/save@v3 - if: steps.cache-llvm.outputs.cache-hit != 'true' + if: inputs.build-llvm == 'true' && steps.cache-llvm.outputs.cache-hit != 'true' with: path: ${{ github.workspace }}/build/llvm-project-install key: ${{ steps.cache-llvm.outputs.cache-primary-key }} @@ -89,8 +92,10 @@ runs: - name: Set environment variable for CMake shell: bash run: | - echo "LLVM_DIR=${{ github.workspace }}/build/llvm-project-install" >> "$GITHUB_ENV" - echo "Clang_DIR=${{ github.workspace }}/build/llvm-project-install" >> "$GITHUB_ENV" + if [ "${{inputs.build-llvm}}" == "true" ]; then + echo "LLVM_DIR=${{ github.workspace }}/build/llvm-project-install" >> "$GITHUB_ENV" + echo "Clang_DIR=${{ github.workspace }}/build/llvm-project-install" >> "$GITHUB_ENV" + fi # Set CMake to use sccache if it's available if command -v sccache; then diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 95acbd0c9d..dfd5a9b58e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,6 +39,7 @@ jobs: compiler: ${{matrix.compiler}} platform: ${{matrix.platform}} config: ${{matrix.config}} + build-llvm: ${{matrix.build-slang-llvm}} - name: Build Slang run: | if [[ "${{ matrix.os }}" =~ "windows" && "${{ matrix.config }}" != "release" ]]; then From 86640dc2458dcb498361e8b2abe6b9a129b3656c Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 14:21:37 +0800 Subject: [PATCH 068/137] simplify release matrix --- .github/workflows/release.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dfd5a9b58e..d3fe007f56 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,17 +9,17 @@ jobs: build: strategy: matrix: + os: [linux, macos, windows] + config: [release] + platform: [x64, aarch64] + test-category: [smoke] include: - - {os: linux, config: release, platform: aarch64, test-category: smoke, runs-on: ubuntu-20.04, compiler: gcc, build-slang-llvm: false} - # os: [linux, macos, windows] - # config: [release] - # platform: [x64, aarch64] - # test-category: [smoke] - # include: - # - {os: linux, runs-on: ubuntu-20.04, compiler: gcc} - # - {os: windows, runs-on: windows-latest, compiler: cl} - # - {os: macos, runs-on: macos-latest, compiler: clang} - # - {platform: aarch64, build-slang-llvm: false} + - {os: linux, runs-on: ubuntu-20.04, compiler: gcc} + - {os: windows, runs-on: windows-latest, compiler: cl} + - {os: macos, runs-on: macos-latest, compiler: clang} + # - {platform: aarch64, build-slang-llvm: false} + # - {platform: aarch64, build-slang-llvm: false} + - {build-slang-llvm: false} fail-fast: false runs-on: ${{ matrix.runs-on }} From 425da9b420484ed3ad1d4cffb978110f6882ae02 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 15:10:54 +0800 Subject: [PATCH 069/137] Cross releases --- .github/workflows/release.yml | 53 +++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d3fe007f56..f214063c87 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,6 +40,23 @@ jobs: platform: ${{matrix.platform}} config: ${{matrix.config}} build-llvm: ${{matrix.build-slang-llvm}} + + - name: Build slang generators + run: | + cmake --workflow --preset generators --fresh + mkdir build-platform-generators + cmake --install build --config Release --component generators --prefix build-platform-generators + + - name: Change dev tools to host arch + uses: ilammy/msvc-dev-cmd@v1 + with: + arch: ${{matrix.platform == 'aarch64' && 'amd64_arm64' || 'amd64'}} + + - name: Install cross tools on Ubuntu + if: ${{matrix.runs-on == 'ubuntu-20.04' && matrix.platform == 'aarch64'}} + run: | + apt-get install -y crossbuild-essential-arm64 + - name: Build Slang run: | if [[ "${{ matrix.os }}" =~ "windows" && "${{ matrix.config }}" != "release" ]]; then @@ -47,15 +64,39 @@ jobs: exit 1 endif - cmake --workflow --preset generators --fresh - mkdir build-platform-generators - cmake --install build --config Release --component generators --prefix build-platform-generators + config(){ + cmake --preset default --fresh \ + -DSLANG_GENERATORS_PATH=build-platform-generators/bin \ + -DSLANG_ENABLE_EXAMPLES=OFF \ + -DSLANG_SLANG_LLVM_FLAVOR=DISABLE \ + "$@" + } + + case "${{inputs.os}}" in + linux*) config \ + if [ "${{matrix.platform}}" == "aarch64" ]; then + config \ + -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc \ + -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ + else + config + fi + windows*) + config + macos*) + if [ "${{matrix.platform}}" == "aarch64" ]; then + config -DCMAKE_OSX_ARCHITECTURES=arm64 + else + config -DCMAKE_OSX_ARCHITECTURES=x86_64 + fi + esac - cmake --preset default --fresh \ - -DSLANG_GENERATORS_PATH=build-platform-generators/bin \ - -DSLANG_ENABLE_EXAMPLES=OFF cmake --workflow --preset "${{matrix.config}}" + - name: File check + run: | + find build/dist-release ! -iname '*.md' ! -iname '*.h' -type f | xargs file + - name: Package Slang id: package run: | From 87831c9e6f94a8faa423e0e04618294281ca26c5 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 15:17:02 +0800 Subject: [PATCH 070/137] formatting --- .github/workflows/release.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f214063c87..7a0f9f1c12 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -81,10 +81,8 @@ jobs: else config fi - windows*) - config - macos*) - if [ "${{matrix.platform}}" == "aarch64" ]; then + windows*) config + macos*) if [ "${{matrix.platform}}" == "aarch64" ]; then config -DCMAKE_OSX_ARCHITECTURES=arm64 else config -DCMAKE_OSX_ARCHITECTURES=x86_64 From d366cd91810d94fe72a7e58fce8f46ad9785998a Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 15:20:21 +0800 Subject: [PATCH 071/137] formatting --- .github/workflows/release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7a0f9f1c12..2dfd19324f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -73,8 +73,7 @@ jobs: } case "${{inputs.os}}" in - linux*) config \ - if [ "${{matrix.platform}}" == "aarch64" ]; then + linux*) if [ "${{matrix.platform}}" == "aarch64" ]; then config \ -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc \ -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ From 1857d9da00220dbc8f4980c4cf175724bc3532b3 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 15:20:58 +0800 Subject: [PATCH 072/137] ci wiggle --- .github/workflows/release.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2dfd19324f..304ae9e608 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -55,7 +55,7 @@ jobs: - name: Install cross tools on Ubuntu if: ${{matrix.runs-on == 'ubuntu-20.04' && matrix.platform == 'aarch64'}} run: | - apt-get install -y crossbuild-essential-arm64 + sudo apt-get install -y crossbuild-essential-arm64 - name: Build Slang run: | @@ -80,12 +80,14 @@ jobs: else config fi - windows*) config + ;; + windows*) config;; macos*) if [ "${{matrix.platform}}" == "aarch64" ]; then config -DCMAKE_OSX_ARCHITECTURES=arm64 else config -DCMAKE_OSX_ARCHITECTURES=x86_64 fi + ;; esac cmake --workflow --preset "${{matrix.config}}" From 875940755c118c75549b2ca00221f91b074843b3 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 15:29:49 +0800 Subject: [PATCH 073/137] ci wiggle --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 304ae9e608..ec0009464c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,10 +59,10 @@ jobs: - name: Build Slang run: | - if [[ "${{ matrix.os }}" =~ "windows" && "${{ matrix.config }}" != "release" ]]; then - echo "Please see ci.yml for the steps to make debug builds work on Windows" &>2 - exit 1 - endif + if [[ "${{ matrix.os }}" == "windows" && "${{ matrix.config }}" != "release" ]]; then + echo "Please see ci.yml for the steps to make debug builds work on Windows" >&2 + exit 1 + fi config(){ cmake --preset default --fresh \ From 87a96172fd9670de00df4fd49340de2cf83f1f6f Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 16:00:37 +0800 Subject: [PATCH 074/137] cleaner --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ec0009464c..31f4e6e1ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,6 +46,7 @@ jobs: cmake --workflow --preset generators --fresh mkdir build-platform-generators cmake --install build --config Release --component generators --prefix build-platform-generators + rm -rf build - name: Change dev tools to host arch uses: ilammy/msvc-dev-cmd@v1 From b205fafeaa5e05516907938a83ad5030196351f7 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 17:15:03 +0800 Subject: [PATCH 075/137] neaten --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 31f4e6e1ee..6b7da7a5eb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -74,7 +74,7 @@ jobs: } case "${{inputs.os}}" in - linux*) if [ "${{matrix.platform}}" == "aarch64" ]; then + linux*) if [ "${{matrix.platform}}" = "aarch64" ]; then config \ -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc \ -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ @@ -83,7 +83,7 @@ jobs: fi ;; windows*) config;; - macos*) if [ "${{matrix.platform}}" == "aarch64" ]; then + macos*) if [ "${{matrix.platform}}" = "aarch64" ]; then config -DCMAKE_OSX_ARCHITECTURES=arm64 else config -DCMAKE_OSX_ARCHITECTURES=x86_64 From fa6ad76eef1dbfe15a02d235b7540293664fa272 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 17:23:53 +0800 Subject: [PATCH 076/137] ci wobble --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6b7da7a5eb..4751ae2035 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -73,7 +73,7 @@ jobs: "$@" } - case "${{inputs.os}}" in + case "${{ matrix.os }}" in linux*) if [ "${{matrix.platform}}" = "aarch64" ]; then config \ -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc \ From 12812534ad796f21c301d60577ef58a937dffc2d Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 17:31:40 +0800 Subject: [PATCH 077/137] formatting --- .github/actions/common-setup/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index 83bace827c..a177c90717 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -18,6 +18,7 @@ runs: steps: - name: Set up MSVC dev tools on Windows uses: ilammy/msvc-dev-cmd@v1 + - shell: bash run: | # Set up system dependencies From d4b0533b8f6f81252a59aaeb2103c0e64e6964e2 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 17:31:56 +0800 Subject: [PATCH 078/137] Install cross tools on linux --- .github/actions/common-setup/action.yml | 5 +++++ .github/workflows/release.yml | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index a177c90717..d1b2039d86 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -32,6 +32,11 @@ runs: esac fi + # Install cross tools on Ubuntu + if [[ "${{inputs.os}}" == "linux" && "${{inputs.platform}}" == "aarch64" ]]; then + sudo apt-get install -y crossbuild-essential-arm64 + fi + # Set compiler CC=${{inputs.compiler}} CXX=${{inputs.compiler}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4751ae2035..8a512594de 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,11 +53,6 @@ jobs: with: arch: ${{matrix.platform == 'aarch64' && 'amd64_arm64' || 'amd64'}} - - name: Install cross tools on Ubuntu - if: ${{matrix.runs-on == 'ubuntu-20.04' && matrix.platform == 'aarch64'}} - run: | - sudo apt-get install -y crossbuild-essential-arm64 - - name: Build Slang run: | if [[ "${{ matrix.os }}" == "windows" && "${{ matrix.config }}" != "release" ]]; then From e0e6b880c42e439e400c5f3d33e6569fdcc6fdb8 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 17:32:21 +0800 Subject: [PATCH 079/137] do not clean build dir --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8a512594de..b00b258b04 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,7 +46,6 @@ jobs: cmake --workflow --preset generators --fresh mkdir build-platform-generators cmake --install build --config Release --component generators --prefix build-platform-generators - rm -rf build - name: Change dev tools to host arch uses: ilammy/msvc-dev-cmd@v1 From 4e9b4fd3115ceb6c3207f7d9d583f82f1cd3753c Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 17:38:03 +0800 Subject: [PATCH 080/137] neaten ci --- .github/workflows/release.yml | 38 ++++++++++++++++------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b00b258b04..602fdbe457 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,32 +59,28 @@ jobs: exit 1 fi - config(){ - cmake --preset default --fresh \ - -DSLANG_GENERATORS_PATH=build-platform-generators/bin \ - -DSLANG_ENABLE_EXAMPLES=OFF \ - -DSLANG_SLANG_LLVM_FLAVOR=DISABLE \ - "$@" - } - case "${{ matrix.os }}" in - linux*) if [ "${{matrix.platform}}" = "aarch64" ]; then - config \ - -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc \ - -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ - else - config - fi - ;; - windows*) config;; - macos*) if [ "${{matrix.platform}}" = "aarch64" ]; then - config -DCMAKE_OSX_ARCHITECTURES=arm64 - else - config -DCMAKE_OSX_ARCHITECTURES=x86_64 + linux*) + if [ "${{matrix.platform}}" = "aarch64" ]; then + export CC=aarch64-linux-gnu-gcc + export CXX=aarch64-linux-gnu-g++ fi ;; esac + if [ "${{matrix.platform}}" = "aarch64" ]; then + export OSX_ARCH="-DCMAKE_OSX_ARCHITECTURES=arm64" + else + export OSX_ARCH="-DCMAKE_OSX_ARCHITECTURES=x86_64" + fi + + cmake --preset default --fresh \ + -DSLANG_GENERATORS_PATH=build-platform-generators/bin \ + -DSLANG_ENABLE_EXAMPLES=OFF \ + -DSLANG_SLANG_LLVM_FLAVOR=DISABLE \ + $OSX_ARCH \ + "$@" + cmake --workflow --preset "${{matrix.config}}" - name: File check From 7ae5b0776bc536ce4fc695c996b213853baba2f8 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 17:39:24 +0800 Subject: [PATCH 081/137] neaten ci --- .github/workflows/release.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 602fdbe457..fb6a738be4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,14 +59,10 @@ jobs: exit 1 fi - case "${{ matrix.os }}" in - linux*) - if [ "${{matrix.platform}}" = "aarch64" ]; then - export CC=aarch64-linux-gnu-gcc - export CXX=aarch64-linux-gnu-g++ - fi - ;; - esac + if [[ "${{matrix.os}}" == "linux" && "${{matrix.platform}}" == "aarch64" ]]; then + export CC=aarch64-linux-gnu-gcc + export CXX=aarch64-linux-gnu-g++ + fi if [ "${{matrix.platform}}" = "aarch64" ]; then export OSX_ARCH="-DCMAKE_OSX_ARCHITECTURES=arm64" From 2521e4b3ac6d0c67567a1b70826ec7f6895247c2 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 17:50:11 +0800 Subject: [PATCH 082/137] neaten ci --- .github/workflows/release.yml | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fb6a738be4..74f943ef7f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,35 +47,38 @@ jobs: mkdir build-platform-generators cmake --install build --config Release --component generators --prefix build-platform-generators - - name: Change dev tools to host arch + - name: Change dev tools to host arch (windows) uses: ilammy/msvc-dev-cmd@v1 with: arch: ${{matrix.platform == 'aarch64' && 'amd64_arm64' || 'amd64'}} - - name: Build Slang + - name: Change dev tools to host arch run: | - if [[ "${{ matrix.os }}" == "windows" && "${{ matrix.config }}" != "release" ]]; then - echo "Please see ci.yml for the steps to make debug builds work on Windows" >&2 - exit 1 - fi - if [[ "${{matrix.os}}" == "linux" && "${{matrix.platform}}" == "aarch64" ]]; then export CC=aarch64-linux-gnu-gcc export CXX=aarch64-linux-gnu-g++ fi - if [ "${{matrix.platform}}" = "aarch64" ]; then - export OSX_ARCH="-DCMAKE_OSX_ARCHITECTURES=arm64" - else - export OSX_ARCH="-DCMAKE_OSX_ARCHITECTURES=x86_64" + export CMAKE_OSX_ARCHITECTURES="-DCMAKE_OSX_ARCHITECTURES=arm64" + else if [ "${{matrix.platform}}" = "x64" ]; then + export CMAKE_OSX_ARCHITECTURES="-DCMAKE_OSX_ARCHITECTURES=x86_64" + fi + + echo "CC=$CC" >> "$GITHUB_ENV" + echo "CXX=$CXX" >> "$GITHUB_ENV" + echo "CMAKE_OSX_ARCHITECTURES=$CMAKE_OSX_ARCHITECTURES" >> "$GITHUB_ENV" + + - name: Build Slang + run: | + if [[ "${{ matrix.os }}" == "windows" && "${{ matrix.config }}" != "release" ]]; then + echo "Please see ci.yml for the steps to make debug builds work on Windows" >&2 + exit 1 fi cmake --preset default --fresh \ -DSLANG_GENERATORS_PATH=build-platform-generators/bin \ -DSLANG_ENABLE_EXAMPLES=OFF \ - -DSLANG_SLANG_LLVM_FLAVOR=DISABLE \ - $OSX_ARCH \ - "$@" + -DSLANG_SLANG_LLVM_FLAVOR=DISABLE cmake --workflow --preset "${{matrix.config}}" From 0127cf66013a41485c668f5bea4d9e2b711903e2 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 22:17:00 +0800 Subject: [PATCH 083/137] remove unused release workflow files --- .github/workflows/release-linux-arm64.yml | 51 --------- .github/workflows/release-macos.yml | 127 ---------------------- .github/workflows/release-windows.yml | 111 ------------------- 3 files changed, 289 deletions(-) delete mode 100644 .github/workflows/release-linux-arm64.yml delete mode 100644 .github/workflows/release-macos.yml delete mode 100644 .github/workflows/release-windows.yml diff --git a/.github/workflows/release-linux-arm64.yml b/.github/workflows/release-linux-arm64.yml deleted file mode 100644 index 380aa7b267..0000000000 --- a/.github/workflows/release-linux-arm64.yml +++ /dev/null @@ -1,51 +0,0 @@ - -name: Linux ARM64 Release - -jobs: - build: - name: Upload Release Asset - runs-on: ['self-hosted', 'Linux', 'ARM64'] - strategy: - matrix: - configuration: ['release'] - compiler: ['gcc'] - platform: ['aarch64'] - targetPlatform: ['aarch64'] - steps: - - uses: actions/checkout@v3 - with: - submodules: 'true' - fetch-depth: '0' - - name: Build release project - id: build - run: | - echo "starting to build..." - export CC=${{matrix.compiler}} - export CONFIGURATION=${{matrix.configuration}} - export ARCH=${{matrix.platform}} - export TARGETARCH=${{matrix.targetPlatform}} - echo "building..." - source ./github_build.sh - echo "creating binary archieves..." - export SLANG_OS_NAME=linux - export SLANG_ARCH_NAME=`uname -p` - export TAG_NAME=`git describe --tags` - export SLANG_TAG=${TAG_NAME#v} - echo "tag:$TAG_NAME" - echo "slang-tag:$SLANG_TAG" - export SLANG_BINARY_ARCHIVE=slang-${SLANG_TAG}-${SLANG_OS_NAME}-${SLANG_ARCH_NAME}.zip - export SLANG_BINARY_ARCHIVE_TAR=slang-${SLANG_TAG}-${SLANG_OS_NAME}-${SLANG_ARCH_NAME}.tar.gz - echo "creating zip" - zip -r ${SLANG_BINARY_ARCHIVE} bin/*/*/slangc bin/*/*/slangd bin/*/*/libslang.so bin/*/*/libslang-glslang.so bin/*/*/libgfx.so docs/*.md README.md LICENSE slang.h slang-com-helper.h slang-com-ptr.h slang-tag-version.h slang-gfx.h prelude/*.h - echo "creating tar" - tar -czf ${SLANG_BINARY_ARCHIVE_TAR} bin/*/*/slangc bin/*/*/slangd bin/*/*/libslang.so bin/*/*/libslang-glslang.so bin/*/*/libgfx.so docs/*.md README.md LICENSE slang.h slang-com-helper.h slang-com-ptr.h slang-tag-version.h slang-gfx.h prelude/*.h - echo "SLANG_BINARY_ARCHIVE=${SLANG_BINARY_ARCHIVE}" >> $GITHUB_OUTPUT - echo "SLANG_BINARY_ARCHIVE_TAR=${SLANG_BINARY_ARCHIVE_TAR}" >> $GITHUB_OUTPUT - - name: UploadBinary - uses: softprops/action-gh-release@v1 - with: - files: | - ${{ steps.build.outputs.SLANG_BINARY_ARCHIVE }} - ${{ steps.build.outputs.SLANG_BINARY_ARCHIVE_TAR }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml deleted file mode 100644 index 2d998a7a4e..0000000000 --- a/.github/workflows/release-macos.yml +++ /dev/null @@ -1,127 +0,0 @@ - -name: MacOS Release - -jobs: - build_with_signing: - name: Upload Release Asset - runs-on: macos-latest - strategy: - matrix: - configuration: ['release'] # 'debug' - compiler: ['clang'] - platform: ['aarch64'] - targetPlatform: ['x64', 'aarch64'] - steps: - - name: Checkout code - uses: actions/checkout@v3 - with: - submodules: 'true' - fetch-depth: '0' - - name: Build release project - id: build - run: | - echo "starting to build..." - export CC=${{matrix.compiler}} - export CONFIGURATION=${{matrix.configuration}} - export ARCH=${{matrix.platform}} - export TARGETARCH=${{matrix.targetPlatform}} - echo "building..." - source ./github_macos_build.sh - - name: "Import signing certificate" - env: - BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }} - P12_PASSWORD: ${{ secrets.P12_PASSWORD }} - KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }} - run: | - # create variables - CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12 - KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db - - # import certificate and provisioning profile from secrets - echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH - - # create temporary keychain - security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH - security set-keychain-settings -lut 21600 $KEYCHAIN_PATH - security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH - - # import certificate to keychain - security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH - security list-keychain -d user -s $KEYCHAIN_PATH - - security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k ${KEYCHAIN_PASSWORD} $KEYCHAIN_PATH - - - name: Install nortarize tools - run: | - brew install Bearer/tap/gon - security find-identity -v - brew install coreutils - - name: Sign binaries - env: - IDENTITY_ID: d6ada82a113e4204aaad914e1013e9548ffd30d0 - run: | - /usr/bin/codesign --force --options runtime -s ${IDENTITY_ID} ./bin/macosx-${{matrix.targetPlatform}}/release/libslang.dylib -v - /usr/bin/codesign --force --options runtime -s ${IDENTITY_ID} ./bin/macosx-${{matrix.targetPlatform}}/release/libslang-glslang.dylib -v - /usr/bin/codesign --force --options runtime -s ${IDENTITY_ID} ./bin/macosx-${{matrix.targetPlatform}}/release/libgfx.dylib -v - /usr/bin/codesign --force --options runtime -s ${IDENTITY_ID} ./bin/macosx-${{matrix.targetPlatform}}/release/slangd -v - /usr/bin/codesign --force --options runtime -s ${IDENTITY_ID} ./bin/macosx-${{matrix.targetPlatform}}/release/slangc -v - - name: Package - id: package - run: | - export SLANG_OS_NAME=macos - export SLANG_ARCH_NAME=${{matrix.targetPlatform}} - export TAG_NAME=`git describe --tags` - export SLANG_TAG=${TAG_NAME#v} - echo "tag:$TAG_NAME" - echo "slang-tag:$SLANG_TAG" - export SLANG_BINARY_ARCHIVE=slang-${SLANG_TAG}-${SLANG_OS_NAME}-${SLANG_ARCH_NAME}.zip - echo "creating zip" - 7z a ${SLANG_BINARY_ARCHIVE} slang.h - 7z a ${SLANG_BINARY_ARCHIVE} slang-com-helper.h - 7z a ${SLANG_BINARY_ARCHIVE} slang-com-ptr.h - 7z a ${SLANG_BINARY_ARCHIVE} slang-tag-version.h - 7z a ${SLANG_BINARY_ARCHIVE} slang-gfx.h - 7z a ${SLANG_BINARY_ARCHIVE} prelude/*.h - 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/libslang.dylib - 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/libslang-glslang.dylib - 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/libgfx.dylib - 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/slangc - 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/slangd - 7z a ${SLANG_BINARY_ARCHIVE} docs/*.md - 7z a ${SLANG_BINARY_ARCHIVE} README.md - 7z a ${SLANG_BINARY_ARCHIVE} LICENSE - echo "SLANG_BINARY_ARCHIVE=${SLANG_BINARY_ARCHIVE}" >> $GITHUB_OUTPUT - - name: UploadBinary - uses: softprops/action-gh-release@v1 - with: - files: | - ${{ steps.package.outputs.SLANG_BINARY_ARCHIVE }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Notarize - env: - AC_PASSWORD: ${{secrets.APPLE_ID_PASSWORD}} - AC_PROVIDER: ${{secrets.APPLE_ID_PPOVIDER}} - AC_USERNAME: ${{secrets.APPLE_ID_USERNAME}} - run: | - cp ./bin/macosx-${{matrix.targetPlatform}}/release/libslang.dylib libslang.dylib - cp ./bin/macosx-${{matrix.targetPlatform}}/release/libslang-glslang.dylib libslang-glslang.dylib - cp ./bin/macosx-${{matrix.targetPlatform}}/release/libslang.dylib libgfx.dylib - cp ./bin/macosx-${{matrix.targetPlatform}}/release/slangd slangd - cp ./bin/macosx-${{matrix.targetPlatform}}/release/slangc slangc - 7z a slang-macos-dist.zip libslang.dylib - 7z a slang-macos-dist.zip libslang-glslang.dylib - 7z a slang-macos-dist.zip libgfx.dylib - 7z a slang-macos-dist.zip slangd - 7z a slang-macos-dist.zip slangc - cp slang-macos-dist.zip slang-macos-dist-${{matrix.targetPlatform}}.zip - timeout 1000 gon ./extras/macos-notarize.json - - name: UploadNotarizedBinary - if: always() - uses: softprops/action-gh-release@v1 - with: - files: | - slang-macos-dist-${{matrix.targetPlatform}}.zip - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml deleted file mode 100644 index 424dc9a4ac..0000000000 --- a/.github/workflows/release-windows.yml +++ /dev/null @@ -1,111 +0,0 @@ - -name: Windows Release - -jobs: - build: - name: Upload Release Asset - Windows - runs-on: windows-latest - strategy: - matrix: - configuration: ['Release'] - platform: ['Win32', 'x64', 'aarch64'] - steps: - - uses: actions/checkout@v3 - with: - submodules: 'true' - fetch-depth: '0' - - name: setup-msbuild - uses: microsoft/setup-msbuild@v1 - - - name: msbuild (x64 tools) - # If we are building for ARM64 we want to build x64 first, so that all generated files are produced - if: ${{ matrix.platform == 'aarch64' }} - run: | - .\premake.bat vs2019 --arch=x64 --ignore-deps=slang-llvm,slang-glslang --no-progress=true - MSBuild.exe slang.sln -v:m -m -property:Configuration=Release -property:Platform=x64 -property:WindowsTargetPlatformVersion=10.0.19041.0 - Remove-Item .\bin\* -Recurse -Force - .\premake.bat vs2019 --arch=${{matrix.platform}} --ignore-deps=slang-llvm,slang-glslang --no-progress=true --skip-source-generation=true --deploy-slang-llvm=false --deploy-slang-glslang=false - # Do the premake for the actual target, downloading dependencies if necessary - - name: premake - if: ${{ matrix.platform != 'aarch64' }} - run: - .\premake.bat vs2019 --enable-embed-stdlib=true --arch=${{matrix.platform}} --deps=true --no-progress=true - - name: tag-version - run: .\make-slang-tag-version.bat - - name: msbuild - run: - MSBuild.exe slang.sln -v:m -m -property:Configuration=${{matrix.configuration}} -property:Platform=${{matrix.platform}} -property:WindowsTargetPlatformVersion=10.0.19041.0 - - name: archive - id: archive - run: | - echo "achiving files..." - if ("${{matrix.platform}}" -eq "aarch64") - { - $slangDeployPlatform = "win-arm64" - } - elseif ("${{matrix.platform}}" -eq "x64") - { - $slangDeployPlatform = "win64" - } - else - { - $slangDeployPlatform = "win32" - } - $tagName = & git describe --tags - $slangVersion = $tagName.TrimStart("v") - $binArchive = "slang-$slangVersion-$slangDeployPlatform.zip" - - echo "name=SLANG_BINARY_ARCHIVE::$binArchive" - echo "SLANG_WIN32_BINARY_ARCHIVE=$binArchive" >> $env:GITHUB_OUTPUT - - 7z a "$binArchive" slang.h - 7z a "$binArchive" slang-com-helper.h - 7z a "$binArchive" slang-com-ptr.h - 7z a "$binArchive" slang-tag-version.h - 7z a "$binArchive" slang-gfx.h - 7z a "$binArchive" prelude\*.h - 7z a "$binArchive" bin\*\*\slang.dll - 7z a "$binArchive" bin\*\*\slang.lib - 7z a "$binArchive" bin\*\*\slang-rt.lib - 7z a "$binArchive" bin\*\*\slang-rt.dll - 7z a "$binArchive" bin\*\*\slang-glslang.dll - 7z a "$binArchive" bin\*\*\slang-llvm.dll - 7z a "$binArchive" bin\*\*\gfx.dll - 7z a "$binArchive" bin\*\*\gfx.lib - 7z a "$binArchive" bin\*\*\slangc.exe - 7z a "$binArchive" bin\*\*\slangd.exe - 7z a "$binArchive" docs\*.md - 7z a "$binArchive" README.md - 7z a "$binArchive" LICENSE - - $srcArchive = "slang-$slangVersion-source.zip" - echo "SLANG_SOURCE_ARCHIVE=$srcArchive" >> $env:GITHUB_OUTPUT - - 7z a "$srcArchive" slang.h - 7z a "$srcArchive" slang-com-helper.h - 7z a "$srcArchive" slang-com-ptr.h - 7z a "$srcArchive" slang-tag-version.h - 7z a "$srcArchive" slang-gfx.h - 7z a "$srcArchive" prelude\*.h - 7z a "$srcArchive" source\*\*.h - 7z a "$srcArchive" source\*\*.cpp - 7z a "$srcArchive" docs\*.md - 7z a "$srcArchive" README.md - 7z a "$srcArchive" LICENSE - - name: Check outputs - shell: pwsh - run: echo "binary is ${{ steps.archive.outputs.SLANG_WIN32_BINARY_ARCHIVE }}" - - name: UploadBinary - uses: softprops/action-gh-release@v1 - with: - files: | - ${{ steps.archive.outputs.SLANG_WIN32_BINARY_ARCHIVE }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: UploadSource - uses: softprops/action-gh-release@v1 - if: ${{ matrix.platform == 'x64' }} - with: - files: ${{ steps.archive.outputs.SLANG_SOURCE_ARCHIVE }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 84cd9155a32ff2a28311f19595a41bb1aecdb478 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 22:17:13 +0800 Subject: [PATCH 084/137] Build llvm on some platforms --- .github/workflows/release.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 74f943ef7f..6ba0728d0d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,9 +17,11 @@ jobs: - {os: linux, runs-on: ubuntu-20.04, compiler: gcc} - {os: windows, runs-on: windows-latest, compiler: cl} - {os: macos, runs-on: macos-latest, compiler: clang} - # - {platform: aarch64, build-slang-llvm: false} - # - {platform: aarch64, build-slang-llvm: false} + - {build-slang-llvm: false} + - {os: linux, platform: x86_64, build-slang-llvm: true} + - {os: windows, platform: x86_64, build-slang-llvm: true} + - {os: macos, platform: aarch64, build-slang-llvm: true} fail-fast: false runs-on: ${{ matrix.runs-on }} From 86ab827088de732fc8c155e93daa3bdc94a22278 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 22:17:22 +0800 Subject: [PATCH 085/137] neaten ci --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6ba0728d0d..445b06726d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -54,7 +54,7 @@ jobs: with: arch: ${{matrix.platform == 'aarch64' && 'amd64_arm64' || 'amd64'}} - - name: Change dev tools to host arch + - name: Change dev tools to host arch (linux and macos) run: | if [[ "${{matrix.os}}" == "linux" && "${{matrix.platform}}" == "aarch64" ]]; then export CC=aarch64-linux-gnu-gcc From f4a33e8dba72ed71d6793ee918ee3d73396c828f Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 22:18:01 +0800 Subject: [PATCH 086/137] notarize on osx --- .github/workflows/release.yml | 70 ++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 445b06726d..6a08a28809 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -80,18 +80,83 @@ jobs: cmake --preset default --fresh \ -DSLANG_GENERATORS_PATH=build-platform-generators/bin \ -DSLANG_ENABLE_EXAMPLES=OFF \ - -DSLANG_SLANG_LLVM_FLAVOR=DISABLE + -DSLANG_SLANG_LLVM_FLAVOR=$( + [[ ${{matrix.build-llvm}} = "true" ]] && echo "USE_SYSTEM_LLVM" || echo "DISABLE") - cmake --workflow --preset "${{matrix.config}}" + cmake --build --preset "${{matrix.config}}" + + - name: Sign and notarize binaries + if: matrix.os == 'macos' + id: notarize + env: + BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }} + P12_PASSWORD: ${{ secrets.P12_PASSWORD }} + KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }} + IDENTITY_ID: d6ada82a113e4204aaad914e1013e9548ffd30d0 + AC_PASSWORD: ${{secrets.APPLE_ID_PASSWORD}} + AC_PROVIDER: ${{secrets.APPLE_ID_PPOVIDER}} + AC_USERNAME: ${{secrets.APPLE_ID_USERNAME}} + run: | + brew install Bearer/tap/gon + security find-identity -v + brew install coreutils + + # create variables + CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12 + KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db + + # import certificate and provisioning profile from secrets + echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH + + # create temporary keychain + security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH + security set-keychain-settings -lut 21600 $KEYCHAIN_PATH + security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH + + # import certificate to keychain + security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH + security list-keychain -d user -s $KEYCHAIN_PATH + + security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k ${KEYCHAIN_PASSWORD} $KEYCHAIN_PATH + + signedFiles + find "build/$Config/{bin,lib}" -type f -perm +111 \ + | xargs codesign --force --options runtime -s "${IDENTITY_ID}" -v + + binaries=( + "build/${Config}/lib/libslang.dylib" + "build/${Config}/lib/libslang-rt.dylib" + "build/${Config}/lib/libslang-glslang.dylib" + "build/${Config}/lib/libslang-llvm.dylib" + "build/${Config}/lib/libgfx.dylib" + "build/${Config}/bin/slangd" + "build/${Config}/bin/slangc" + ) + for b in "${binaries[@]}"; do + if [[ -f "$b" ]]; then + 7z a "slang-macos-dist.zip" "${existing_files[@]}" + fi + done + + timeout 1000 gon ./extras/macos-notarize.json + + cp slang-macos-dist.zip "slang-macos-dist-${{matrix.platform}}.zip" + echo "SLANG_NOTARIZED_DIST=slang-macos-dist-${{matrix.platform}}.zip" >> $GITHUB_OUTPUT - name: File check run: | find build/dist-release ! -iname '*.md' ! -iname '*.h' -type f | xargs file + if [ "${{matrix.os}}" = "macos" ]; then + find build/dist-release ! -iname '*.md' ! -iname '*.h' -type f + | xargs codesign --verify --verbose=2 + || echo "code signing failed" + fi - name: Package Slang id: package run: | # For the release, also generate a tar.gz file + cpack --preset release -G ZIP cpack --preset release -G TGZ triggering_ref=${{ github.ref_name }} @@ -112,5 +177,6 @@ jobs: files: | ${{ steps.package.outputs.SLANG_BINARY_ARCHIVE_ZIP }} ${{ steps.package.outputs.SLANG_BINARY_ARCHIVE_TAR }} + ${{ steps.notarize.outputs.SLANG_NOTARIZED_DIST }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From bcc8aa9a69309c61512dcf56aade8dbbfa9e314c Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 22:21:57 +0800 Subject: [PATCH 087/137] s/x64/x86_64 --- .github/actions/common-setup/action.yml | 3 ++- .github/workflows/release.yml | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index d1b2039d86..e2d5ad9610 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -130,7 +130,8 @@ runs: # Put spirv-tools in path - shell: bash run: | + win_platform="${{inputs.platform/x86_64/x64}}" case "${{inputs.os}}" in - windows*) echo "${{github.workspace}}/external/slang-binaries/spirv-tools/windows-${{inputs.platform}}/bin" >> "$GITHUB_PATH";; + windows*) echo "${{github.workspace}}/external/slang-binaries/spirv-tools/windows-$win_platform/bin" >> "$GITHUB_PATH";; linux*) echo "${{github.workspace}}/external/slang-binaries/spirv-tools/$(uname -m)-linux/bin" >> "$GITHUB_PATH";; esac diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6a08a28809..0eaf2c8270 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: matrix: os: [linux, macos, windows] config: [release] - platform: [x64, aarch64] + platform: [x86_64, aarch64] test-category: [smoke] include: - {os: linux, runs-on: ubuntu-20.04, compiler: gcc} @@ -62,7 +62,7 @@ jobs: fi if [ "${{matrix.platform}}" = "aarch64" ]; then export CMAKE_OSX_ARCHITECTURES="-DCMAKE_OSX_ARCHITECTURES=arm64" - else if [ "${{matrix.platform}}" = "x64" ]; then + else if [ "${{matrix.platform}}" = "x86_64" ]; then export CMAKE_OSX_ARCHITECTURES="-DCMAKE_OSX_ARCHITECTURES=x86_64" fi @@ -163,7 +163,6 @@ jobs: version=${triggering_ref#v} os_name=${{ matrix.os }} arch_name=${{ matrix.platform }} - arch_name=${arch_name/x64/x86_64} base=$(pwd)/slang-${version}-${os_name}-${arch_name} mv "$(pwd)/build/dist-${config}/slang.zip" "${base}.zip" From b6a6e0c844b85342c9750b2655a188364c920a3e Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 22:25:39 +0800 Subject: [PATCH 088/137] ci wobble --- .github/actions/common-setup/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index e2d5ad9610..07d470bba3 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -130,7 +130,8 @@ runs: # Put spirv-tools in path - shell: bash run: | - win_platform="${{inputs.platform/x86_64/x64}}" + win_platform="${{ inputs.platform }}" + win_platform="${win_platform//x86_64/x64}" case "${{inputs.os}}" in windows*) echo "${{github.workspace}}/external/slang-binaries/spirv-tools/windows-$win_platform/bin" >> "$GITHUB_PATH";; linux*) echo "${{github.workspace}}/external/slang-binaries/spirv-tools/$(uname -m)-linux/bin" >> "$GITHUB_PATH";; From 1a516a2841098a3c94af2950152253e4388b3fc7 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 22:33:48 +0800 Subject: [PATCH 089/137] Embed stdlib for release build --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0eaf2c8270..77b9c45606 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -80,6 +80,7 @@ jobs: cmake --preset default --fresh \ -DSLANG_GENERATORS_PATH=build-platform-generators/bin \ -DSLANG_ENABLE_EXAMPLES=OFF \ + -DSLANG_EMBED_STDLIB=ON \ -DSLANG_SLANG_LLVM_FLAVOR=$( [[ ${{matrix.build-llvm}} = "true" ]] && echo "USE_SYSTEM_LLVM" || echo "DISABLE") From 45554b5013f5267de489fc9ce053ed20b3ab6018 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 22:36:48 +0800 Subject: [PATCH 090/137] wobble ci --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 77b9c45606..af2f400300 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,7 +62,7 @@ jobs: fi if [ "${{matrix.platform}}" = "aarch64" ]; then export CMAKE_OSX_ARCHITECTURES="-DCMAKE_OSX_ARCHITECTURES=arm64" - else if [ "${{matrix.platform}}" = "x86_64" ]; then + elif [ "${{matrix.platform}}" = "x86_64" ]; then export CMAKE_OSX_ARCHITECTURES="-DCMAKE_OSX_ARCHITECTURES=x86_64" fi From 708113c1825c6bbab6ab79d015909ac1d61a4ca9 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 22:42:46 +0800 Subject: [PATCH 091/137] wobble ci --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index af2f400300..963df9d3a5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -82,7 +82,7 @@ jobs: -DSLANG_ENABLE_EXAMPLES=OFF \ -DSLANG_EMBED_STDLIB=ON \ -DSLANG_SLANG_LLVM_FLAVOR=$( - [[ ${{matrix.build-llvm}} = "true" ]] && echo "USE_SYSTEM_LLVM" || echo "DISABLE") + [[ "${{matrix.build-slang-llvm}}" = "true" ]] && echo "USE_SYSTEM_LLVM" || echo "DISABLE") cmake --build --preset "${{matrix.config}}" From d62ed5fc6af0025951c8803976849ecc027b1927 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 22:51:06 +0800 Subject: [PATCH 092/137] s/x64/x86_64 --- .github/workflows/ci.yml | 6 +++--- .github/workflows/compile-regression-test.yml | 2 +- .github/workflows/falcor-compiler-perf-test.yml | 2 +- .github/workflows/falcor-test.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b20625099..68c9f3c0e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: os: [linux, macos, windows] compiler: [gcc, clang, cl] config: [debug, release] - platform: [x64, aarch64] + platform: [x86_64, aarch64] full-gpu-tests: [false] exclude: # Exclude invalid or undesired os/compiler @@ -29,7 +29,7 @@ jobs: # Default to x64, but aarch64 on osx - { os: linux, platform: aarch64 } - { os: windows, platform: aarch64 } - - { os: macos, platform: x64 } + - { os: macos, platform: x86_64 } include: - { os: linux, runs-on: ubuntu-20.04 } - { os: windows, runs-on: windows-latest } @@ -54,7 +54,7 @@ jobs: # Self-hosted full gpu build - os: windows compiler: cl - platform: x64 + platform: x86_64 config: release warnings-as-errors: false test-category: full diff --git a/.github/workflows/compile-regression-test.yml b/.github/workflows/compile-regression-test.yml index 6a175c5e3d..22325c27ed 100644 --- a/.github/workflows/compile-regression-test.yml +++ b/.github/workflows/compile-regression-test.yml @@ -19,7 +19,7 @@ jobs: # Self-hosted falcor tests - os: windows compiler: cl - platform: x64 + platform: x86_64 config: release warnings-as-errors: false test-category: full diff --git a/.github/workflows/falcor-compiler-perf-test.yml b/.github/workflows/falcor-compiler-perf-test.yml index 412c8e0bc2..5d749686c5 100644 --- a/.github/workflows/falcor-compiler-perf-test.yml +++ b/.github/workflows/falcor-compiler-perf-test.yml @@ -21,7 +21,7 @@ jobs: # Self-hosted falcor tests - os: windows compiler: cl - platform: x64 + platform: x86_64 config: release warnings-as-errors: false test-category: full diff --git a/.github/workflows/falcor-test.yml b/.github/workflows/falcor-test.yml index 18df69dab2..511a23b151 100644 --- a/.github/workflows/falcor-test.yml +++ b/.github/workflows/falcor-test.yml @@ -19,7 +19,7 @@ jobs: # Self-hosted falcor tests - os: windows compiler: cl - platform: x64 + platform: x86_64 config: release warnings-as-errors: false test-category: full From 3731ebad3a30cf5ebef09a3bf8e4d45ca87cf868 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 22:51:11 +0800 Subject: [PATCH 093/137] ci wobble --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 963df9d3a5..7f49936fe2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ on: - 'v*' jobs: - build: + release: strategy: matrix: os: [linux, macos, windows] From 8fab22294b2f460bfbbc314ebf620e9f5c597b89 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 22:51:19 +0800 Subject: [PATCH 094/137] ci wobble --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7f49936fe2..dfc6fc17de 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,9 +61,9 @@ jobs: export CXX=aarch64-linux-gnu-g++ fi if [ "${{matrix.platform}}" = "aarch64" ]; then - export CMAKE_OSX_ARCHITECTURES="-DCMAKE_OSX_ARCHITECTURES=arm64" + export CMAKE_OSX_ARCHITECTURES="arm64" elif [ "${{matrix.platform}}" = "x86_64" ]; then - export CMAKE_OSX_ARCHITECTURES="-DCMAKE_OSX_ARCHITECTURES=x86_64" + export CMAKE_OSX_ARCHITECTURES="x86_64" fi echo "CC=$CC" >> "$GITHUB_ENV" From aae647ff813a51c1e426e9c622cfe08e113bd0c0 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 23:13:27 +0800 Subject: [PATCH 095/137] ci wobble --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dfc6fc17de..e1594ea514 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -148,9 +148,9 @@ jobs: run: | find build/dist-release ! -iname '*.md' ! -iname '*.h' -type f | xargs file if [ "${{matrix.os}}" = "macos" ]; then - find build/dist-release ! -iname '*.md' ! -iname '*.h' -type f - | xargs codesign --verify --verbose=2 - || echo "code signing failed" + find build/dist-release ! -iname '*.md' ! -iname '*.h' -type f | + xargs codesign --verify --verbose=2 || + echo "code signing failed" fi - name: Package Slang From 44c60b9fd6d9c505581f188613d83dd9ac8965b5 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 23:24:50 +0800 Subject: [PATCH 096/137] vk-gl-cts on cmake --- .github/workflows/vk-gl-cts-nightly.yml | 50 ++++++++++++++++++------- 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/.github/workflows/vk-gl-cts-nightly.yml b/.github/workflows/vk-gl-cts-nightly.yml index 3a328001ba..afce86a40c 100644 --- a/.github/workflows/vk-gl-cts-nightly.yml +++ b/.github/workflows/vk-gl-cts-nightly.yml @@ -10,22 +10,44 @@ env: DISABLE_CTS_SLANG: 0 jobs: build: - runs-on: [Windows, self-hosted] + strategy: + matrix: + include: + # Self-hosted falcor tests + - os: windows + compiler: cl + platform: x86_64 + config: release + warnings-as-errors: false + test-category: full + full-gpu-tests: false + runs-on: [Windows, self-hosted] timeout-minutes: 180 + defaults: + run: + shell: bash steps: - uses: actions/checkout@v4 with: submodules: 'true' fetch-depth: '0' - - name: setup-msbuild - uses: microsoft/setup-msbuild@v1 - - name: build slang + - name: Setup + uses: ./.github/actions/common-setup + with: + os: ${{matrix.os}} + compiler: ${{matrix.compiler}} + platform: ${{matrix.platform}} + config: ${{matrix.config}} + - name: Build Slang run: | - .\premake.bat vs2019 --arch=x64 --deps=true --no-progress=true --enable-cuda=true - - .\make-slang-tag-version.bat - - MSBuild.exe slang.sln -v:m -m -property:Configuration=Release -property:Platform=x64 -property:WindowsTargetPlatformVersion=10.0.19041.0 -maxcpucount:12 + cmake --preset default --fresh \ + -DSLANG_SLANG_LLVM_FLAVOR=USE_SYSTEM_LLVM \ + -DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}} \ + -DSLANG_ENABLE_CUDA=1 \ + -DSLANG_ENABLE_EXAMPLES=0 \ + -DSLANG_ENABLE_GFX=0 \ + -DSLANG_ENABLE_TESTS=1 + cmake --workflow --preset "${{matrix.config}}" - uses: robinraju/release-downloader@v1.7 with: latest: true @@ -40,19 +62,19 @@ jobs: path: test-lists sparse-checkout-cone-mode: false - name: vkcts setup + shell: pwsh run: | Expand-Archive VK-GL-CTS_WithSlang-0.0.3-win64.zip - copy ${{ github.workspace }}\bin\windows-x64\release\slang.dll ${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64\slang.dll - - copy ${{ github.workspace }}\bin\windows-x64\release\slang-glslang.dll ${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64\slang-glslang.dll + copy ${{ github.workspace }}\build\Release\bin\slang.dll ${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64\slang.dll + copy ${{ github.workspace }}\build\Release\bin\slang-glslang.dll ${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64\slang-glslang.dll + copy ${{ github.workspace }}\build\Release\bin\test-server.exe ${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64\test-server.exe copy ${{ github.workspace }}\test-lists\test-lists\slang-passing-tests.txt ${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64\slang-passing-tests.txt - copy ${{ github.workspace }}\test-lists\test-lists\slang-waiver-tests.xml ${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64\slang-waiver-tests.xml - copy ${{ github.workspace }}\bin\windows-x64\release\test-server.exe ${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64\test-server.exe - name: vkcts run + shell: pwsh working-directory: ${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64 run: | .\deqp-vk.exe --deqp-archive-dir=${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64 --deqp-caselist-file=${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64\slang-passing-tests.txt --deqp-waiver-file=${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64\slang-waiver-tests.xml From 717978df53256e46941d2948b8da39a0f43eaaa4 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 8 Jul 2024 23:36:48 +0800 Subject: [PATCH 097/137] neaten ci --- .github/workflows/release.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e1594ea514..f1c288a219 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -60,11 +60,8 @@ jobs: export CC=aarch64-linux-gnu-gcc export CXX=aarch64-linux-gnu-g++ fi - if [ "${{matrix.platform}}" = "aarch64" ]; then - export CMAKE_OSX_ARCHITECTURES="arm64" - elif [ "${{matrix.platform}}" = "x86_64" ]; then - export CMAKE_OSX_ARCHITECTURES="x86_64" - fi + CMAKE_OSX_ARCHITECTURES="${{matrix.platform}}" + CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES//aarch64/arm64} echo "CC=$CC" >> "$GITHUB_ENV" echo "CXX=$CXX" >> "$GITHUB_ENV" From 346f9e1611adb7956a58228c76322987531ffbef Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 11:14:35 +0800 Subject: [PATCH 098/137] neaten ci --- .github/workflows/release.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f1c288a219..b2b9694372 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -141,21 +141,12 @@ jobs: cp slang-macos-dist.zip "slang-macos-dist-${{matrix.platform}}.zip" echo "SLANG_NOTARIZED_DIST=slang-macos-dist-${{matrix.platform}}.zip" >> $GITHUB_OUTPUT - - name: File check - run: | - find build/dist-release ! -iname '*.md' ! -iname '*.h' -type f | xargs file - if [ "${{matrix.os}}" = "macos" ]; then - find build/dist-release ! -iname '*.md' ! -iname '*.h' -type f | - xargs codesign --verify --verbose=2 || - echo "code signing failed" - fi - - name: Package Slang id: package run: | # For the release, also generate a tar.gz file - cpack --preset release -G ZIP - cpack --preset release -G TGZ + cpack --preset "$config" -G ZIP + cpack --preset "$config" -G TGZ triggering_ref=${{ github.ref_name }} version=${triggering_ref#v} @@ -168,6 +159,16 @@ jobs: mv "$(pwd)/build/dist-${config}/slang.tar.gz" "${base}.tar.gz" echo "SLANG_BINARY_ARCHIVE_TAR=${base}.tar.gz" >> $GITHUB_OUTPUT + + - name: File check + run: | + find "build/dist-$config" ! -iname '*.md' ! -iname '*.h' -type f | xargs file + if [ "${{matrix.os}}" = "macos" ]; then + find "build/dist-$config" ! -iname '*.md' ! -iname '*.h' -type f | + xargs codesign --verify --verbose=2 || + echo "code signing failed" + fi + - name: UploadBinary uses: softprops/action-gh-release@v1 with: From c44041bc6e84eb4dfc1fe5fbdeca271c998f02d8 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 11:19:44 +0800 Subject: [PATCH 099/137] bump cache action version --- .github/actions/common-setup/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index 07d470bba3..77e1fc059b 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -66,7 +66,7 @@ runs: echo "lib_dir=$lib_dir" >> "$GITHUB_ENV" # Try to restore a LLVM install, and build it otherwise - - uses: actions/cache/restore@v3 + - uses: actions/cache/restore@v4 id: cache-llvm if: inputs.build-llvm == 'true' with: @@ -77,7 +77,7 @@ runs: if: inputs.build-llvm == 'true' && steps.cache-llvm.outputs.cache-hit != 'true' shell: bash run: ./external/build-llvm.sh --install-prefix "${{ github.workspace }}/build/llvm-project-install" - - uses: actions/cache/save@v3 + - uses: actions/cache/save@v4 if: inputs.build-llvm == 'true' && steps.cache-llvm.outputs.cache-hit != 'true' with: path: ${{ github.workspace }}/build/llvm-project-install From 5a54ac95d1001d470dee6a1ea48eb39a109b26d8 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 11:55:59 +0800 Subject: [PATCH 100/137] Cope with windows being weird about case --- .github/actions/common-setup/action.yml | 1 - .github/workflows/release.yml | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index 77e1fc059b..54fc6de293 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -61,7 +61,6 @@ runs: bin_dir=$(pwd)/build/$Config/bin lib_dir=$(pwd)/build/$Config/lib echo "config=$config" >> "$GITHUB_ENV" - echo "Config=$Config" >> "$GITHUB_ENV" echo "bin_dir=$bin_dir" >> "$GITHUB_ENV" echo "lib_dir=$lib_dir" >> "$GITHUB_ENV" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b2b9694372..47f80dd6c3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -118,17 +118,17 @@ jobs: security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k ${KEYCHAIN_PASSWORD} $KEYCHAIN_PATH signedFiles - find "build/$Config/{bin,lib}" -type f -perm +111 \ + find "${bin_dir}" "${lib_dir}" -type f -perm +111 \ | xargs codesign --force --options runtime -s "${IDENTITY_ID}" -v binaries=( - "build/${Config}/lib/libslang.dylib" - "build/${Config}/lib/libslang-rt.dylib" - "build/${Config}/lib/libslang-glslang.dylib" - "build/${Config}/lib/libslang-llvm.dylib" - "build/${Config}/lib/libgfx.dylib" - "build/${Config}/bin/slangd" - "build/${Config}/bin/slangc" + "${lib_dir}/libslang.dylib" + "${lib_dir}/libslang-rt.dylib" + "${lib_dir}/libslang-glslang.dylib" + "${lib_dir}/libslang-llvm.dylib" + "${lib_dir}/libgfx.dylib" + "${bin_dir}/slangd" + "${bin_dir}/slangc" ) for b in "${binaries[@]}"; do if [[ -f "$b" ]]; then From e90b09dc8947624b4db45ffe5c71a29067280631 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 12:20:13 +0800 Subject: [PATCH 101/137] old glibc version --- .github/workflows/release.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 47f80dd6c3..77dbcd5cb5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,8 +22,12 @@ jobs: - {os: linux, platform: x86_64, build-slang-llvm: true} - {os: windows, platform: x86_64, build-slang-llvm: true} - {os: macos, platform: aarch64, build-slang-llvm: true} + + - {os: linux, image: null} + - {os: linux, platform: x86_64, image: slangdeveloper/centos7-gcc9} fail-fast: false runs-on: ${{ matrix.runs-on }} + image: ${{ matrix.image || '' }} defaults: run: From 703a75cd9de567e9779060779d955bcce24b6e18 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 12:43:33 +0800 Subject: [PATCH 102/137] old glibc version --- .github/actions/common-setup/action.yml | 4 ++-- .github/workflows/release.yml | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index 54fc6de293..e8c4f5cc2a 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -33,7 +33,7 @@ runs: fi # Install cross tools on Ubuntu - if [[ "${{inputs.os}}" == "linux" && "${{inputs.platform}}" == "aarch64" ]]; then + if [[ "${{inputs.os}}" == linux* && "${{inputs.platform}}" == "aarch64" ]]; then sudo apt-get install -y crossbuild-essential-arm64 fi @@ -44,7 +44,7 @@ runs: CXX=${CXX/gcc/g++} CXX=${CXX/clang/clang++} # Correct gcc version on older ubuntu - if [ "${{inputs.os}}" == "linux" ]; then + if [[ "${{inputs.os}}" == linux* ]]; then gcc_version=$(gcc -dumpversion | cut -d'.' -f1) if [ "$gcc_version" -lt 10 ]; then CC=${CC/gcc/gcc-10} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 77dbcd5cb5..c698e0380a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,22 +9,25 @@ jobs: release: strategy: matrix: - os: [linux, macos, windows] + os: [linux, linux-glibc-2.17, macos, windows] config: [release] platform: [x86_64, aarch64] test-category: [smoke] include: - {os: linux, runs-on: ubuntu-20.04, compiler: gcc} + - {os: linux-glibc-2.17, runs-on: ubuntu-20.04, compiler: gcc} - {os: windows, runs-on: windows-latest, compiler: cl} - {os: macos, runs-on: macos-latest, compiler: clang} - {build-slang-llvm: false} - {os: linux, platform: x86_64, build-slang-llvm: true} + - {os: linux-glibc-2.17, platform: x86_64, build-slang-llvm: true} - {os: windows, platform: x86_64, build-slang-llvm: true} - {os: macos, platform: aarch64, build-slang-llvm: true} - - {os: linux, image: null} - - {os: linux, platform: x86_64, image: slangdeveloper/centos7-gcc9} + - {os: linux-glibc-2.17, platform: x86_64, image: slangdeveloper/centos7-gcc9} + exclude: + - {os: linux-glibc-2.17, platform: aarch64} fail-fast: false runs-on: ${{ matrix.runs-on }} image: ${{ matrix.image || '' }} @@ -60,7 +63,7 @@ jobs: - name: Change dev tools to host arch (linux and macos) run: | - if [[ "${{matrix.os}}" == "linux" && "${{matrix.platform}}" == "aarch64" ]]; then + if [[ "${{matrix.os}}" == linux* && "${{matrix.platform}}" == "aarch64" ]]; then export CC=aarch64-linux-gnu-gcc export CXX=aarch64-linux-gnu-g++ fi From 08a8f97bc317759177e38090ffb3a33381b13355 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 13:04:58 +0800 Subject: [PATCH 103/137] Correct action file --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c698e0380a..2d26528346 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,7 +30,7 @@ jobs: - {os: linux-glibc-2.17, platform: aarch64} fail-fast: false runs-on: ${{ matrix.runs-on }} - image: ${{ matrix.image || '' }} + container: ${{ matrix.image || '' }} defaults: run: From 36975c67dab2651ecf1a3db5bc5663efce5c9068 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 14:53:51 +0800 Subject: [PATCH 104/137] Keep cache hot on main branch --- .github/workflows/release.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2d26528346..5a4056e83d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,6 +2,10 @@ name: Release on: push: + # Also run on pushes to the main branch so that we can keep the llvm and sccache + # caches filled in a scope available to everyone + branches: + - master tags: - 'v*' @@ -178,6 +182,7 @@ jobs: - name: UploadBinary uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/v') with: files: | ${{ steps.package.outputs.SLANG_BINARY_ARCHIVE_ZIP }} From cef60bffa1e5a9c5a3fa1be0513b4575c22a45cc Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 16:39:07 +0800 Subject: [PATCH 105/137] separate small script for old glibc releases --- .../workflows/release-linux-glibc-2-17.yml | 72 ++++++++++--------- .github/workflows/release.yml | 8 +-- 2 files changed, 38 insertions(+), 42 deletions(-) diff --git a/.github/workflows/release-linux-glibc-2-17.yml b/.github/workflows/release-linux-glibc-2-17.yml index 8fd4023b7e..a66b016824 100644 --- a/.github/workflows/release-linux-glibc-2-17.yml +++ b/.github/workflows/release-linux-glibc-2-17.yml @@ -1,11 +1,14 @@ +on: + push: + tags: + - 'v*' name: centos7-gcc9 Release jobs: build: runs-on: ubuntu-latest steps: - - name: Check out the repo - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: 'true' fetch-depth: '0' @@ -14,43 +17,42 @@ jobs: - name: Run the build process with Docker uses: addnab/docker-run-action@v3 with: - image: slangdeveloper/centos7-gcc9 - options: -v ${{ github.workspace }}:/home/app -v /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt - run: | - source /opt/rh/devtoolset-9/enable - cd /home/app - git config --global --add safe.directory /home/app - export CC=gcc - export CONFIGURATION=release - export ARCH=x64 - export TARGETARCH=x64 - export TARGETARCH=x64 - export GLIBC_COMPATIBLE=1 - /bin/bash ./github_build.sh - - - name: CreatePackages - id: build + image: slangdeveloper/centos7-gcc9 + options: -v ${{ github.workspace }}:/home/app -v /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt + run: | + source /opt/rh/devtoolset-9/enable + cd /home/app + git config --global --add safe.directory /home/app + cmake --preset default --fresh -DSLANG_SLANG_LLVM_FLAVOR=DISABLED -DSLANG_EMBED_STDLIB=1 + cmake --workflow --preset release + + - name: Package Slang + id: package run: | - echo "creating binary archieves..." - export SLANG_OS_NAME=linux - export SLANG_ARCH_NAME=`uname -p` - export TAG_NAME=`git describe --tags` - export SLANG_TAG=${TAG_NAME#v} - echo "tag:$TAG_NAME" - echo "slang-tag:$SLANG_TAG" - export SLANG_BINARY_ARCHIVE=slang-${SLANG_TAG}-${SLANG_OS_NAME}-${SLANG_ARCH_NAME}-glibc-2.17.zip - export SLANG_BINARY_ARCHIVE_TAR=slang-${SLANG_TAG}-${SLANG_OS_NAME}-${SLANG_ARCH_NAME}-glibc-2.17.tar.gz - echo "creating zip" - zip -r ${SLANG_BINARY_ARCHIVE} bin/*/*/slangc bin/*/*/slangd bin/*/*/libslang.so bin/*/*/libslang-glslang.so bin/*/*/libgfx.so bin/*/*/libslang-llvm.so docs/*.md README.md LICENSE slang.h slang-com-helper.h slang-com-ptr.h slang-tag-version.h slang-gfx.h prelude/*.h - echo "creating tar" - tar -czf ${SLANG_BINARY_ARCHIVE_TAR} bin/*/*/slangc bin/*/*/slangd bin/*/*/libslang.so bin/*/*/libslang-glslang.so bin/*/*/libgfx.so bin/*/*/libslang-llvm.so docs/*.md README.md LICENSE slang.h slang-com-helper.h slang-com-ptr.h slang-tag-version.h slang-gfx.h prelude/*.h - echo "SLANG_BINARY_ARCHIVE=${SLANG_BINARY_ARCHIVE}" >> $GITHUB_OUTPUT - echo "SLANG_BINARY_ARCHIVE_TAR=${SLANG_BINARY_ARCHIVE_TAR}" >> $GITHUB_OUTPUT + # For the release, also generate a tar.gz file + cpack --preset "$config" -G ZIP + cpack --preset "$config" -G TGZ + + triggering_ref=${{ github.ref_name }} + version=${triggering_ref#v} + base=$(pwd)/slang-${version}-linux-x86_64-glibc-2.17 + + mv "$(pwd)/build/dist-${config}/slang.zip" "${base}.zip" + echo "SLANG_BINARY_ARCHIVE_ZIP=${base}.zip" >> $GITHUB_OUTPUT + + mv "$(pwd)/build/dist-${config}/slang.tar.gz" "${base}.tar.gz" + echo "SLANG_BINARY_ARCHIVE_TAR=${base}.tar.gz" >> $GITHUB_OUTPUT + + - name: File check + run: | + find "build/dist-$config" ! -iname '*.md' ! -iname '*.h' -type f | xargs file + - name: UploadBinary uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/v') with: files: | - ${{ steps.build.outputs.SLANG_BINARY_ARCHIVE }} - ${{ steps.build.outputs.SLANG_BINARY_ARCHIVE_TAR }} + ${{ steps.package.outputs.SLANG_BINARY_ARCHIVE_ZIP }} + ${{ steps.package.outputs.SLANG_BINARY_ARCHIVE_TAR }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5a4056e83d..9d4a349ddc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,25 +13,19 @@ jobs: release: strategy: matrix: - os: [linux, linux-glibc-2.17, macos, windows] + os: [linux, macos, windows] config: [release] platform: [x86_64, aarch64] test-category: [smoke] include: - {os: linux, runs-on: ubuntu-20.04, compiler: gcc} - - {os: linux-glibc-2.17, runs-on: ubuntu-20.04, compiler: gcc} - {os: windows, runs-on: windows-latest, compiler: cl} - {os: macos, runs-on: macos-latest, compiler: clang} - {build-slang-llvm: false} - {os: linux, platform: x86_64, build-slang-llvm: true} - - {os: linux-glibc-2.17, platform: x86_64, build-slang-llvm: true} - {os: windows, platform: x86_64, build-slang-llvm: true} - {os: macos, platform: aarch64, build-slang-llvm: true} - - - {os: linux-glibc-2.17, platform: x86_64, image: slangdeveloper/centos7-gcc9} - exclude: - - {os: linux-glibc-2.17, platform: aarch64} fail-fast: false runs-on: ${{ matrix.runs-on }} container: ${{ matrix.image || '' }} From 677ec47efa2f83bd0b5703f963ed17e006f53477 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 16:47:58 +0800 Subject: [PATCH 106/137] ci wobble --- .github/workflows/release-linux-glibc-2-17.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-linux-glibc-2-17.yml b/.github/workflows/release-linux-glibc-2-17.yml index a66b016824..15c1b7080b 100644 --- a/.github/workflows/release-linux-glibc-2-17.yml +++ b/.github/workflows/release-linux-glibc-2-17.yml @@ -20,11 +20,18 @@ jobs: image: slangdeveloper/centos7-gcc9 options: -v ${{ github.workspace }}:/home/app -v /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt run: | + wget https://cmake.org/files/v3.30/cmake-3.30.0.tar.gz + tar zxvf cmake-3.* + cd cmake-3.* + ./bootstrap --prefix=/usr/local + make -j$(nproc) + make install + source /opt/rh/devtoolset-9/enable cd /home/app git config --global --add safe.directory /home/app - cmake --preset default --fresh -DSLANG_SLANG_LLVM_FLAVOR=DISABLED -DSLANG_EMBED_STDLIB=1 - cmake --workflow --preset release + cmake --preset default --fresh -DSLANG_SLANG_LLVM_FLAVOR=DISABLE -DSLANG_EMBED_STDLIB=1 -G 'Unix Makefiles' + cmake --build --preset release -j - name: Package Slang id: package From 99cba709bc472641a553db02ff94776eeec2f231 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 16:59:30 +0800 Subject: [PATCH 107/137] ci wobble --- .github/workflows/release-linux-glibc-2-17.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-linux-glibc-2-17.yml b/.github/workflows/release-linux-glibc-2-17.yml index 15c1b7080b..9a94460cb1 100644 --- a/.github/workflows/release-linux-glibc-2-17.yml +++ b/.github/workflows/release-linux-glibc-2-17.yml @@ -20,14 +20,16 @@ jobs: image: slangdeveloper/centos7-gcc9 options: -v ${{ github.workspace }}:/home/app -v /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt run: | + source /opt/rh/devtoolset-9/enable + wget https://cmake.org/files/v3.30/cmake-3.30.0.tar.gz + yum install -y openssl-devel tar zxvf cmake-3.* cd cmake-3.* ./bootstrap --prefix=/usr/local make -j$(nproc) make install - source /opt/rh/devtoolset-9/enable cd /home/app git config --global --add safe.directory /home/app cmake --preset default --fresh -DSLANG_SLANG_LLVM_FLAVOR=DISABLE -DSLANG_EMBED_STDLIB=1 -G 'Unix Makefiles' From a58aaba939a4aa35fe70962fd60d9512b143592f Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 17:05:26 +0800 Subject: [PATCH 108/137] Run cmake outside of docker --- .../workflows/release-linux-glibc-2-17.yml | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release-linux-glibc-2-17.yml b/.github/workflows/release-linux-glibc-2-17.yml index 9a94460cb1..98e19a5237 100644 --- a/.github/workflows/release-linux-glibc-2-17.yml +++ b/.github/workflows/release-linux-glibc-2-17.yml @@ -13,6 +13,14 @@ jobs: submodules: 'true' fetch-depth: '0' + - run: | + cmake \ + --preset default --fresh \ + -DCMAKE_BUILD_TYPE=Release \ + -DSLANG_SLANG_LLVM_FLAVOR=DISABLE \ + -DSLANG_EMBED_STDLIB=1 \ + -G 'Unix Makefiles' + # build the binary in docker image - name: Run the build process with Docker uses: addnab/docker-run-action@v3 @@ -22,18 +30,11 @@ jobs: run: | source /opt/rh/devtoolset-9/enable - wget https://cmake.org/files/v3.30/cmake-3.30.0.tar.gz - yum install -y openssl-devel - tar zxvf cmake-3.* - cd cmake-3.* - ./bootstrap --prefix=/usr/local - make -j$(nproc) - make install - cd /home/app git config --global --add safe.directory /home/app - cmake --preset default --fresh -DSLANG_SLANG_LLVM_FLAVOR=DISABLE -DSLANG_EMBED_STDLIB=1 -G 'Unix Makefiles' - cmake --build --preset release -j + + cd build + make -j$(nproc) - name: Package Slang id: package From d7f6919cb827a6184b18a14b48d11b928ebf0495 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 17:09:42 +0800 Subject: [PATCH 109/137] only sign on releases --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9d4a349ddc..f51b3e2100 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -89,7 +89,7 @@ jobs: cmake --build --preset "${{matrix.config}}" - name: Sign and notarize binaries - if: matrix.os == 'macos' + if: matrix.os == 'macos' && startsWith(github.ref, 'refs/tags/v') id: notarize env: BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }} From 8f2ebcbb83746c61b938687ae19d73496510b674 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 17:13:18 +0800 Subject: [PATCH 110/137] Revert "Run cmake outside of docker" This reverts commit a58aaba939a4aa35fe70962fd60d9512b143592f. --- .../workflows/release-linux-glibc-2-17.yml | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release-linux-glibc-2-17.yml b/.github/workflows/release-linux-glibc-2-17.yml index 98e19a5237..9a94460cb1 100644 --- a/.github/workflows/release-linux-glibc-2-17.yml +++ b/.github/workflows/release-linux-glibc-2-17.yml @@ -13,14 +13,6 @@ jobs: submodules: 'true' fetch-depth: '0' - - run: | - cmake \ - --preset default --fresh \ - -DCMAKE_BUILD_TYPE=Release \ - -DSLANG_SLANG_LLVM_FLAVOR=DISABLE \ - -DSLANG_EMBED_STDLIB=1 \ - -G 'Unix Makefiles' - # build the binary in docker image - name: Run the build process with Docker uses: addnab/docker-run-action@v3 @@ -30,11 +22,18 @@ jobs: run: | source /opt/rh/devtoolset-9/enable + wget https://cmake.org/files/v3.30/cmake-3.30.0.tar.gz + yum install -y openssl-devel + tar zxvf cmake-3.* + cd cmake-3.* + ./bootstrap --prefix=/usr/local + make -j$(nproc) + make install + cd /home/app git config --global --add safe.directory /home/app - - cd build - make -j$(nproc) + cmake --preset default --fresh -DSLANG_SLANG_LLVM_FLAVOR=DISABLE -DSLANG_EMBED_STDLIB=1 -G 'Unix Makefiles' + cmake --build --preset release -j - name: Package Slang id: package From a71d3b22bc50462fdb2e6de06438a3403e5e2b93 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 17:15:08 +0800 Subject: [PATCH 111/137] python3 on build image --- .github/workflows/release-linux-glibc-2-17.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release-linux-glibc-2-17.yml b/.github/workflows/release-linux-glibc-2-17.yml index 9a94460cb1..518d169fe9 100644 --- a/.github/workflows/release-linux-glibc-2-17.yml +++ b/.github/workflows/release-linux-glibc-2-17.yml @@ -22,6 +22,8 @@ jobs: run: | source /opt/rh/devtoolset-9/enable + yum install -y python3 + wget https://cmake.org/files/v3.30/cmake-3.30.0.tar.gz yum install -y openssl-devel tar zxvf cmake-3.* From 1cee8e064eab59c2fcafd285603eec92e485f0d6 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 18:54:51 +0800 Subject: [PATCH 112/137] less parallel --- .github/workflows/release-linux-glibc-2-17.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-linux-glibc-2-17.yml b/.github/workflows/release-linux-glibc-2-17.yml index 518d169fe9..b3ca940150 100644 --- a/.github/workflows/release-linux-glibc-2-17.yml +++ b/.github/workflows/release-linux-glibc-2-17.yml @@ -34,8 +34,8 @@ jobs: cd /home/app git config --global --add safe.directory /home/app - cmake --preset default --fresh -DSLANG_SLANG_LLVM_FLAVOR=DISABLE -DSLANG_EMBED_STDLIB=1 -G 'Unix Makefiles' - cmake --build --preset release -j + cmake --preset default --fresh -DCMAKE_BUILD_TYPE=Release -DSLANG_SLANG_LLVM_FLAVOR=DISABLE -DSLANG_EMBED_STDLIB=1 -G 'Unix Makefiles' + cmake --build --preset release -j$(nproc) - name: Package Slang id: package From c170191e935f8ee5ef02604da3a1431bb980981f Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 19:33:06 +0800 Subject: [PATCH 113/137] ci wobble --- .github/workflows/release-linux-glibc-2-17.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-linux-glibc-2-17.yml b/.github/workflows/release-linux-glibc-2-17.yml index b3ca940150..8911d3dd9c 100644 --- a/.github/workflows/release-linux-glibc-2-17.yml +++ b/.github/workflows/release-linux-glibc-2-17.yml @@ -37,13 +37,12 @@ jobs: cmake --preset default --fresh -DCMAKE_BUILD_TYPE=Release -DSLANG_SLANG_LLVM_FLAVOR=DISABLE -DSLANG_EMBED_STDLIB=1 -G 'Unix Makefiles' cmake --build --preset release -j$(nproc) + cpack --preset "$config" -G ZIP + cpack --preset "$config" -G TGZ + - name: Package Slang id: package run: | - # For the release, also generate a tar.gz file - cpack --preset "$config" -G ZIP - cpack --preset "$config" -G TGZ - triggering_ref=${{ github.ref_name }} version=${triggering_ref#v} base=$(pwd)/slang-${version}-linux-x86_64-glibc-2.17 From 45ee49e35a852f75a301799967e9f01cde7cd9ba Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 19:35:13 +0800 Subject: [PATCH 114/137] ci wobble --- .github/workflows/release-linux-glibc-2-17.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-linux-glibc-2-17.yml b/.github/workflows/release-linux-glibc-2-17.yml index 8911d3dd9c..f5eaf54ae4 100644 --- a/.github/workflows/release-linux-glibc-2-17.yml +++ b/.github/workflows/release-linux-glibc-2-17.yml @@ -37,8 +37,8 @@ jobs: cmake --preset default --fresh -DCMAKE_BUILD_TYPE=Release -DSLANG_SLANG_LLVM_FLAVOR=DISABLE -DSLANG_EMBED_STDLIB=1 -G 'Unix Makefiles' cmake --build --preset release -j$(nproc) - cpack --preset "$config" -G ZIP - cpack --preset "$config" -G TGZ + cpack --preset release -G ZIP + cpack --preset release -G TGZ - name: Package Slang id: package From 435ab4886eeec3cc2569279427f64fa048cab68b Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 20:24:43 +0800 Subject: [PATCH 115/137] ci wobble --- .github/workflows/release-linux-glibc-2-17.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-linux-glibc-2-17.yml b/.github/workflows/release-linux-glibc-2-17.yml index f5eaf54ae4..943d528923 100644 --- a/.github/workflows/release-linux-glibc-2-17.yml +++ b/.github/workflows/release-linux-glibc-2-17.yml @@ -55,7 +55,7 @@ jobs: - name: File check run: | - find "build/dist-$config" ! -iname '*.md' ! -iname '*.h' -type f | xargs file + find "build/dist-release" ! -iname '*.md' ! -iname '*.h' -type f | xargs file - name: UploadBinary uses: softprops/action-gh-release@v1 From 51b6067db5b71f6011842d38155410c1d389bc4b Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 21:31:37 +0800 Subject: [PATCH 116/137] newer git --- .github/workflows/release-linux-glibc-2-17.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/release-linux-glibc-2-17.yml b/.github/workflows/release-linux-glibc-2-17.yml index 943d528923..e62b35dd74 100644 --- a/.github/workflows/release-linux-glibc-2-17.yml +++ b/.github/workflows/release-linux-glibc-2-17.yml @@ -32,6 +32,18 @@ jobs: make -j$(nproc) make install + cd .. + yum remove git -y + yum install curl-devel expat-devel gettext-devel openssl-devel zlib-devel wget -y + yum install gcc perl-ExtUtils-MakeMaker -y + cd /usr/src + wget https://www.kernel.org/pub/software/scm/git/git-2.9.3.tar.gz + tar xzf git-2.9.3.tar.gz + cd git-2.9.3 + make prefix=/usr/local/git all -j$(nproc) + make prefix=/usr/local/git install -j$(nproc) + export PATH=$PATH:/usr/local/git/bin + cd /home/app git config --global --add safe.directory /home/app cmake --preset default --fresh -DCMAKE_BUILD_TYPE=Release -DSLANG_SLANG_LLVM_FLAVOR=DISABLE -DSLANG_EMBED_STDLIB=1 -G 'Unix Makefiles' From ff5047962e8adfaf91facfdc5ef2a8e4464476a3 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 21:31:41 +0800 Subject: [PATCH 117/137] ci wobble --- .github/workflows/release-linux-glibc-2-17.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-linux-glibc-2-17.yml b/.github/workflows/release-linux-glibc-2-17.yml index e62b35dd74..e6c631de40 100644 --- a/.github/workflows/release-linux-glibc-2-17.yml +++ b/.github/workflows/release-linux-glibc-2-17.yml @@ -59,10 +59,10 @@ jobs: version=${triggering_ref#v} base=$(pwd)/slang-${version}-linux-x86_64-glibc-2.17 - mv "$(pwd)/build/dist-${config}/slang.zip" "${base}.zip" + mv "$(pwd)/build/dist-release/slang.zip" "${base}.zip" echo "SLANG_BINARY_ARCHIVE_ZIP=${base}.zip" >> $GITHUB_OUTPUT - mv "$(pwd)/build/dist-${config}/slang.tar.gz" "${base}.tar.gz" + mv "$(pwd)/build/dist-release/slang.tar.gz" "${base}.tar.gz" echo "SLANG_BINARY_ARCHIVE_TAR=${base}.tar.gz" >> $GITHUB_OUTPUT - name: File check From 5d9942965c438702a9776e4ff875b5f38c60e6ca Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 9 Jul 2024 21:38:39 +0800 Subject: [PATCH 118/137] ci wobble --- .github/workflows/release-linux-glibc-2-17.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-linux-glibc-2-17.yml b/.github/workflows/release-linux-glibc-2-17.yml index e6c631de40..e28fb0f764 100644 --- a/.github/workflows/release-linux-glibc-2-17.yml +++ b/.github/workflows/release-linux-glibc-2-17.yml @@ -40,6 +40,7 @@ jobs: wget https://www.kernel.org/pub/software/scm/git/git-2.9.3.tar.gz tar xzf git-2.9.3.tar.gz cd git-2.9.3 + mkdir -p /usr/local/git make prefix=/usr/local/git all -j$(nproc) make prefix=/usr/local/git install -j$(nproc) export PATH=$PATH:/usr/local/git/bin From 20de81f4a9771875135ad23c5902d4dd6d82ed12 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 08:28:28 +0800 Subject: [PATCH 119/137] Use newer docker image --- .../workflows/release-linux-glibc-2-17.yml | 30 ++----------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/.github/workflows/release-linux-glibc-2-17.yml b/.github/workflows/release-linux-glibc-2-17.yml index e28fb0f764..a1d1281180 100644 --- a/.github/workflows/release-linux-glibc-2-17.yml +++ b/.github/workflows/release-linux-glibc-2-17.yml @@ -17,39 +17,15 @@ jobs: - name: Run the build process with Docker uses: addnab/docker-run-action@v3 with: - image: slangdeveloper/centos7-gcc9 + image: slangdeveloper/centos7-gcc9:cmake options: -v ${{ github.workspace }}:/home/app -v /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt run: | source /opt/rh/devtoolset-9/enable - yum install -y python3 - - wget https://cmake.org/files/v3.30/cmake-3.30.0.tar.gz - yum install -y openssl-devel - tar zxvf cmake-3.* - cd cmake-3.* - ./bootstrap --prefix=/usr/local - make -j$(nproc) - make install - - cd .. - yum remove git -y - yum install curl-devel expat-devel gettext-devel openssl-devel zlib-devel wget -y - yum install gcc perl-ExtUtils-MakeMaker -y - cd /usr/src - wget https://www.kernel.org/pub/software/scm/git/git-2.9.3.tar.gz - tar xzf git-2.9.3.tar.gz - cd git-2.9.3 - mkdir -p /usr/local/git - make prefix=/usr/local/git all -j$(nproc) - make prefix=/usr/local/git install -j$(nproc) - export PATH=$PATH:/usr/local/git/bin - cd /home/app git config --global --add safe.directory /home/app - cmake --preset default --fresh -DCMAKE_BUILD_TYPE=Release -DSLANG_SLANG_LLVM_FLAVOR=DISABLE -DSLANG_EMBED_STDLIB=1 -G 'Unix Makefiles' - cmake --build --preset release -j$(nproc) - + cmake --preset default --fresh -DSLANG_SLANG_LLVM_FLAVOR=DISABLE -DSLANG_EMBED_STDLIB=1 + cmake --build --preset release cpack --preset release -G ZIP cpack --preset release -G TGZ From 29de413eead20935bc8b1e253556cc7f4ce669f7 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 08:32:41 +0800 Subject: [PATCH 120/137] Use newer docker image --- .github/workflows/release-linux-glibc-2-17.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release-linux-glibc-2-17.yml b/.github/workflows/release-linux-glibc-2-17.yml index a1d1281180..62d848d028 100644 --- a/.github/workflows/release-linux-glibc-2-17.yml +++ b/.github/workflows/release-linux-glibc-2-17.yml @@ -20,6 +20,8 @@ jobs: image: slangdeveloper/centos7-gcc9:cmake options: -v ${{ github.workspace }}:/home/app -v /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt run: | + export PATH=$PATH:/cmake-3.30.0-linux-x86_64/bin/ + source /opt/rh/devtoolset-9/enable cd /home/app From f299db1d6c389c24587025b9d49713f4475e8369 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 08:36:51 +0800 Subject: [PATCH 121/137] sccache wobble --- .github/actions/common-setup/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index e8c4f5cc2a..08ffdc731d 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -89,7 +89,6 @@ runs: with: key: ${{inputs.os}}-${{inputs.compiler}}-${{inputs.platform}}-${{inputs.config}} variant: sccache - append-timestamp: false # Opportunistically use sccache, it's not available for example on self # hosted runners or ARM continue-on-error: true From 0102b5f2838865c80385f646c3fbbfb1f733f7ee Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 09:00:02 +0800 Subject: [PATCH 122/137] permissions issue --- .github/workflows/release-linux-glibc-2-17.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-linux-glibc-2-17.yml b/.github/workflows/release-linux-glibc-2-17.yml index 62d848d028..59f50ffd27 100644 --- a/.github/workflows/release-linux-glibc-2-17.yml +++ b/.github/workflows/release-linux-glibc-2-17.yml @@ -38,10 +38,10 @@ jobs: version=${triggering_ref#v} base=$(pwd)/slang-${version}-linux-x86_64-glibc-2.17 - mv "$(pwd)/build/dist-release/slang.zip" "${base}.zip" + sudo mv "$(pwd)/build/dist-release/slang.zip" "${base}.zip" echo "SLANG_BINARY_ARCHIVE_ZIP=${base}.zip" >> $GITHUB_OUTPUT - mv "$(pwd)/build/dist-release/slang.tar.gz" "${base}.tar.gz" + sudo mv "$(pwd)/build/dist-release/slang.tar.gz" "${base}.tar.gz" echo "SLANG_BINARY_ARCHIVE_TAR=${base}.tar.gz" >> $GITHUB_OUTPUT - name: File check From 90031cb187b6aeefd9a9d2b8db52c9ed85c91cc7 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 09:01:50 +0800 Subject: [PATCH 123/137] neaten --- .github/workflows/release.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f51b3e2100..a83119bf92 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -152,16 +152,10 @@ jobs: # For the release, also generate a tar.gz file cpack --preset "$config" -G ZIP cpack --preset "$config" -G TGZ - triggering_ref=${{ github.ref_name }} - version=${triggering_ref#v} - os_name=${{ matrix.os }} - arch_name=${{ matrix.platform }} - base=$(pwd)/slang-${version}-${os_name}-${arch_name} - + base=$(pwd)/slang-${triggering_ref#v}-${{matrix.os}}-${{matrix.platform}} mv "$(pwd)/build/dist-${config}/slang.zip" "${base}.zip" echo "SLANG_BINARY_ARCHIVE_ZIP=${base}.zip" >> $GITHUB_OUTPUT - mv "$(pwd)/build/dist-${config}/slang.tar.gz" "${base}.tar.gz" echo "SLANG_BINARY_ARCHIVE_TAR=${base}.tar.gz" >> $GITHUB_OUTPUT From 01831eeb41f8fb983fd450a8a12f67acdfa0c19e Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 10:02:46 +0800 Subject: [PATCH 124/137] build llvm in ci --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68c9f3c0e3..556f941b59 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,6 +79,7 @@ jobs: compiler: ${{matrix.compiler}} platform: ${{matrix.platform}} config: ${{matrix.config}} + build-llvm: true - name: Build Slang run: | if [[ "${{ matrix.os }}" =~ "windows" && "${{ matrix.config }}" != "release" ]]; then From f67d96baea7e24d3709c5f70b345a95bedb3bf9e Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 10:09:56 +0800 Subject: [PATCH 125/137] build llvm in ci --- .github/workflows/compile-regression-test.yml | 1 + .github/workflows/falcor-compiler-perf-test.yml | 1 + .github/workflows/falcor-test.yml | 1 + .github/workflows/vk-gl-cts-nightly.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/.github/workflows/compile-regression-test.yml b/.github/workflows/compile-regression-test.yml index 22325c27ed..ce525d2e74 100644 --- a/.github/workflows/compile-regression-test.yml +++ b/.github/workflows/compile-regression-test.yml @@ -41,6 +41,7 @@ jobs: compiler: ${{matrix.compiler}} platform: ${{matrix.platform}} config: ${{matrix.config}} + build-llvm: true - name: Build Slang run: | cmake --preset default --fresh \ diff --git a/.github/workflows/falcor-compiler-perf-test.yml b/.github/workflows/falcor-compiler-perf-test.yml index 5d749686c5..22a9c54962 100644 --- a/.github/workflows/falcor-compiler-perf-test.yml +++ b/.github/workflows/falcor-compiler-perf-test.yml @@ -44,6 +44,7 @@ jobs: compiler: ${{matrix.compiler}} platform: ${{matrix.platform}} config: ${{matrix.config}} + build-llvm: true - name: Build Slang run: | diff --git a/.github/workflows/falcor-test.yml b/.github/workflows/falcor-test.yml index 511a23b151..fee1123209 100644 --- a/.github/workflows/falcor-test.yml +++ b/.github/workflows/falcor-test.yml @@ -41,6 +41,7 @@ jobs: compiler: ${{matrix.compiler}} platform: ${{matrix.platform}} config: ${{matrix.config}} + build-llvm: true - name: setup-falcor shell: pwsh run: | diff --git a/.github/workflows/vk-gl-cts-nightly.yml b/.github/workflows/vk-gl-cts-nightly.yml index afce86a40c..587e7db307 100644 --- a/.github/workflows/vk-gl-cts-nightly.yml +++ b/.github/workflows/vk-gl-cts-nightly.yml @@ -38,6 +38,7 @@ jobs: compiler: ${{matrix.compiler}} platform: ${{matrix.platform}} config: ${{matrix.config}} + build-llvm: true - name: Build Slang run: | cmake --preset default --fresh \ From 494c6e3077fe2f80947ce57a3867154766e043d8 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 12:15:13 +0800 Subject: [PATCH 126/137] Remove linux clang build in ci --- .github/workflows/ci.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 556f941b59..c647c94b34 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,17 +13,10 @@ jobs: strategy: matrix: os: [linux, macos, windows] - compiler: [gcc, clang, cl] config: [debug, release] platform: [x86_64, aarch64] full-gpu-tests: [false] exclude: - # Exclude invalid or undesired os/compiler - - { os: linux, compiler: cl } - - { os: macos, compiler: cl } - - { os: macos, compiler: gcc } - - { os: windows, compiler: gcc } - - { os: windows, compiler: clang } # or os/config combinations # - { os: macos, config: debug } # Default to x64, but aarch64 on osx @@ -31,9 +24,9 @@ jobs: - { os: windows, platform: aarch64 } - { os: macos, platform: x86_64 } include: - - { os: linux, runs-on: ubuntu-20.04 } - - { os: windows, runs-on: windows-latest } - - { os: macos, runs-on: macos-latest } + - {os: linux, runs-on: ubuntu-20.04, compiler: gcc} + - {os: windows, runs-on: windows-latest, compiler: cl} + - {os: macos, runs-on: macos-latest, compiler: clang} # Set a test category depending on the config, smoke by default, # quick or full conditionally otherwise - test-category: smoke From 786991441619463ded0577668877d1d38264fe26 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 12:20:11 +0800 Subject: [PATCH 127/137] Only install crossbuild tools on non-aarch64 systems --- .github/actions/common-setup/action.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index 08ffdc731d..ee7524cf80 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -33,7 +33,7 @@ runs: fi # Install cross tools on Ubuntu - if [[ "${{inputs.os}}" == linux* && "${{inputs.platform}}" == "aarch64" ]]; then + if [[ "${{inputs.os}}" == linux* && "${{inputs.platform}}" == "aarch64" && "$(uname -m)" != "aarch64" ]]; then sudo apt-get install -y crossbuild-essential-arm64 fi diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a83119bf92..b77f7c7ba3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,7 +61,7 @@ jobs: - name: Change dev tools to host arch (linux and macos) run: | - if [[ "${{matrix.os}}" == linux* && "${{matrix.platform}}" == "aarch64" ]]; then + if [[ "${{inputs.os}}" == linux* && "${{inputs.platform}}" == "aarch64" && "$(uname -m)" != "aarch64" ]]; then export CC=aarch64-linux-gnu-gcc export CXX=aarch64-linux-gnu-g++ fi From a08eb86a0f6e6fb0f89843d8f3d4cb8704a0490e Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 12:26:22 +0800 Subject: [PATCH 128/137] neaten ci.yml --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c647c94b34..12a9a53c6b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,6 @@ jobs: os: [linux, macos, windows] config: [debug, release] platform: [x86_64, aarch64] - full-gpu-tests: [false] exclude: # or os/config combinations # - { os: macos, config: debug } @@ -24,9 +23,9 @@ jobs: - { os: windows, platform: aarch64 } - { os: macos, platform: x86_64 } include: - - {os: linux, runs-on: ubuntu-20.04, compiler: gcc} - - {os: windows, runs-on: windows-latest, compiler: cl} - - {os: macos, runs-on: macos-latest, compiler: clang} + - { os: linux, runs-on: ubuntu-20.04, compiler: gcc } + - { os: windows, runs-on: windows-latest, compiler: cl } + - { os: macos, runs-on: macos-latest, compiler: clang } # Set a test category depending on the config, smoke by default, # quick or full conditionally otherwise - test-category: smoke @@ -35,6 +34,8 @@ jobs: # Only CL has werror - warnings-as-errors: false - { compiler: cl, warnings-as-errors: true } + # default not full gpu tests + - full-gpu-tests: false # Self-hosted aarch64 build - os: linux compiler: gcc From f7b51e2e96613a2c60269331c948506fb6d2b012 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 12:32:44 +0800 Subject: [PATCH 129/137] Correct github matrix --- .github/workflows/ci.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 12a9a53c6b..5c530c73ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,7 @@ jobs: matrix: os: [linux, macos, windows] config: [debug, release] + compiler: [gcc, clang, cl] platform: [x86_64, aarch64] exclude: # or os/config combinations @@ -22,10 +23,16 @@ jobs: - { os: linux, platform: aarch64 } - { os: windows, platform: aarch64 } - { os: macos, platform: x86_64 } + - { os: linux, compiler: clang } + - { os: linux, compiler: cl } + - { os: windows, compiler: gcc } + - { os: windows, compiler: clang } + - { os: macos, compiler: gcc } + - { os: macos, compiler: cl } include: - - { os: linux, runs-on: ubuntu-20.04, compiler: gcc } - - { os: windows, runs-on: windows-latest, compiler: cl } - - { os: macos, runs-on: macos-latest, compiler: clang } + - { os: linux, runs-on: ubuntu-20.04 } + - { os: windows, runs-on: windows-latest } + - { os: macos, runs-on: macos-latest } # Set a test category depending on the config, smoke by default, # quick or full conditionally otherwise - test-category: smoke From bba73a47b35f254d26ca8e1c3cb10fc21b1ee7be Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 12:48:45 +0800 Subject: [PATCH 130/137] Simplify github matrix --- .github/workflows/ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c530c73ad..2f0431f4ae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,12 +17,11 @@ jobs: compiler: [gcc, clang, cl] platform: [x86_64, aarch64] exclude: - # or os/config combinations - # - { os: macos, config: debug } # Default to x64, but aarch64 on osx - { os: linux, platform: aarch64 } - { os: windows, platform: aarch64 } - { os: macos, platform: x86_64 } + # Unused compiler configs - { os: linux, compiler: clang } - { os: linux, compiler: cl } - { os: windows, compiler: gcc } @@ -31,16 +30,16 @@ jobs: - { os: macos, compiler: cl } include: - { os: linux, runs-on: ubuntu-20.04 } - - { os: windows, runs-on: windows-latest } - { os: macos, runs-on: macos-latest } + - { os: windows, runs-on: windows-latest } + # When to have warnings + - warnings-as-errors: false + - { compiler: cl, warnings-as-errors true } # Set a test category depending on the config, smoke by default, # quick or full conditionally otherwise - test-category: smoke - { os: windows, test-category: quick } - { config: release, test-category: full } - # Only CL has werror - - warnings-as-errors: false - - { compiler: cl, warnings-as-errors: true } # default not full gpu tests - full-gpu-tests: false # Self-hosted aarch64 build From 953f99f33f1b1873ef4b7b3adc9521693a75b766 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 12:55:12 +0800 Subject: [PATCH 131/137] ci wobble --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f0431f4ae..264e26f253 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -113,6 +113,7 @@ jobs: -category ${{ matrix.test-category }} \ -api all-cpu || failed=1 + which spirv-val $bin_dir/slang-test \ -use-test-server \ -server-count 8 \ From ecc408d08245ef3301210752aef82e42f8487535 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 14:24:04 +0800 Subject: [PATCH 132/137] Disable broken test See https://github.com/shader-slang/slang/issues/4589 --- tests/bugs/gh-4556.slang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/bugs/gh-4556.slang b/tests/bugs/gh-4556.slang index eed84779e5..e5d9388407 100644 --- a/tests/bugs/gh-4556.slang +++ b/tests/bugs/gh-4556.slang @@ -1,6 +1,6 @@ //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-dx12 -compute -output-using-type -shaderobj -//TEST(compute, vulkan):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -compute -output-using-type -shaderobj -//TEST(compute, vulkan):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -glsl -compute -output-using-type -shaderobj +//DISABLE_TEST(compute, vulkan):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -compute -output-using-type -shaderobj +//DISABLE_TEST(compute, vulkan):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -glsl -compute -output-using-type -shaderobj //DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-mtl -compute -output-using-type -shaderobj //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -cpu -output-using-type -shaderobj From bc179046ac0f33422d3798abc3d04de265ae1752 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 14:24:11 +0800 Subject: [PATCH 133/137] ci wobble --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 264e26f253..2f0431f4ae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -113,7 +113,6 @@ jobs: -category ${{ matrix.test-category }} \ -api all-cpu || failed=1 - which spirv-val $bin_dir/slang-test \ -use-test-server \ -server-count 8 \ From f9c7f91ac03182ef6e17e30cea494370d326c16d Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 15:31:49 +0800 Subject: [PATCH 134/137] Neater slang-llvm archive filename --- .github/workflows/ci.yml | 2 +- CMakePresets.json | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f0431f4ae..140911b218 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,7 +90,7 @@ jobs: # Configure, pointing to our just-generated slang-llvm archive cmake --preset default --fresh \ -DSLANG_SLANG_LLVM_FLAVOR=FETCH_BINARY \ - -DSLANG_SLANG_LLVM_BINARY_URL=$(pwd)/build/dist-release/slang-slang-llvm.zip \ + -DSLANG_SLANG_LLVM_BINARY_URL=$(pwd)/build/dist-release/slang-llvm.zip \ -DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}} cmake --workflow --preset "${{matrix.config}}" else diff --git a/CMakePresets.json b/CMakePresets.json index 27fe83109c..36543c1c88 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -105,6 +105,7 @@ "inherits": "release", "configurePreset": "default", "variables": { + "CPACK_PACKAGE_FILE_NAME": "slang-generators", "CPACK_COMPONENTS_ALL": "generators" } }, @@ -113,6 +114,7 @@ "inherits": "release", "configurePreset": "slang-llvm", "variables": { + "CPACK_PACKAGE_FILE_NAME": "slang-llvm", "CPACK_COMPONENTS_ALL": "slang-llvm" } } From 9cc5e2b544ddbf83227fa271407aacfe62031586 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 16:02:27 +0800 Subject: [PATCH 135/137] Neater path for uploading artifacts --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 140911b218..b23308ab3c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -135,4 +135,4 @@ jobs: with: name: slang-build-${{matrix.os}}-${{matrix.platform}}-${{matrix.compiler}}-${{matrix.config}} # The install directory used in the packaging step - path: build/dist-${{matrix.config}}/**/slang/* + path: build/dist-${{matrix.config}}/**/ZIP/slang/* From 28a147c1c93fa4c0c6c52c8c2755d312aa9a95e5 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 16:02:39 +0800 Subject: [PATCH 136/137] Neater ci names --- .github/workflows/compile-regression-test.yml | 10 +++++----- .github/workflows/falcor-compiler-perf-test.yml | 10 +++++----- .github/workflows/falcor-test.yml | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/compile-regression-test.yml b/.github/workflows/compile-regression-test.yml index ce525d2e74..b6b484b9a5 100644 --- a/.github/workflows/compile-regression-test.yml +++ b/.github/workflows/compile-regression-test.yml @@ -15,13 +15,13 @@ jobs: strategy: fail-fast: false matrix: + os: [windows] + config: [release] + compiler: [cl] + platform: [x86_64] include: # Self-hosted falcor tests - - os: windows - compiler: cl - platform: x86_64 - config: release - warnings-as-errors: false + - warnings-as-errors: false test-category: full full-gpu-tests: false runs-on: [Windows, self-hosted, regression-test] diff --git a/.github/workflows/falcor-compiler-perf-test.yml b/.github/workflows/falcor-compiler-perf-test.yml index 22a9c54962..449944181d 100644 --- a/.github/workflows/falcor-compiler-perf-test.yml +++ b/.github/workflows/falcor-compiler-perf-test.yml @@ -17,13 +17,13 @@ jobs: strategy: fail-fast: false matrix: + os: [windows] + config: [release] + compiler: [cl] + platform: [x86_64] include: # Self-hosted falcor tests - - os: windows - compiler: cl - platform: x86_64 - config: release - warnings-as-errors: false + - warnings-as-errors: false test-category: full full-gpu-tests: false runs-on: [Windows, self-hosted, perf] diff --git a/.github/workflows/falcor-test.yml b/.github/workflows/falcor-test.yml index fee1123209..9dccb6af27 100644 --- a/.github/workflows/falcor-test.yml +++ b/.github/workflows/falcor-test.yml @@ -15,13 +15,13 @@ jobs: strategy: fail-fast: false matrix: + os: [windows] + config: [release] + compiler: [cl] + platform: [x86_64] include: # Self-hosted falcor tests - - os: windows - compiler: cl - platform: x86_64 - config: release - warnings-as-errors: false + - warnings-as-errors: false test-category: full full-gpu-tests: false runs-on: [Windows, self-hosted, falcor] From f2272b2245b1712566e08491ad3c06ccaa700cd1 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 16:49:14 +0800 Subject: [PATCH 137/137] Use Windows SDK 10.0.19041.0 in cmake builds --- .github/actions/common-setup/action.yml | 2 ++ .github/workflows/release.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index ee7524cf80..712a74df52 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -18,6 +18,8 @@ runs: steps: - name: Set up MSVC dev tools on Windows uses: ilammy/msvc-dev-cmd@v1 + with: + sdk: "10.0.19041.0" - shell: bash run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b77f7c7ba3..2fefe5bd9a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,6 +58,7 @@ jobs: uses: ilammy/msvc-dev-cmd@v1 with: arch: ${{matrix.platform == 'aarch64' && 'amd64_arm64' || 'amd64'}} + sdk: "10.0.19041.0" - name: Change dev tools to host arch (linux and macos) run: |