Tighten unified-stride doc/help wording: conflict is with a non-zero stride (#11723)

diagnoseConflictingDescriptorHeapStrideOptions() raises E57006 only when
SPIRVResourceHeapStride != 0; an explicit `-spirv-resource-heap-stride 0` selects
the same default OpConstantSizeOfEXT path that the unified option modifies and is
accepted. Correct the option help text, the slang.h enumerator doc comment, and
all three user-facing doc surfaces to say the unified option is mutually exclusive
with a non-zero -spirv-resource-heap-stride (combining the two is the error),
rather than overstating that supplying the resource-heap-stride option at all
conflicts.

Author: nv-slang-bot[bot]

docs/command-line-slangc-reference.md

@@ -646,7 +646,7 @@ Specify the byte stride for the sampler descriptor heap when generating SPIRV wi
 
 <a id="spirv-unified-descriptor-heap-stride"></a>
 ### -spirv-unified-descriptor-heap-stride
-When generating SPIRV with spvDescriptorHeapEXT, emit each resource descriptor-heap runtime array's ArrayStride as the maximum of image and buffer descriptor sizes, so a single heap shared by buffers and images is indexed at the device's unified stride. Only affects the OpConstantSizeOfEXT default path (when no explicit [-spirv-resource-heap-stride](#spirv-resource-heap-stride) is given); mutually exclusive with [-spirv-resource-heap-stride](#spirv-resource-heap-stride) (supplying both is an error). Does not affect the sampler heap or acceleration-structure entries. 
+When generating SPIRV with spvDescriptorHeapEXT, emit each resource descriptor-heap runtime array's ArrayStride as the maximum of image and buffer descriptor sizes, so a single heap shared by buffers and images is indexed at the device's unified stride. Only affects the default OpConstantSizeOfEXT path (used when [-spirv-resource-heap-stride](#spirv-resource-heap-stride) is 0); mutually exclusive with a non-zero [-spirv-resource-heap-stride](#spirv-resource-heap-stride) (combining the two is an error). Does not affect the sampler heap or acceleration-structure entries. 
 
 
 <a id="separate-debug-info"></a>

docs/user-guide/03-convenience-features.md

@@ -709,9 +709,10 @@ acceleration-structure entries, an explicit resource heap stride must be at leas
 Alternatively, the `-spirv-unified-descriptor-heap-stride` option makes every resource descriptor-heap
 runtime array use a single shared stride equal to the maximum of the image and buffer descriptor sizes,
 so a heap that holds both buffers and images is indexed at the device's unified stride regardless of which
-descriptor type a particular shader accesses. This affects only the default `OpConstantSizeOfEXT` path, so
-it is mutually exclusive with `-spirv-resource-heap-stride` (supplying both is an error). The sampler heap
-and acceleration-structure entries are unaffected.
+descriptor type a particular shader accesses. This affects only the default `OpConstantSizeOfEXT` path
+(used when `-spirv-resource-heap-stride` is 0), so it is mutually exclusive with a non-zero
+`-spirv-resource-heap-stride` (combining the two is an error). The sampler heap and acceleration-structure
+entries are unaffected.
 
 > **Note on `RaytracingAccelerationStructure`:** When the `spvDescriptorHeapEXT` capability is active and
 > a `DescriptorHandle<RaytracingAccelerationStructure>` is dereferenced, Slang loads a 64-bit device address

docs/user-guide/08-compiling.md

@@ -1091,7 +1091,7 @@ meanings of their `CompilerOptionValue` encodings.
 | ValidateUniformity | When set will perform [uniformity analysis](a1-05-uniformity.md).|
 | SPIRVResourceHeapStride | Specifies the byte stride for the resource descriptor heap when generating SPIR-V with `spvDescriptorHeapEXT`. `intValue0` encodes the stride in bytes; use 0 to emit `OpConstantSizeOfEXT(ResourceType)` as the default stride. For `RaytracingAccelerationStructure` entries, the 0 default emits a literal 8-byte `ArrayStride` for the `uint64` device address elements; explicit stride values still override these defaults, but must be at least 8 bytes for acceleration-structure entries. |
 | SPIRVSamplerHeapStride | Specifies the byte stride for the sampler descriptor heap when generating SPIR-V with `spvDescriptorHeapEXT`. `intValue0` encodes the stride in bytes; use 0 to let the driver compute the stride via `OpConstantSizeOfEXT`. |
-| SPIRVUnifiedDescriptorHeapStride | When generating SPIR-V with `spvDescriptorHeapEXT`, emits each resource descriptor-heap runtime array's `ArrayStride` as the maximum of the image and buffer descriptor sizes, so a single heap shared by buffers and images is indexed at the device's unified stride. Only affects the default `OpConstantSizeOfEXT` path; mutually exclusive with `SPIRVResourceHeapStride` (supplying both is an error). Does not affect the sampler heap or acceleration-structure entries. `intValue0` specifies a bool value for the setting. |
+| SPIRVUnifiedDescriptorHeapStride | When generating SPIR-V with `spvDescriptorHeapEXT`, emits each resource descriptor-heap runtime array's `ArrayStride` as the maximum of the image and buffer descriptor sizes, so a single heap shared by buffers and images is indexed at the device's unified stride. Only affects the default `OpConstantSizeOfEXT` path (used when `SPIRVResourceHeapStride` is 0); mutually exclusive with a non-zero `SPIRVResourceHeapStride` (combining the two is an error). Does not affect the sampler heap or acceleration-structure entries. `intValue0` specifies a bool value for the setting. |
 | ForceDXLayout | When set forces the compiler to use DirectX-compatible (HLSL register packing) rules when laying out buffer struct fields during code generation. `intValue0` specifies a bool value for the setting. |
 | ForceCLayout | When set forces the compiler to use C struct layout rules (natural alignment, no HLSL/GLSL padding) when laying out buffer struct fields during code generation. `intValue0` specifies a bool value for the setting. |
 | DenormalModeFp16 | Specifies how 16-bit floating-point denormal values are handled. `intValue0` encodes a value from the `SlangFpDenormalMode` enum. |

include/slang.h

@@ -1207,8 +1207,8 @@ typedef uint32_t SlangSizeT;
             153, // bool: when set, emit each SPIRV resource descriptor-heap runtime array's
                  //   ArrayStride as the maximum of image and buffer descriptor sizes, so a
                  //   single heap shared by buffers and images is indexed at the device's unified
-                 //   stride. Opt-in; mutually exclusive with an explicit
-                 //   `-spirv-resource-heap-stride <N>` (supplying both is an error).
+                 //   stride. Opt-in; mutually exclusive with a non-zero
+                 //   `-spirv-resource-heap-stride` (combining the two is an error).
 
         CountOf,
     };

source/slang/slang-options.cpp

@@ -931,10 +931,9 @@ void initCommandOptions(CommandOptions& options)
          "When generating SPIRV with spvDescriptorHeapEXT, emit each resource descriptor-heap "
          "runtime array's ArrayStride as the maximum of image and buffer descriptor sizes, so "
          "a single heap shared by buffers and images is indexed at the device's unified stride. "
-         "Only affects the OpConstantSizeOfEXT default path (when no explicit "
-         "-spirv-resource-heap-stride is given); mutually exclusive with "
-         "-spirv-resource-heap-stride (supplying both is an error). Does not "
-         "affect the sampler heap or acceleration-structure entries."},
+         "Only affects the default OpConstantSizeOfEXT path (used when -spirv-resource-heap-stride "
+         "is 0); mutually exclusive with a non-zero -spirv-resource-heap-stride (combining the two "
+         "is an error). Does not affect the sampler heap or acceleration-structure entries."},
         {OptionKind::EmitSeparateDebug,
          "-separate-debug-info",
          nullptr,