Merge branch 'master' into fix/workgraphcs_fix_blocking_issue_for_lionel

Author: jkwak-work

.github/workflows/ci.yml

@@ -169,23 +169,26 @@ jobs:
               -server-count 8 \
               -category ${{ matrix.test-category }} \
               -api all-cpu \
-              -expected-failure-list tests/expected-failure-github.txt
+              -expected-failure-list tests/expected-failure-github.txt \
+              -show-adapter-info
           elif [[ "${{matrix.has-gpu}}" == "true" ]]; then
             "$bin_dir/slang-test" \
               -use-test-server \
               -category ${{ matrix.test-category }} \
               -api all-dx12 \
               -expected-failure-list tests/expected-failure-github.txt \
               -expected-failure-list tests/expected-failure-record-replay-tests.txt \
-              -expected-failure-list tests/expected-failure-github-runner.txt
+              -expected-failure-list tests/expected-failure-github-runner.txt \
+              -show-adapter-info
           else
             "$bin_dir/slang-test" \
               -use-test-server \
               -category ${{ matrix.test-category }} \
               -api all-dx12 \
               -expected-failure-list tests/expected-failure-github.txt \
               -expected-failure-list tests/expected-failure-record-replay-tests.txt \
-              -expected-failure-list tests/expected-failure-github-runner.txt
+              -expected-failure-list tests/expected-failure-github-runner.txt \
+              -show-adapter-info
           fi
       - name: Run Slang examples
         if: steps.filter.outputs.should-run == 'true' && matrix.platform != 'wasm' && matrix.full-gpu-tests
@@ -211,7 +214,8 @@ jobs:
             -category ${{ matrix.test-category }} \
             -emit-spirv-via-glsl \
             -api vk \
-            -expected-failure-list tests/expected-failure.txt
+            -expected-failure-list tests/expected-failure.txt \
+            -show-adapter-info
       - uses: actions/upload-artifact@v4
         if: steps.filter.outputs.should-run == 'true' && ! matrix.full-gpu-tests
         with:

.github/workflows/release-linux-glibc-2-17.yml

@@ -35,7 +35,11 @@ jobs:
         id: package
         run: |
           triggering_ref=${{ github.ref_name }}
-          version=${triggering_ref#v}
+          if [[ $triggering_ref =~ ^v[0-9] ]]; then
+            version=${triggering_ref#v}
+          else
+            version=$triggering_ref
+          fi
           base=$(pwd)/slang-${version}-linux-x86_64-glibc-2.17
 
           sudo mv "$(pwd)/build/dist-release/slang.zip" "${base}.zip"

.github/workflows/release.yml

@@ -169,7 +169,12 @@ jobs:
           cpack --preset "$config-debug-info" -G TGZ
 
           triggering_ref=${{ github.ref_name }}
-          base=slang-${triggering_ref#v}-${{matrix.os}}-${{matrix.platform}}
+          if [[ $triggering_ref =~ ^v[0-9] ]]; then
+            version=${triggering_ref#v}
+          else
+            version=$triggering_ref
+          fi
+          base=slang-${version}-${{matrix.os}}-${{matrix.platform}}
 
           # Move main packages
           mv "$(pwd)/build/dist-${config}/slang.zip" "${base}.zip"

CMakeLists.txt

@@ -166,6 +166,55 @@ option(
 )
 mark_as_advanced(SLANG_SPIRV_HEADERS_INCLUDE_DIR)
 
+# Options for user defined paths for external modules.
+advanced_option(
+    SLANG_OVERRIDE_LZ4_PATH
+    "Build using user defined path for LZ4"
+    OFF
+)
+advanced_option(
+    SLANG_OVERRIDE_MINIZ_PATH
+    "Build using user defined path for Miniz"
+    OFF
+)
+advanced_option(
+    SLANG_OVERRIDE_UNORDERED_DENSE_PATH
+    "Build using user defined path for unordered_dense"
+    OFF
+)
+advanced_option(
+    SLANG_OVERRIDE_VULKAN_HEADERS_PATH
+    "Build using user defined path for Vulkan headers"
+    OFF
+)
+advanced_option(
+    SLANG_OVERRIDE_SPIRV_HEADERS_PATH
+    "Build using user defined path for SPIR-V headers"
+    OFF
+)
+advanced_option(
+    SLANG_OVERRIDE_SPIRV_TOOLS_PATH
+    "Build using user defined path for SPIR-V tools"
+    OFF
+)
+advanced_option(
+    SLANG_OVERRIDE_GLSLANG_PATH
+    "Build using user defined path for glslang"
+    OFF
+)
+
+advanced_option(
+    SLANG_EXCLUDE_DAWN
+    "Optionally exclude webgpu_dawn from the build"
+    OFF
+)
+
+advanced_option(
+    SLANG_EXCLUDE_TINT
+    "Optionally exclude slang-tint from the build"
+    OFF
+)
+
 if(${SLANG_USE_SYSTEM_LZ4})
     add_compile_definitions(SLANG_USE_SYSTEM_LZ4_HEADER)
 endif()
@@ -178,6 +227,10 @@ if(${SLANG_USE_SYSTEM_UNORDERED_DENSE})
     add_compile_definitions(SLANG_USE_SYSTEM_UNORDERED_DENSE_HEADER)
 endif()
 
+if(SLANG_OVERRIDE_SPIRV_HEADERS_PATH)
+    add_compile_definitions(SLANG_USE_SYSTEM_SPIRV_HEADER)
+endif()
+
 enum_option(
     SLANG_LIB_TYPE
     # Default
@@ -251,24 +304,28 @@ if(SLANG_SLANG_LLVM_FLAVOR MATCHES FETCH_BINARY)
     )
 endif()
 
-set(webgpu_dawn_release_tag "webgpu_dawn-0")
-if(
-    CMAKE_SYSTEM_NAME MATCHES "Windows"
-    AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64"
-)
-    set(SLANG_WEBGPU_DAWN_BINARY_URL
-        "https://github.com/shader-slang/dawn/releases/download/${webgpu_dawn_release_tag}/webgpu_dawn-windows-x64.zip"
+if(NOT SLANG_EXCLUDE_DAWN)
+    set(webgpu_dawn_release_tag "webgpu_dawn-0")
+    if(
+        CMAKE_SYSTEM_NAME MATCHES "Windows"
+        AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64"
     )
+        set(SLANG_WEBGPU_DAWN_BINARY_URL
+            "https://github.com/shader-slang/dawn/releases/download/${webgpu_dawn_release_tag}/webgpu_dawn-windows-x64.zip"
+        )
+    endif()
 endif()
 
-set(slang_tint_release_tag "slang-tint-0")
-if(
-    CMAKE_SYSTEM_NAME MATCHES "Windows"
-    AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64"
-)
-    set(SLANG_SLANG_TINT_BINARY_URL
-        "https://github.com/shader-slang/dawn/releases/download/${slang_tint_release_tag}/slang-tint-windows-x64.zip"
+if(NOT SLANG_EXCLUDE_TINT)
+    set(slang_tint_release_tag "slang-tint-0")
+    if(
+        CMAKE_SYSTEM_NAME MATCHES "Windows"
+        AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64"
     )
+        set(SLANG_SLANG_TINT_BINARY_URL
+            "https://github.com/shader-slang/dawn/releases/download/${slang_tint_release_tag}/slang-tint-windows-x64.zip"
+        )
+    endif()
 endif()
 
 #

cmake/SlangTarget.cmake

@@ -195,15 +195,90 @@ function(slang_add_target dir type)
     if(type STREQUAL "MODULE")
         set(library_subdir ${module_subdir})
     endif()
+
+    # Respect user-defined CMAKE_*_OUTPUT_DIRECTORY variables if they are set
+    if(DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
+        set(archive_output_dir "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}")
+    else()
+        set(archive_output_dir "${output_dir}/${archive_subdir}")
+    endif()
+
+    if(DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+        set(library_output_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+    else()
+        set(library_output_dir "${output_dir}/${library_subdir}")
+    endif()
+
+    if(DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+        set(runtime_output_dir "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+        set(pdb_output_dir "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+    else()
+        set(runtime_output_dir "${output_dir}/${runtime_subdir}")
+        set(pdb_output_dir "${output_dir}/${runtime_subdir}")
+    endif()
+
     set_target_properties(
         ${target}
         PROPERTIES
-            ARCHIVE_OUTPUT_DIRECTORY "${output_dir}/${archive_subdir}"
-            LIBRARY_OUTPUT_DIRECTORY "${output_dir}/${library_subdir}"
-            RUNTIME_OUTPUT_DIRECTORY "${output_dir}/${runtime_subdir}"
-            PDB_OUTPUT_DIRECTORY "${output_dir}/${runtime_subdir}"
+            ARCHIVE_OUTPUT_DIRECTORY "${archive_output_dir}"
+            LIBRARY_OUTPUT_DIRECTORY "${library_output_dir}"
+            RUNTIME_OUTPUT_DIRECTORY "${runtime_output_dir}"
+            PDB_OUTPUT_DIRECTORY "${pdb_output_dir}"
     )
 
+    # For Multi-Config generators we also need to set per-config output directories
+    # if user-defined paths are provided
+    if(DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
+        set_target_properties(
+            ${target}
+            PROPERTIES
+                ARCHIVE_OUTPUT_DIRECTORY_DEBUG
+                    "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}"
+                ARCHIVE_OUTPUT_DIRECTORY_RELEASE
+                    "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}"
+                ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO
+                    "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}"
+                ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL
+                    "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}"
+        )
+    endif()
+
+    if(DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+        set_target_properties(
+            ${target}
+            PROPERTIES
+                LIBRARY_OUTPUT_DIRECTORY_DEBUG
+                    "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
+                LIBRARY_OUTPUT_DIRECTORY_RELEASE
+                    "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
+                LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO
+                    "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
+                LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL
+                    "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
+        )
+    endif()
+
+    if(DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+        set_target_properties(
+            ${target}
+            PROPERTIES
+                RUNTIME_OUTPUT_DIRECTORY_DEBUG
+                    "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
+                RUNTIME_OUTPUT_DIRECTORY_RELEASE
+                    "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
+                RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO
+                    "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
+                RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL
+                    "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
+                PDB_OUTPUT_DIRECTORY_DEBUG "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
+                PDB_OUTPUT_DIRECTORY_RELEASE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
+                PDB_OUTPUT_DIRECTORY_RELWITHDEBINFO
+                    "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
+                PDB_OUTPUT_DIRECTORY_MINSIZEREL
+                    "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
+        )
+    endif()
+
     set(debug_configs "Debug,RelWithDebInfo")
     if(SLANG_ENABLE_RELEASE_DEBUG_INFO)
         set(debug_configs "Debug,RelWithDebInfo,Release")

docs/user-guide/a3-02-reference-capability-atoms.md

@@ -1076,6 +1076,9 @@ Compound Capabilities
 `shader5_sm_5_0`
 > Capabilities required to use sm_5_0 features apart of GL_ARB_gpu_shader5
 
+`pack_vector`
+> Capabilities required to use pack/unpack intrinsics on packed vector data
+
 `subgroup_basic`
 > Capabilities required to use GLSL-style subgroup operations 'subgroup_basic'