fix: improve error handling in ShaderPipelineBuilder

.github/workflows/build-reusable.yml

@@ -167,18 +167,32 @@ jobs:
 
           # shellcheck disable=SC2086  # intentional word-splitting for flag vars
           # vnesc builds static archives; CACHE_LIB_TYPE only selects the build/ dir name.
+          #
+          # Dawn/Tint OOMs GitHub-hosted runners when every matrix cell builds it.
+          # Default CI to Tint OFF; opt in per-job with -DVNE_SC_TINT=ON in extra_cmake_flags.
+          TINT_FLAG="-DVNE_SC_TINT=OFF"
+          if [[ "$EXTRA_FLAGS" == *VNE_SC_TINT* ]]; then
+            TINT_FLAG=""
+          fi
+
           cmake -B "$BUILD_DIR" -S . \
             -DCMAKE_BUILD_TYPE="$EFFECTIVE_BUILD_TYPE" \
             -DVNE_SC_CI=ON \
             -DWARNINGS_AS_ERRORS="$WAE" \
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
             ${COVERAGE_FLAG} \
             ${COMPILER_FLAGS} \
+            ${TINT_FLAG} \
             ${EXTRA_FLAGS}
 
       - name: Build
         shell: bash
-        run: cmake --build "$BUILD_DIR" --config "$EFFECTIVE_BUILD_TYPE" --parallel
+        run: |
+          # Unconstrained --parallel OOMs while compiling Dawn/Tint + Abseil
+          # (Linux "Killed", exit 143). Cap CI concurrency for memory headroom.
+          JOBS="${CMAKE_BUILD_PARALLEL_LEVEL:-2}"
+          echo "Building with --parallel ${JOBS}"
+          cmake --build "$BUILD_DIR" --config "$EFFECTIVE_BUILD_TYPE" --parallel "${JOBS}"
 
       - name: Verify coverage instrumentation (coverage builds only, Linux)
         if: runner.os == 'Linux' && inputs.enable_coverage

.github/workflows/ci.yml

@@ -219,6 +219,8 @@ jobs:
       build_type:         Release
       enable_coverage:    false
       warnings_as_errors: true
+      # Sole Tint-on matrix cell (reusable defaults -DVNE_SC_TINT=OFF).
+      extra_cmake_flags:  "-DVNE_SC_TINT=ON"
       lib_type:           static
     secrets: inherit
 
@@ -318,8 +320,9 @@ jobs:
               -DCMAKE_C_COMPILER=clang \
               -DCMAKE_CXX_COMPILER=clang++ \
               -DVNE_SC_CI=ON \
+              -DVNE_SC_TINT=ON \
               -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-            cmake --build build/static --config Release --parallel
+            cmake --build build/static --config Release --parallel 2
           fi
 
       - name: Run clang-tidy

.github/workflows/codeql.yml

@@ -69,8 +69,10 @@ jobs:
           cmake -B build/static -S . \
             -DCMAKE_BUILD_TYPE=Release \
             -DVNE_SC_CI=ON \
+            -DVNE_SC_TINT=OFF \
             -DWARNINGS_AS_ERRORS=OFF
-          cmake --build build/static --config Release --parallel
+          # Cap parallelism: Dawn/Tint + Abseil OOMs under full --parallel.
+          cmake --build build/static --config Release --parallel 2
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3

CMakeLists.txt

@@ -137,7 +137,7 @@ option(VNE_SC_GLSLANG    "Enable glslang GLSL->SPIR-V front-end (Phase 1, primar
 option(VNE_SC_DXC        "Enable DXC HLSL->SPIR-V front-end (Phase 2 - stub only)" OFF)
 option(VNE_SC_SLANG      "Enable Slang front-end (Phase 3 - stub only)" OFF)
 option(VNE_SC_SPIRVTOOLS "Enable SPIRV-Tools SPIR-V validator (OFF = no-op validator)" OFF)
-option(VNE_SC_TINT       "Enable Dawn Tint SPIR-V->WGSL cross-compiler (slow first configure)" OFF)
+option(VNE_SC_TINT       "Enable Dawn Tint SPIR-V->WGSL cross-compiler (slow first configure)" ON)
 option(VNE_SC_JSON       "Enable nlohmann/json for manifests and bundle metadata" ON)
 
 option(ENABLE_DOXYGEN "Enable Doxygen documentation builds" OFF)

README.md

@@ -258,7 +258,7 @@ A compiled `.vneshader` is a directory:
 | File | Contents |
 |------|----------|
 | `bundle.header` | Binary index: stage list, entry points, file names |
-| `reflection.bin` | Binary `ProgramReflection` (v2 format) |
+| `reflection.bin` | Binary `ProgramReflection` (v3 format) |
 | `manifest.json` | Human-readable index (when `VNE_SC_JSON` is enabled) |
 | `<stage>.spv` | SPIR-V bytecode |
 | `<stage>.msl` | MSL source (when `msl` target requested) |

cmake/Dependencies.cmake

@@ -267,16 +267,61 @@ if(VNE_SC_TINT)
     # library that has negligible benefit from debug symbols.
     set(_vne_sc_saved_build_type "${CMAKE_BUILD_TYPE}")
     set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
+    # Pin is fixed (chromium/6723). Skip ExternalProject update on reconfigure when
+    # that revision is already present: modern Git defaults to
+    # fetch.recurseSubmodules=on-demand, and Dawn's DAWN_FETCH_DEPENDENCIES
+    # checkouts often lack an `origin` remote, so a plain `git fetch` on dawn-src
+    # fails mid-configure. If the shallow checkout is missing the pin, wipe it so
+    # FetchContent re-clones (still without submodule recursion).
+    set(_vne_sc_dawn_tag "chromium/6723")
+    set(_vne_sc_dawn_src "${CMAKE_BINARY_DIR}/_deps/dawn-src")
+    if(EXISTS "${_vne_sc_dawn_src}/.git")
+        find_package(Git QUIET)
+        if(Git_FOUND)
+            execute_process(
+                COMMAND "${GIT_EXECUTABLE}" rev-parse --verify --quiet "${_vne_sc_dawn_tag}^{commit}"
+                WORKING_DIRECTORY "${_vne_sc_dawn_src}"
+                RESULT_VARIABLE _vne_sc_dawn_tag_ok
+                OUTPUT_QUIET
+                ERROR_QUIET)
+            set(_vne_sc_dawn_head "")
+            set(_vne_sc_dawn_wanted "")
+            if(_vne_sc_dawn_tag_ok EQUAL 0)
+                execute_process(
+                    COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD
+                    WORKING_DIRECTORY "${_vne_sc_dawn_src}"
+                    OUTPUT_VARIABLE _vne_sc_dawn_head
+                    OUTPUT_STRIP_TRAILING_WHITESPACE
+                    ERROR_QUIET)
+                execute_process(
+                    COMMAND "${GIT_EXECUTABLE}" rev-parse "${_vne_sc_dawn_tag}^{commit}"
+                    WORKING_DIRECTORY "${_vne_sc_dawn_src}"
+                    OUTPUT_VARIABLE _vne_sc_dawn_wanted
+                    OUTPUT_STRIP_TRAILING_WHITESPACE
+                    ERROR_QUIET)
+            endif()
+            if(NOT _vne_sc_dawn_tag_ok EQUAL 0 OR NOT _vne_sc_dawn_head STREQUAL _vne_sc_dawn_wanted)
+                message(STATUS
+                    "[vnesc] Dawn checkout missing or not at ${_vne_sc_dawn_tag}; "
+                    "removing for FetchContent re-populate")
+                file(REMOVE_RECURSE
+                    "${CMAKE_BINARY_DIR}/_deps/dawn-src"
+                    "${CMAKE_BINARY_DIR}/_deps/dawn-build"
+                    "${CMAKE_BINARY_DIR}/_deps/dawn-subbuild")
+            endif()
+        endif()
+    endif()
     FetchContent_Declare(dawn
-        GIT_REPOSITORY       https://dawn.googlesource.com/dawn
-        GIT_TAG              chromium/6723
-        GIT_SHALLOW          TRUE
-        GIT_SUBMODULES       ""
-        GIT_SUBMODULES_RECURSE FALSE)
+        GIT_REPOSITORY         https://dawn.googlesource.com/dawn
+        GIT_TAG                ${_vne_sc_dawn_tag}
+        GIT_SHALLOW            TRUE
+        GIT_SUBMODULES         ""
+        GIT_SUBMODULES_RECURSE FALSE
+        UPDATE_DISCONNECTED    TRUE)
     FetchContent_MakeAvailable(dawn)
     _vne_sc_fix_dawn_abseil_randen_copts()
     set(CMAKE_BUILD_TYPE "${_vne_sc_saved_build_type}" CACHE STRING "" FORCE)
-    message(STATUS "[vnesc] Dawn/Tint -> FetchContent chromium/6723 (Release build)")
+    message(STATUS "[vnesc] Dawn/Tint -> FetchContent ${_vne_sc_dawn_tag} (Release build)")
 endif()
 
 #==============================================================================
@@ -310,6 +355,11 @@ function(vne_sc_link_tint target)
         message(FATAL_ERROR "vne_sc_link_tint: no libtint or tint target found from Dawn")
     endif()
     target_compile_definitions(${target} PRIVATE VNE_SC_TINT_ENABLED)
+    # Tint BlockAllocator uses alignas; MSVC C4324 (structure padded) is expected
+    # and must not fail WARNINGS_AS_ERRORS=/WX when compiling our Tint wrappers.
+    if(MSVC)
+        target_compile_options(${target} PRIVATE /wd4324)
+    endif()
 endfunction()
 
 #==============================================================================

include/vertexnova/sc/sc_types.h

@@ -185,6 +185,10 @@ struct ResourceBackendSlots {
 };
 
 /// Classifies a reflected shader resource.
+///
+/// @note Values must stay numerically identical to `vne::rhi::ReflectedResourceType`
+/// (vnerhi/include/vertexnova/rhi/shader_reflection.h). `reflection.bin` stores the raw
+/// value and vnerhi casts it straight across.
 enum class ReflectedResourceType : uint8_t {
     eUniformBuffer = 0,
     eStorageBuffer = 1,
@@ -194,6 +198,10 @@ enum class ReflectedResourceType : uint8_t {
     ePushConstant = 5,
     eCombinedImageSampler = 6,
     eSampledCubemap = 7,
+    eSampled2DArray = 8,          ///< texture2DArray / texture_2d_array<f32>
+    eSampledCubeArray = 9,        ///< textureCubeArray / texture_cube_array<f32>
+    eReadOnlyStorageBuffer = 10,  ///< SSBO declared readonly (WGSL `storage, read`)
+    eSampledImage3D = 11,         ///< texture3D / texture_3d<f32>
 };
 
 /// A single member of a reflected struct (e.g. a field inside a uniform block).
@@ -219,6 +227,18 @@ struct ReflectedBindingInfo {
     ShaderStageFlags stages = ShaderStageFlags::eNone;
     ResourceBackendSlots slots;
     std::vector<ReflectedStructMember> struct_members;  ///< Non-empty for buffer types.
+
+    // ----- Fields WebGPU needs to build a bind-group layout (reflection.bin v3) -----
+    /// Storage-texture format, e.g. "rgba16float". Empty for non-storage-image bindings.
+    std::string storage_format_hint;
+    /// Storage-texture access: "read", "write", or "read_write". Empty when not applicable.
+    std::string storage_access_hint;
+    /// True for multisampled textures (`texture2DMS`, WGSL `texture_multisampled_2d`).
+    bool multisampled = false;
+    /// True for depth textures (WGSL `texture_depth_2d` and friends) -- drives the sample type.
+    bool depth_texture = false;
+    /// The buffer is re-offset per draw. Not derivable from SPIR-V; set by tooling/renderer.
+    bool dynamic_offset = false;
 };
 
 /// Workgroup size for compute shaders.

include/vertexnova/sc/shader_pipeline_builder.h

@@ -72,7 +72,8 @@ struct PipelineBuildResult {
  * Per stage the pipeline is:
  *  -# Cache lookup (key includes a source-level program fingerprint for MSL dense maps).
  *  -# On miss: @ref IShaderFrontEnd::compile, optional validate, reflect, cross-compile, store.
- *  -# On hit: reuse the cached @ref StageArtifact (no front-end compile).
+ *  -# On hit: reuse the cached @ref StageArtifact when it covers every requested
+ *     target (no front-end compile); incomplete entries are rebuilt.
  *
  * When any stage misses and MSL dense program maps are enabled, one shared
  * @ref MetalBindingAllocator is built from the union of all stage SPIR-V

include/vertexnova/sc/shader_reflection_binary.h

@@ -13,6 +13,12 @@
 /**
  * @file shader_reflection_binary.h
  * @brief Binary serialization for @ref StageReflection and @ref ProgramReflection.
+ *
+ * @c ProgramReflection blobs (@c reflection.bin) use format version 3.0.0
+ * (@c 0x00030000). Deserialization requires an exact version match; regenerate
+ * stale bundles. Version 3 stores the WebGPU bind-group fields on each binding
+ * (@c storage_format_hint, @c storage_access_hint, @c multisampled,
+ * @c depth_texture, @c dynamic_offset).
  */
 
 #include "sc_types.h"

src/vertexnova/sc/frontend/glslang_frontend.cpp

@@ -28,7 +28,7 @@ namespace {
 
 constexpr std::streamsize kMaxShaderFileBytes = 64 * 1024 * 1024;
 
-struct GlslangProcessLifetime {
+struct GlslangProcessGuard {
     std::mutex mutex;
     int refs = 0;
     bool process_ok = false;
@@ -57,9 +57,9 @@ struct GlslangProcessLifetime {
     }
 };
 
-GlslangProcessLifetime& glslangProcessLifetime() {
-    static GlslangProcessLifetime s_lifetime;
-    return s_lifetime;
+GlslangProcessGuard& glslangProcessGuard() {
+    static GlslangProcessGuard s_guard;
+    return s_guard;
 }
 
 bool readBinaryFile(std::ifstream& file, std::string& out) {
@@ -183,7 +183,7 @@ std::string buildPreamble(const std::vector<vne::sc::ShaderMacro>& macros) {
 namespace vne::sc {
 
 GlslangFrontEnd::GlslangFrontEnd()
-    : initialized_(glslangProcessLifetime().acquire()) {
+    : initialized_(glslangProcessGuard().acquire()) {
     if (!initialized_) {
         VNE_LOG_ERROR << "GlslangFrontEnd: glslang::InitializeProcess() failed";
     } else {
@@ -193,7 +193,7 @@ GlslangFrontEnd::GlslangFrontEnd()
 
 GlslangFrontEnd::~GlslangFrontEnd() {
     if (initialized_) {
-        glslangProcessLifetime().release();
+        glslangProcessGuard().release();
         initialized_ = false;
     }
 }

src/vertexnova/sc/gpu_layout_tools.cpp

@@ -244,6 +244,18 @@ std::string emitSingleBinding(const ReflectedBindingInfo& binding) {
             }
             out << "} " << blockNameToInstance(binding.name) << ";\n\n";
             break;
+        case ReflectedResourceType::eReadOnlyStorageBuffer:
+            out << "layout(std430, set = " << binding.set << ", binding = " << binding.binding << ") readonly buffer "
+                << binding.name << " {\n";
+            if (binding.struct_members.empty()) {
+                out << "    float data[];\n";
+            } else {
+                for (const auto& member : binding.struct_members) {
+                    emitMemberDecl(out, memberGlslType(member), member);
+                }
+            }
+            out << "} " << blockNameToInstance(binding.name) << ";\n\n";
+            break;
         case ReflectedResourceType::eSampler:
             out << "layout(set = " << binding.set << ", binding = " << binding.binding << ") uniform sampler "
                 << binding.name << ";\n\n";
@@ -252,10 +264,22 @@ std::string emitSingleBinding(const ReflectedBindingInfo& binding) {
             out << "layout(set = " << binding.set << ", binding = " << binding.binding << ") uniform texture2D "
                 << binding.name << ";\n\n";
             break;
+        case ReflectedResourceType::eSampled2DArray:
+            out << "layout(set = " << binding.set << ", binding = " << binding.binding << ") uniform texture2DArray "
+                << binding.name << ";\n\n";
+            break;
         case ReflectedResourceType::eSampledCubemap:
             out << "layout(set = " << binding.set << ", binding = " << binding.binding << ") uniform textureCube "
                 << binding.name << ";\n\n";
             break;
+        case ReflectedResourceType::eSampledCubeArray:
+            out << "layout(set = " << binding.set << ", binding = " << binding.binding << ") uniform textureCubeArray "
+                << binding.name << ";\n\n";
+            break;
+        case ReflectedResourceType::eSampledImage3D:
+            out << "layout(set = " << binding.set << ", binding = " << binding.binding << ") uniform texture3D "
+                << binding.name << ";\n\n";
+            break;
         case ReflectedResourceType::eCombinedImageSampler:
             out << "layout(set = " << binding.set << ", binding = " << binding.binding << ") uniform sampler2D "
                 << binding.name << ";\n\n";