Add Slang shaders to additional samples

bldsys/cmake/global_options.cmake

@@ -117,6 +117,7 @@ set(VKB_WSI_SELECTION "XCB" CACHE STRING "Select WSI target (XCB, XLIB, WAYLAND,
 set(VKB_CLANG_TIDY OFF CACHE STRING "Use CMake Clang Tidy integration")
 set(VKB_CLANG_TIDY_EXTRAS "-header-filter=framework,samples,app;-checks=-*,google-*,-google-runtime-references;--fix;--fix-errors" CACHE STRING "Clang Tidy Parameters")
 set(VKB_PROFILING OFF CACHE BOOL "Enable Tracy profiling")
+set(VKB_SKIP_SLANG_SHADER_COMPILATION OFF CACHE BOOL "Skips compilation for Slang shader")
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "bin/${CMAKE_BUILD_TYPE}/${TARGET_ARCH}")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "lib/${CMAKE_BUILD_TYPE}/${TARGET_ARCH}")

bldsys/cmake/sample_helper.cmake

@@ -246,7 +246,16 @@ endif()
     endif()
 
     # Slang shader compilation
-    if(Vulkan_slang_EXECUTABLE AND DEFINED SHADERS_SLANG)
+    # Skip on MacOS/iOS due to CI/CD using potentially broken slang compiler versions from the SDK
+    # Might revisit once Slang shipped with the SDK is usable
+    set(SLANG_SKIP_COMPILE false)
+    if (($ENV{CI} MATCHES true) AND ((CMAKE_SYSTEM_NAME MATCHES "Darwin") OR (CMAKE_SYSTEM_NAME MATCHES "iOS")))
+        set(SLANG_SKIP_COMPILE true)
+    endif()
+    if(VKB_SKIP_SLANG_SHADER_COMPILATION)
+        set(SLANG_SKIP_COMPILE true)
+    endif()
+    if(NOT SLANG_SKIP_COMPILE AND Vulkan_slang_EXECUTABLE AND DEFINED SHADERS_SLANG)
         set(OUTPUT_FILES "")
         set(SLANG_TARGET_NAME ${PROJECT_NAME}-SLANG)
         foreach(SHADER_FILE_SLANG ${TARGET_SHADERS_SLANG})

docs/build.adoc

@@ -105,6 +105,14 @@ Tracy is not currently enabled for Android builds. In the future, we may add sup
 
 *Default:* `OFF`
 
+=== VKB_SKIP_SLANG_SHADER_COMPILATION
+
+By default, Slang shaders are compiled if a Slang compiler is found on the system. In cases where this is undesirable, set this to `OFF` to disable Slang shader compilation.
+
+You can still select Slang as a shading language target for the samples since Slang shaders are included as precompiled SPIR-V files.
+
+*Default:* `OFF`
+
 == Quality Assurance
 
 We use a small set of tools to provide a level of quality to the project.

framework/vulkan_sample.h

@@ -1113,6 +1113,18 @@ inline bool VulkanSample<bindingType>::prepare(const ApplicationOptions &options
 		}
 	}
 
+	// Shaders generated by Slang require a certain SPIR-V environment that can't be satisfied by Vulkan 1.0, so we need to expliclity up that to at least 1.1 and enable some required extensions
+	if (get_shading_language() == ShadingLanguage::SLANG)
+	{
+		if (api_version < VK_API_VERSION_1_1)
+		{
+			api_version = VK_API_VERSION_1_1;
+		}
+		add_device_extension(VK_KHR_SPIRV_1_4_EXTENSION_NAME);
+		add_device_extension(VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME);
+		add_device_extension(VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME);
+	}
+
 #ifdef VKB_ENABLE_PORTABILITY
 	// VK_KHR_portability_subset must be enabled if present in the implementation (e.g on macOS/iOS with beta extensions enabled)
 	add_device_extension(VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME, /*optional=*/true);

samples/api/compute_nbody/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2024, Sascha Willems
+# Copyright (c) 2019-2025, Sascha Willems
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -34,4 +34,9 @@ add_sample_with_tags(
         "compute_nbody/hlsl/particle.vert.hlsl"
         "compute_nbody/hlsl/particle.frag.hlsl"
         "compute_nbody/hlsl/particle_calculate.comp.hlsl"
-        "compute_nbody/hlsl/particle_integrate.comp.hlsl")
+        "compute_nbody/hlsl/particle_integrate.comp.hlsl"
+    SHADER_FILES_SLANG
+        "compute_nbody/slang/particle.vert.slang"
+        "compute_nbody/slang/particle.frag.slang"
+        "compute_nbody/slang/particle_calculate.comp.slang"
+        "compute_nbody/slang/particle_integrate.comp.slang")

samples/api/dynamic_uniform_buffers/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2024, Sascha Willems
+# Copyright (c) 2019-2025, Sascha Willems
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -30,4 +30,7 @@ add_sample_with_tags(
         "dynamic_uniform_buffers/glsl/base.frag"
     SHADER_FILES_HLSL
         "dynamic_uniform_buffers/hlsl/base.vert.hlsl"
-        "dynamic_uniform_buffers/hlsl/base.frag.hlsl")
+        "dynamic_uniform_buffers/hlsl/base.frag.hlsl"
+    SHADER_FILES_SLANG
+        "dynamic_uniform_buffers/slang/base.vert.slang"
+        "dynamic_uniform_buffers/slang/base.frag.slang")

samples/api/hdr/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2024, Sascha Willems
+# Copyright (c) 2019-2025, Sascha Willems
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -38,4 +38,11 @@ add_sample_with_tags(
         "hdr/hlsl/bloom.vert.hlsl"
         "hdr/hlsl/bloom.frag.hlsl"
         "hdr/hlsl/gbuffer.vert.hlsl"
-        "hdr/hlsl/gbuffer.frag.hlsl")
+        "hdr/hlsl/gbuffer.frag.hlsl"
+    SHADER_FILES_SLANG
+        "hdr/slang/composition.vert.slang"
+        "hdr/slang/composition.frag.slang"
+        "hdr/slang/bloom.vert.slang"
+        "hdr/slang/bloom.frag.slang"
+        "hdr/slang/gbuffer.vert.slang"
+        "hdr/slang/gbuffer.frag.slang")

samples/api/hello_triangle/hello_triangle.cpp

@@ -287,6 +287,14 @@ void HelloTriangle::init_device()
 
 	// Since this sample has visual output, the device needs to support the swapchain extension
 	std::vector<const char *> required_device_extensions{VK_KHR_SWAPCHAIN_EXTENSION_NAME};
+	// Shaders generated by Slang require a certain SPIR-V environment that can't be satisfied by Vulkan 1.0, so we need to expliclity up that to at least 1.1 and enable some required extensions
+	if (get_shading_language() == vkb::ShadingLanguage::SLANG)
+	{
+		required_device_extensions.push_back(VK_KHR_SPIRV_1_4_EXTENSION_NAME);
+		required_device_extensions.push_back(VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME);
+		required_device_extensions.push_back(VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME);
+	}
+
 	if (!validate_extensions(required_device_extensions, device_extensions))
 	{
 		throw std::runtime_error("Required device extensions are missing.");

samples/api/hpp_compute_nbody/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2022-2025, NVIDIA CORPORATION. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -34,4 +34,9 @@ add_sample_with_tags(
         "compute_nbody/hlsl/particle.vert.hlsl"
         "compute_nbody/hlsl/particle.frag.hlsl"
         "compute_nbody/hlsl/particle_calculate.comp.hlsl"
-        "compute_nbody/hlsl/particle_integrate.comp.hlsl")
+        "compute_nbody/hlsl/particle_integrate.comp.hlsl"
+    SHADER_FILES_SLANG
+        "compute_nbody/slang/particle.vert.slang"
+        "compute_nbody/slang/particle.frag.slang"
+        "compute_nbody/slang/particle_calculate.comp.slang"
+        "compute_nbody/slang/particle_integrate.comp.slang")

samples/api/hpp_dynamic_uniform_buffers/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2024, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2021-2025, NVIDIA CORPORATION. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -30,4 +30,7 @@ add_sample_with_tags(
         "dynamic_uniform_buffers/glsl/base.frag"
     SHADER_FILES_HLSL
         "dynamic_uniform_buffers/hlsl/base.vert.hlsl"
-        "dynamic_uniform_buffers/hlsl/base.frag.hlsl")
+        "dynamic_uniform_buffers/hlsl/base.frag.hlsl"
+    SHADER_FILES_SLANG
+        "dynamic_uniform_buffers/slang/base.vert.slang"
+        "dynamic_uniform_buffers/slang/base.frag.slang")

samples/api/hpp_hdr/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2022-2025, NVIDIA CORPORATION. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -38,4 +38,11 @@ add_sample_with_tags(
         "hdr/hlsl/bloom.vert.hlsl"
         "hdr/hlsl/bloom.frag.hlsl"
         "hdr/hlsl/gbuffer.vert.hlsl"
-        "hdr/hlsl/gbuffer.frag.hlsl")
+        "hdr/hlsl/gbuffer.frag.hlsl"
+    SHADER_FILES_SLANG
+        "hdr/slang/composition.vert.slang"
+        "hdr/slang/composition.frag.slang"
+        "hdr/slang/bloom.vert.slang"
+        "hdr/slang/bloom.frag.slang"
+        "hdr/slang/gbuffer.vert.slang"
+        "hdr/slang/gbuffer.frag.slang")

samples/api/hpp_instancing/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2022-2025, NVIDIA CORPORATION. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -38,4 +38,11 @@ add_sample_with_tags(
         "instancing/hlsl/planet.vert.hlsl"
         "instancing/hlsl/planet.frag.hlsl"
         "instancing/hlsl/starfield.vert.hlsl"
-        "instancing/hlsl/starfield.frag.hlsl")
+        "instancing/hlsl/starfield.frag.hlsl"
+    SHADER_FILES_SLANG
+        "instancing/slang/instancing.vert.slang"
+        "instancing/slang/instancing.frag.slang"
+        "instancing/slang/planet.vert.slang"
+        "instancing/slang/planet.frag.slang"
+        "instancing/slang/starfield.vert.slang"
+        "instancing/slang/starfield.frag.slang")

samples/api/hpp_separate_image_sampler/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2022-2025, NVIDIA CORPORATION. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -30,4 +30,7 @@ add_sample_with_tags(
         "separate_image_sampler/glsl/separate_image_sampler.frag"
     SHADER_FILES_HLSL
         "separate_image_sampler/hlsl/separate_image_sampler.vert.hlsl"
-        "separate_image_sampler/hlsl/separate_image_sampler.frag.hlsl")
+        "separate_image_sampler/hlsl/separate_image_sampler.frag.hlsl"
+    SHADER_FILES_SLANG
+        "separate_image_sampler/slang/separate_image_sampler.vert.slang"
+        "separate_image_sampler/slang/separate_image_sampler.frag.slang")

samples/api/hpp_terrain_tessellation/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2022-2025, NVIDIA CORPORATION. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -38,4 +38,11 @@ add_sample_with_tags(
         "terrain_tessellation/hlsl/terrain.tesc.hlsl"
         "terrain_tessellation/hlsl/terrain.tese.hlsl"
         "terrain_tessellation/hlsl/skysphere.vert.hlsl"
-        "terrain_tessellation/hlsl/skysphere.frag.hlsl")
+        "terrain_tessellation/hlsl/skysphere.frag.hlsl"
+    SHADER_FILES_SLANG
+        "terrain_tessellation/slang/terrain.vert.slang"
+        "terrain_tessellation/slang/terrain.frag.slang"
+        "terrain_tessellation/slang/terrain.tesc.slang"
+        "terrain_tessellation/slang/terrain.tese.slang"
+        "terrain_tessellation/slang/skysphere.vert.slang"
+        "terrain_tessellation/slang/skysphere.frag.slang")

samples/api/hpp_texture_loading/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2024, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2021-2025, NVIDIA CORPORATION. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -30,4 +30,7 @@ add_sample_with_tags(
         "texture_loading/glsl/texture.frag"
     SHADER_FILES_HLSL
         "texture_loading/hlsl/texture.vert.hlsl"
-        "texture_loading/hlsl/texture.frag.hlsl")
+        "texture_loading/hlsl/texture.frag.hlsl"
+    SHADER_FILES_SLANG
+        "texture_loading/slang/texture.vert.slang"
+        "texture_loading/slang/texture.frag.slang")

samples/api/hpp_texture_mipmap_generation/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2022-2025, NVIDIA CORPORATION. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -30,4 +30,7 @@ add_sample_with_tags(
         "texture_mipmap_generation/glsl/texture.frag"
     SHADER_FILES_HLSL
         "texture_mipmap_generation/hlsl/texture.vert.hlsl"
-        "texture_mipmap_generation/hlsl/texture.frag.hlsl")
+        "texture_mipmap_generation/hlsl/texture.frag.hlsl"
+    SHADER_FILES_SLANG
+        "texture_mipmap_generation/slang/texture.vert.slang"
+        "texture_mipmap_generation/slang/texture.frag.slang")

samples/api/hpp_timestamp_queries/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2023-2024, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2023-2025, NVIDIA CORPORATION. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -38,4 +38,11 @@ add_sample_with_tags(
         "hdr/hlsl/bloom.vert.hlsl"
         "hdr/hlsl/bloom.frag.hlsl"
         "hdr/hlsl/gbuffer.vert.hlsl"
-        "hdr/hlsl/gbuffer.frag.hlsl")
+        "hdr/hlsl/gbuffer.frag.hlsl"
+    SHADER_FILES_SLANG
+        "hdr/slang/composition.vert.slang"
+        "hdr/slang/composition.frag.slang"
+        "hdr/slang/bloom.vert.slang"
+        "hdr/slang/bloom.frag.slang"
+        "hdr/slang/gbuffer.vert.slang"
+        "hdr/slang/gbuffer.frag.slang")

samples/api/instancing/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2024, Sascha Willems
+# Copyright (c) 2019-2025, Sascha Willems
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -38,4 +38,11 @@ add_sample_with_tags(
         "instancing/hlsl/planet.vert.hlsl"
         "instancing/hlsl/planet.frag.hlsl"
         "instancing/hlsl/starfield.vert.hlsl"
-        "instancing/hlsl/starfield.frag.hlsl")
+        "instancing/hlsl/starfield.frag.hlsl"
+    SHADER_FILES_SLANG
+        "instancing/slang/instancing.vert.slang"
+        "instancing/slang/instancing.frag.slang"
+        "instancing/slang/planet.vert.slang"
+        "instancing/slang/planet.frag.slang"
+        "instancing/slang/starfield.vert.slang"
+        "instancing/slang/starfield.frag.slang")

samples/api/separate_image_sampler/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2024, Sascha Willems
+# Copyright (c) 2021-2025, Sascha Willems
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -30,4 +30,7 @@ add_sample_with_tags(
         "separate_image_sampler/glsl/separate_image_sampler.frag"
     SHADER_FILES_HLSL
         "separate_image_sampler/hlsl/separate_image_sampler.vert.hlsl"
-        "separate_image_sampler/hlsl/separate_image_sampler.frag.hlsl")
+        "separate_image_sampler/hlsl/separate_image_sampler.frag.hlsl"
+    SHADER_FILES_SLANG
+        "separate_image_sampler/slang/separate_image_sampler.vert.slang"
+        "separate_image_sampler/slang/separate_image_sampler.frag.slang")

samples/api/terrain_tessellation/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2024, Sascha Willems
+# Copyright (c) 2019-2025, Sascha Willems
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -38,4 +38,11 @@ add_sample_with_tags(
         "terrain_tessellation/hlsl/terrain.tesc.hlsl"
         "terrain_tessellation/hlsl/terrain.tese.hlsl"
         "terrain_tessellation/hlsl/skysphere.vert.hlsl"
-        "terrain_tessellation/hlsl/skysphere.frag.hlsl")
+        "terrain_tessellation/hlsl/skysphere.frag.hlsl"
+    SHADER_FILES_SLANG
+        "terrain_tessellation/slang/terrain.vert.slang"
+        "terrain_tessellation/slang/terrain.frag.slang"
+        "terrain_tessellation/slang/terrain.tesc.slang"
+        "terrain_tessellation/slang/terrain.tese.slang"
+        "terrain_tessellation/slang/skysphere.vert.slang"
+        "terrain_tessellation/slang/skysphere.frag.slang")

samples/api/texture_loading/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2024, Sascha Willems
+# Copyright (c) 2019-2025, Sascha Willems
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -30,4 +30,7 @@ add_sample_with_tags(
         "texture_loading/glsl/texture.frag"
     SHADER_FILES_HLSL
         "texture_loading/hlsl/texture.vert.hlsl"
-        "texture_loading/hlsl/texture.frag.hlsl")
+        "texture_loading/hlsl/texture.frag.hlsl"
+    SHADER_FILES_SLANG
+        "texture_loading/slang/texture.vert.slang"
+        "texture_loading/slang/texture.frag.slang")

samples/api/texture_mipmap_generation/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2024, Sascha Willems
+# Copyright (c) 2019-2025, Sascha Willems
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -30,4 +30,7 @@ add_sample_with_tags(
         "texture_mipmap_generation/glsl/texture.frag"
     SHADER_FILES_HLSL
         "texture_mipmap_generation/hlsl/texture.vert.hlsl"
-        "texture_mipmap_generation/hlsl/texture.frag.hlsl")
+        "texture_mipmap_generation/hlsl/texture.frag.hlsl"
+    SHADER_FILES_SLANG
+        "texture_mipmap_generation/slang/texture.vert.slang"
+        "texture_mipmap_generation/slang/texture.frag.slang")

samples/api/timestamp_queries/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024, Sascha Willems
+# Copyright (c) 2022-2025, Sascha Willems
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -38,4 +38,11 @@ add_sample_with_tags(
         "hdr/hlsl/bloom.vert.hlsl"
         "hdr/hlsl/bloom.frag.hlsl"
         "hdr/hlsl/gbuffer.vert.hlsl"
-        "hdr/hlsl/gbuffer.frag.hlsl")
+        "hdr/hlsl/gbuffer.frag.hlsl"
+    SHADER_FILES_SLANG
+        "hdr/slang/composition.vert.slang"
+        "hdr/slang/composition.frag.slang"
+        "hdr/slang/bloom.vert.slang"
+        "hdr/slang/bloom.frag.slang"
+        "hdr/slang/gbuffer.vert.slang"
+        "hdr/slang/gbuffer.frag.slang")