Skip to content

Commit 3a48114

Browse files
Renumber SPIRVUnifiedDescriptorHeapStride 153 -> 154
At merge time this PR collided with the concurrently-queued #11556, which appends CompilerVersion = 153 to CompilerOptionName. Both PRs branched when the enum tail was TraceCoverageBoolean = 152 and each took the next free value 153, producing a `duplicate case value` build break in the OptionKind switch (slang-options.cpp) once combined in a merge group. Yield 153 to #11556's CompilerVersion and append this option at 154 instead. Append-only, so no existing enumerator value shifts (ABI-safe). The two now hold distinct values regardless of merge order.
1 parent acfd653 commit 3a48114

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

include/slang.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1204,7 +1204,7 @@ typedef uint32_t SlangSizeT;
12041204
// watchdog timeouts heavy coverage can trigger) at the cost of exact
12051205
// counts. Off by default.
12061206
SPIRVUnifiedDescriptorHeapStride =
1207-
153, // bool: when set, emit each SPIRV resource descriptor-heap runtime array's
1207+
154, // bool: when set, emit each SPIRV resource descriptor-heap runtime array's
12081208
// ArrayStride as the maximum of image and buffer descriptor sizes, so a
12091209
// single heap shared by buffers and images is indexed at the device's unified
12101210
// stride. Opt-in; mutually exclusive with a non-zero

0 commit comments

Comments
 (0)