diff options
| author | Harsh Aggarwal (NVIDIA) <haaggarwal@nvidia.com> | 2025-08-01 14:48:53 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-01 09:18:53 +0000 |
| commit | bdda8a90cdd44ca822b21233ac988f92d1f20826 (patch) | |
| tree | 4f628776a047b2719aee676287b3adc9d4f68f7a /tests/reflection | |
| parent | 7a133445ef82232a6961c25d09b79f45cd92e709 (diff) | |
Fix 7441: CUDA boolean vector layout to use 1-byte elements (#7862)
* Fix 7441: CUDA boolean vector layout to use 1-byte elements
Boolean vectors (bool1, bool2, bool3, bool4) were incorrectly implemented
as integer-based types using 4 bytes per element instead of actual 1-byte
boolean elements on CUDA targets.
Changes:
- Update CUDA prelude to define boolean vectors as structs with bool fields
instead of typedef aliases to integer vectors
- Implement CUDALayoutRulesImpl::GetVectorLayout to use 1-byte alignment
for boolean vectors, matching actual CUDA memory layout behavior
- Update make_bool functions to populate struct fields correctly
This ensures boolean vectors have the same memory layout as bool[4] arrays:
- bool1: 1 byte (was 4 bytes)
- bool2: 2 bytes (was 8 bytes)
- bool3: 3 bytes (was 12 bytes)
- bool4: 4 bytes (was 16 bytes)
Fixes memory layout mismatch between Slang reflection API and actual
CUDA compilation, achieving 75% memory savings for boolean vector usage.
* Fix CI issues -
Add and update associated functions and operators
* Make boolX same as uchar
* Use align construct on struct for boolX
* Improve Test case for robust alignment checks
* Formatting
* Disable selected slangpy tests
* add metal check which is slightly different than cuda
* Test-1
* Test-2
* Test-3
* Test-4
* ReflectionChange
* cleanup and update
* _slang_select with plain bool is needed for reverse-loop-checkpoint-test
Diffstat (limited to 'tests/reflection')
25 files changed, 226 insertions, 226 deletions
diff --git a/tests/reflection/acceleration-structure.slang b/tests/reflection/acceleration-structure.slang index cfb7d232b..cbff7784d 100644 --- a/tests/reflection/acceleration-structure.slang +++ b/tests/reflection/acceleration-structure.slang @@ -1,6 +1,6 @@ //TEST(64-bit):REFLECTION(filecheck=CHECK): -target cuda -// CHECK: "binding": {"kind": "uniform", "offset": 0, "size": 8}, +// CHECK: "binding": {"kind": "uniform", "offset": 0, "size": 8, "elementStride": 0}, uniform RaytracingAccelerationStructure accel; [numthreads(1,1,1)] diff --git a/tests/reflection/actual-global.slang.expected b/tests/reflection/actual-global.slang.expected index bef1a05d9..44180c133 100644 --- a/tests/reflection/actual-global.slang.expected +++ b/tests/reflection/actual-global.slang.expected @@ -6,7 +6,7 @@ standard output = { "parameters": [ { "name": "regularGlobal", - "binding": {"kind": "uniform", "offset": 0, "size": 4}, + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0}, "type": { "kind": "scalar", "scalarType": "int32" @@ -14,7 +14,7 @@ standard output = { }, { "name": "outputBuffer", - "binding": {"kind": "uniform", "offset": 8, "size": 16}, + "binding": {"kind": "uniform", "offset": 8, "size": 16, "elementStride": 0}, "type": { "kind": "resource", "baseShape": "structuredBuffer", diff --git a/tests/reflection/arrays.hlsl.expected b/tests/reflection/arrays.hlsl.expected index 3e0bd6723..0a2d2e43a 100644 --- a/tests/reflection/arrays.hlsl.expected +++ b/tests/reflection/arrays.hlsl.expected @@ -18,7 +18,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "a", @@ -31,7 +31,7 @@ standard output = { }, "uniformStride": 16 }, - "binding": {"kind": "uniform", "offset": 16, "size": 148} + "binding": {"kind": "uniform", "offset": 16, "size": 148, "elementStride": 16} }, { "name": "y", @@ -39,7 +39,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 164, "size": 4} + "binding": {"kind": "uniform", "offset": 164, "size": 4, "elementStride": 0} } ] }, @@ -56,7 +56,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "a", @@ -69,7 +69,7 @@ standard output = { }, "uniformStride": 16 }, - "binding": {"kind": "uniform", "offset": 16, "size": 148} + "binding": {"kind": "uniform", "offset": 16, "size": 148, "elementStride": 16} }, { "name": "y", @@ -77,11 +77,11 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 164, "size": 4} + "binding": {"kind": "uniform", "offset": 164, "size": 4, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 168} + "binding": {"kind": "uniform", "offset": 0, "size": 168, "elementStride": 0} } } }, diff --git a/tests/reflection/attribute.slang.expected b/tests/reflection/attribute.slang.expected index 665d0b367..664613aef 100644 --- a/tests/reflection/attribute.slang.expected +++ b/tests/reflection/attribute.slang.expected @@ -19,7 +19,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "y", @@ -35,7 +35,7 @@ standard output = { ] } ], - "binding": {"kind": "uniform", "offset": 4, "size": 4}, + "binding": {"kind": "uniform", "offset": 4, "size": 4, "elementStride": 0}, "userAttribs": [ { "name": "DefaultValue", @@ -71,7 +71,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "y", @@ -87,7 +87,7 @@ standard output = { ] } ], - "binding": {"kind": "uniform", "offset": 4, "size": 4}, + "binding": {"kind": "uniform", "offset": 4, "size": 4, "elementStride": 0}, "userAttribs": [ { "name": "DefaultValue", @@ -109,7 +109,7 @@ standard output = { } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 8} + "binding": {"kind": "uniform", "offset": 0, "size": 8, "elementStride": 0} } } }, @@ -128,7 +128,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "z", @@ -144,7 +144,7 @@ standard output = { ] } ], - "binding": {"kind": "uniform", "offset": 4, "size": 4}, + "binding": {"kind": "uniform", "offset": 4, "size": 4, "elementStride": 0}, "userAttribs": [ { "name": "DefaultValue", @@ -180,7 +180,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "z", @@ -196,7 +196,7 @@ standard output = { ] } ], - "binding": {"kind": "uniform", "offset": 4, "size": 4}, + "binding": {"kind": "uniform", "offset": 4, "size": 4, "elementStride": 0}, "userAttribs": [ { "name": "DefaultValue", @@ -218,7 +218,7 @@ standard output = { } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 8} + "binding": {"kind": "uniform", "offset": 0, "size": 8, "elementStride": 0} } } }, @@ -232,7 +232,7 @@ standard output = { ] } ], - "binding": {"kind": "uniform", "offset": 0, "size": 4}, + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0}, "type": { "kind": "scalar", "scalarType": "int32" @@ -240,7 +240,7 @@ standard output = { }, { "name": "param3", - "binding": {"kind": "uniform", "offset": 16, "size": 4}, + "binding": {"kind": "uniform", "offset": 16, "size": 4, "elementStride": 0}, "type": { "kind": "struct", "name": "D", @@ -251,7 +251,7 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} } ], "userAttribs": [ @@ -274,7 +274,7 @@ standard output = { ] } ], - "binding": {"kind": "uniform", "offset": 20, "size": 4}, + "binding": {"kind": "uniform", "offset": 20, "size": 4, "elementStride": 0}, "type": { "kind": "scalar", "scalarType": "int32" @@ -308,7 +308,7 @@ standard output = { ] } ], - "binding": {"kind": "uniform", "offset": 0, "size": 4}, + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0}, "type": { "kind": "scalar", "scalarType": "float32" @@ -324,7 +324,7 @@ standard output = { ] } ], - "binding": {"kind": "uniform", "offset": 4, "size": 4}, + "binding": {"kind": "uniform", "offset": 4, "size": 4, "elementStride": 0}, "type": { "kind": "scalar", "scalarType": "float32" diff --git a/tests/reflection/binding-gl.hlsl.expected b/tests/reflection/binding-gl.hlsl.expected index 67df7c267..7e9a17125 100644 --- a/tests/reflection/binding-gl.hlsl.expected +++ b/tests/reflection/binding-gl.hlsl.expected @@ -18,7 +18,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "a", @@ -31,7 +31,7 @@ standard output = { }, "uniformStride": 16 }, - "binding": {"kind": "uniform", "offset": 16, "size": 160} + "binding": {"kind": "uniform", "offset": 16, "size": 160, "elementStride": 16} }, { "name": "y", @@ -39,7 +39,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 176, "size": 4} + "binding": {"kind": "uniform", "offset": 176, "size": 4, "elementStride": 0} } ] }, @@ -56,7 +56,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "a", @@ -69,7 +69,7 @@ standard output = { }, "uniformStride": 16 }, - "binding": {"kind": "uniform", "offset": 16, "size": 160} + "binding": {"kind": "uniform", "offset": 16, "size": 160, "elementStride": 16} }, { "name": "y", @@ -77,11 +77,11 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 176, "size": 4} + "binding": {"kind": "uniform", "offset": 176, "size": 4, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 192} + "binding": {"kind": "uniform", "offset": 0, "size": 192, "elementStride": 0} } } }, diff --git a/tests/reflection/binding-push-constant-gl.hlsl.expected b/tests/reflection/binding-push-constant-gl.hlsl.expected index 7321c5fac..89a8b5dcd 100644 --- a/tests/reflection/binding-push-constant-gl.hlsl.expected +++ b/tests/reflection/binding-push-constant-gl.hlsl.expected @@ -18,7 +18,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "a", @@ -31,7 +31,7 @@ standard output = { }, "uniformStride": 16 }, - "binding": {"kind": "uniform", "offset": 16, "size": 160} + "binding": {"kind": "uniform", "offset": 16, "size": 160, "elementStride": 16} }, { "name": "y", @@ -39,7 +39,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 176, "size": 4} + "binding": {"kind": "uniform", "offset": 176, "size": 4, "elementStride": 0} } ] }, @@ -56,7 +56,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "a", @@ -69,7 +69,7 @@ standard output = { }, "uniformStride": 16 }, - "binding": {"kind": "uniform", "offset": 16, "size": 160} + "binding": {"kind": "uniform", "offset": 16, "size": 160, "elementStride": 16} }, { "name": "y", @@ -77,11 +77,11 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 176, "size": 4} + "binding": {"kind": "uniform", "offset": 176, "size": 4, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 192} + "binding": {"kind": "uniform", "offset": 0, "size": 192, "elementStride": 0} } } }, @@ -100,7 +100,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "pushY", @@ -108,7 +108,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 4, "size": 4} + "binding": {"kind": "uniform", "offset": 4, "size": 4, "elementStride": 0} } ] }, @@ -126,7 +126,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "pushY", @@ -134,11 +134,11 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 4, "size": 4} + "binding": {"kind": "uniform", "offset": 4, "size": 4, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 8} + "binding": {"kind": "uniform", "offset": 0, "size": 8, "elementStride": 0} } } }, diff --git a/tests/reflection/buffer-layout.slang.1.expected b/tests/reflection/buffer-layout.slang.1.expected index be59f888f..642cbd680 100644 --- a/tests/reflection/buffer-layout.slang.1.expected +++ b/tests/reflection/buffer-layout.slang.1.expected @@ -19,7 +19,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "a", @@ -33,7 +33,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "y", @@ -41,11 +41,11 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 4, "size": 4} + "binding": {"kind": "uniform", "offset": 4, "size": 4, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 16, "size": 16} + "binding": {"kind": "uniform", "offset": 16, "size": 16, "elementStride": 0} }, { "name": "b", @@ -53,7 +53,7 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 32, "size": 4} + "binding": {"kind": "uniform", "offset": 32, "size": 4, "elementStride": 0} }, { "name": "c", @@ -70,7 +70,7 @@ standard output = { }, "uniformStride": 16 }, - "binding": {"kind": "uniform", "offset": 48, "size": 32} + "binding": {"kind": "uniform", "offset": 48, "size": 32, "elementStride": 16} }, { "name": "d", @@ -78,7 +78,7 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 80, "size": 4} + "binding": {"kind": "uniform", "offset": 80, "size": 4, "elementStride": 0} } ] }, @@ -96,7 +96,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "a", @@ -110,7 +110,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "y", @@ -118,11 +118,11 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 4, "size": 4} + "binding": {"kind": "uniform", "offset": 4, "size": 4, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 16, "size": 16} + "binding": {"kind": "uniform", "offset": 16, "size": 16, "elementStride": 0} }, { "name": "b", @@ -130,7 +130,7 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 32, "size": 4} + "binding": {"kind": "uniform", "offset": 32, "size": 4, "elementStride": 0} }, { "name": "c", @@ -147,7 +147,7 @@ standard output = { }, "uniformStride": 16 }, - "binding": {"kind": "uniform", "offset": 48, "size": 32} + "binding": {"kind": "uniform", "offset": 48, "size": 32, "elementStride": 16} }, { "name": "d", @@ -155,11 +155,11 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 80, "size": 4} + "binding": {"kind": "uniform", "offset": 80, "size": 4, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 96} + "binding": {"kind": "uniform", "offset": 0, "size": 96, "elementStride": 0} } } }, @@ -180,7 +180,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "a", @@ -194,7 +194,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "y", @@ -202,11 +202,11 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 4, "size": 4} + "binding": {"kind": "uniform", "offset": 4, "size": 4, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 4, "size": 8} + "binding": {"kind": "uniform", "offset": 4, "size": 8, "elementStride": 0} }, { "name": "b", @@ -214,7 +214,7 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 12, "size": 4} + "binding": {"kind": "uniform", "offset": 12, "size": 4, "elementStride": 0} }, { "name": "c", @@ -231,7 +231,7 @@ standard output = { }, "uniformStride": 8 }, - "binding": {"kind": "uniform", "offset": 16, "size": 16} + "binding": {"kind": "uniform", "offset": 16, "size": 16, "elementStride": 8} }, { "name": "d", @@ -239,7 +239,7 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 32, "size": 4} + "binding": {"kind": "uniform", "offset": 32, "size": 4, "elementStride": 0} } ] } diff --git a/tests/reflection/buffer-layout.slang.expected b/tests/reflection/buffer-layout.slang.expected index 84a3e4b49..d37f94ea6 100644 --- a/tests/reflection/buffer-layout.slang.expected +++ b/tests/reflection/buffer-layout.slang.expected @@ -19,7 +19,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "a", @@ -33,7 +33,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "y", @@ -41,11 +41,11 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 4, "size": 4} + "binding": {"kind": "uniform", "offset": 4, "size": 4, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 16, "size": 8} + "binding": {"kind": "uniform", "offset": 16, "size": 8, "elementStride": 0} }, { "name": "b", @@ -53,7 +53,7 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 24, "size": 4} + "binding": {"kind": "uniform", "offset": 24, "size": 4, "elementStride": 0} }, { "name": "c", @@ -70,7 +70,7 @@ standard output = { }, "uniformStride": 16 }, - "binding": {"kind": "uniform", "offset": 32, "size": 24} + "binding": {"kind": "uniform", "offset": 32, "size": 24, "elementStride": 16} }, { "name": "d", @@ -78,7 +78,7 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 56, "size": 4} + "binding": {"kind": "uniform", "offset": 56, "size": 4, "elementStride": 0} } ] }, @@ -96,7 +96,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "a", @@ -110,7 +110,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "y", @@ -118,11 +118,11 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 4, "size": 4} + "binding": {"kind": "uniform", "offset": 4, "size": 4, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 16, "size": 8} + "binding": {"kind": "uniform", "offset": 16, "size": 8, "elementStride": 0} }, { "name": "b", @@ -130,7 +130,7 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 24, "size": 4} + "binding": {"kind": "uniform", "offset": 24, "size": 4, "elementStride": 0} }, { "name": "c", @@ -147,7 +147,7 @@ standard output = { }, "uniformStride": 16 }, - "binding": {"kind": "uniform", "offset": 32, "size": 24} + "binding": {"kind": "uniform", "offset": 32, "size": 24, "elementStride": 16} }, { "name": "d", @@ -155,11 +155,11 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 56, "size": 4} + "binding": {"kind": "uniform", "offset": 56, "size": 4, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 60} + "binding": {"kind": "uniform", "offset": 0, "size": 60, "elementStride": 0} } } }, @@ -180,7 +180,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "a", @@ -194,7 +194,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "y", @@ -202,11 +202,11 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 4, "size": 4} + "binding": {"kind": "uniform", "offset": 4, "size": 4, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 4, "size": 8} + "binding": {"kind": "uniform", "offset": 4, "size": 8, "elementStride": 0} }, { "name": "b", @@ -214,7 +214,7 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 12, "size": 4} + "binding": {"kind": "uniform", "offset": 12, "size": 4, "elementStride": 0} }, { "name": "c", @@ -231,7 +231,7 @@ standard output = { }, "uniformStride": 8 }, - "binding": {"kind": "uniform", "offset": 16, "size": 16} + "binding": {"kind": "uniform", "offset": 16, "size": 16, "elementStride": 8} }, { "name": "d", @@ -239,7 +239,7 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 32, "size": 4} + "binding": {"kind": "uniform", "offset": 32, "size": 4, "elementStride": 0} } ] } diff --git a/tests/reflection/cross-compile.slang.expected b/tests/reflection/cross-compile.slang.expected index 2cd77fee2..b37be7f2a 100644 --- a/tests/reflection/cross-compile.slang.expected +++ b/tests/reflection/cross-compile.slang.expected @@ -45,7 +45,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 12} + "binding": {"kind": "uniform", "offset": 0, "size": 12, "elementStride": 4} } ] }, @@ -66,11 +66,11 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 12} + "binding": {"kind": "uniform", "offset": 0, "size": 12, "elementStride": 4} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 16} + "binding": {"kind": "uniform", "offset": 0, "size": 16, "elementStride": 0} } } } diff --git a/tests/reflection/global-type-params.slang.expected b/tests/reflection/global-type-params.slang.expected index 07180b7ea..a20cd9f10 100644 --- a/tests/reflection/global-type-params.slang.expected +++ b/tests/reflection/global-type-params.slang.expected @@ -107,7 +107,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 16} + "binding": {"kind": "uniform", "offset": 0, "size": 16, "elementStride": 4} }, { "name": "v", @@ -119,7 +119,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 16, "size": 16} + "binding": {"kind": "uniform", "offset": 16, "size": 16, "elementStride": 4} }, { "name": "w", @@ -131,7 +131,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 32, "size": 16} + "binding": {"kind": "uniform", "offset": 32, "size": 16, "elementStride": 4} } ] }, @@ -152,7 +152,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 16} + "binding": {"kind": "uniform", "offset": 0, "size": 16, "elementStride": 4} }, { "name": "v", @@ -164,7 +164,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 16, "size": 16} + "binding": {"kind": "uniform", "offset": 16, "size": 16, "elementStride": 4} }, { "name": "w", @@ -176,11 +176,11 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 32, "size": 16} + "binding": {"kind": "uniform", "offset": 32, "size": 16, "elementStride": 4} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 48} + "binding": {"kind": "uniform", "offset": 0, "size": 48, "elementStride": 0} } } } diff --git a/tests/reflection/matrix-layout.slang.1.expected b/tests/reflection/matrix-layout.slang.1.expected index e471f060c..cfa997cb3 100644 --- a/tests/reflection/matrix-layout.slang.1.expected +++ b/tests/reflection/matrix-layout.slang.1.expected @@ -23,7 +23,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 48} + "binding": {"kind": "uniform", "offset": 0, "size": 48, "elementStride": 0} }, { "name": "ab", @@ -36,7 +36,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 48, "size": 48} + "binding": {"kind": "uniform", "offset": 48, "size": 48, "elementStride": 0} }, { "name": "ac", @@ -49,7 +49,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 96, "size": 60} + "binding": {"kind": "uniform", "offset": 96, "size": 60, "elementStride": 0} } ] }, @@ -71,7 +71,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 48} + "binding": {"kind": "uniform", "offset": 0, "size": 48, "elementStride": 0} }, { "name": "ab", @@ -84,7 +84,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 48, "size": 48} + "binding": {"kind": "uniform", "offset": 48, "size": 48, "elementStride": 0} }, { "name": "ac", @@ -97,11 +97,11 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 96, "size": 60} + "binding": {"kind": "uniform", "offset": 96, "size": 60, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 156} + "binding": {"kind": "uniform", "offset": 0, "size": 156, "elementStride": 0} } } }, @@ -130,7 +130,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 48} + "binding": {"kind": "uniform", "offset": 0, "size": 48, "elementStride": 0} }, { "name": "bb", @@ -143,7 +143,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 48, "size": 48} + "binding": {"kind": "uniform", "offset": 48, "size": 48, "elementStride": 0} }, { "name": "bc", @@ -156,11 +156,11 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 96, "size": 60} + "binding": {"kind": "uniform", "offset": 96, "size": 60, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 156} + "binding": {"kind": "uniform", "offset": 0, "size": 156, "elementStride": 0} } ] }, @@ -188,7 +188,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 48} + "binding": {"kind": "uniform", "offset": 0, "size": 48, "elementStride": 0} }, { "name": "bb", @@ -201,7 +201,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 48, "size": 48} + "binding": {"kind": "uniform", "offset": 48, "size": 48, "elementStride": 0} }, { "name": "bc", @@ -214,15 +214,15 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 96, "size": 60} + "binding": {"kind": "uniform", "offset": 96, "size": 60, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 156} + "binding": {"kind": "uniform", "offset": 0, "size": 156, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 156} + "binding": {"kind": "uniform", "offset": 0, "size": 156, "elementStride": 0} } } } diff --git a/tests/reflection/matrix-layout.slang.expected b/tests/reflection/matrix-layout.slang.expected index c42b1bfec..c3f5fb092 100644 --- a/tests/reflection/matrix-layout.slang.expected +++ b/tests/reflection/matrix-layout.slang.expected @@ -23,7 +23,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 60} + "binding": {"kind": "uniform", "offset": 0, "size": 60, "elementStride": 0} }, { "name": "ab", @@ -36,7 +36,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 64, "size": 48} + "binding": {"kind": "uniform", "offset": 64, "size": 48, "elementStride": 0} }, { "name": "ac", @@ -49,7 +49,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 112, "size": 60} + "binding": {"kind": "uniform", "offset": 112, "size": 60, "elementStride": 0} } ] }, @@ -71,7 +71,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 60} + "binding": {"kind": "uniform", "offset": 0, "size": 60, "elementStride": 0} }, { "name": "ab", @@ -84,7 +84,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 64, "size": 48} + "binding": {"kind": "uniform", "offset": 64, "size": 48, "elementStride": 0} }, { "name": "ac", @@ -97,11 +97,11 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 112, "size": 60} + "binding": {"kind": "uniform", "offset": 112, "size": 60, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 172} + "binding": {"kind": "uniform", "offset": 0, "size": 172, "elementStride": 0} } } }, @@ -130,7 +130,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 60} + "binding": {"kind": "uniform", "offset": 0, "size": 60, "elementStride": 0} }, { "name": "bb", @@ -143,7 +143,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 64, "size": 48} + "binding": {"kind": "uniform", "offset": 64, "size": 48, "elementStride": 0} }, { "name": "bc", @@ -156,11 +156,11 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 112, "size": 60} + "binding": {"kind": "uniform", "offset": 112, "size": 60, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 172} + "binding": {"kind": "uniform", "offset": 0, "size": 172, "elementStride": 0} } ] }, @@ -188,7 +188,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 60} + "binding": {"kind": "uniform", "offset": 0, "size": 60, "elementStride": 0} }, { "name": "bb", @@ -201,7 +201,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 64, "size": 48} + "binding": {"kind": "uniform", "offset": 64, "size": 48, "elementStride": 0} }, { "name": "bc", @@ -214,15 +214,15 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 112, "size": 60} + "binding": {"kind": "uniform", "offset": 112, "size": 60, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 172} + "binding": {"kind": "uniform", "offset": 0, "size": 172, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 172} + "binding": {"kind": "uniform", "offset": 0, "size": 172, "elementStride": 0} } } } diff --git a/tests/reflection/mix-explicit-and-implicit-spaces.slang.expected b/tests/reflection/mix-explicit-and-implicit-spaces.slang.expected index 3bf9fc3ec..2bf966610 100644 --- a/tests/reflection/mix-explicit-and-implicit-spaces.slang.expected +++ b/tests/reflection/mix-explicit-and-implicit-spaces.slang.expected @@ -19,7 +19,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} } ] }, @@ -40,11 +40,11 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} } } }, @@ -63,7 +63,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} } ] }, @@ -84,11 +84,11 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} } } }, @@ -107,7 +107,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} } ] }, @@ -128,11 +128,11 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} } } } diff --git a/tests/reflection/multi-file.hlsl.expected b/tests/reflection/multi-file.hlsl.expected index 804e5874f..2b916d5a2 100644 --- a/tests/reflection/multi-file.hlsl.expected +++ b/tests/reflection/multi-file.hlsl.expected @@ -45,7 +45,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 12} + "binding": {"kind": "uniform", "offset": 0, "size": 12, "elementStride": 4} }, { "name": "vertexCB", @@ -53,7 +53,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 12, "size": 4} + "binding": {"kind": "uniform", "offset": 12, "size": 4, "elementStride": 0} }, { "name": "vertexCC", @@ -65,7 +65,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 16, "size": 12} + "binding": {"kind": "uniform", "offset": 16, "size": 12, "elementStride": 4} }, { "name": "vertexCD", @@ -77,7 +77,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 32, "size": 8} + "binding": {"kind": "uniform", "offset": 32, "size": 8, "elementStride": 4} } ] }, @@ -98,7 +98,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 12} + "binding": {"kind": "uniform", "offset": 0, "size": 12, "elementStride": 4} }, { "name": "vertexCB", @@ -106,7 +106,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 12, "size": 4} + "binding": {"kind": "uniform", "offset": 12, "size": 4, "elementStride": 0} }, { "name": "vertexCC", @@ -118,7 +118,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 16, "size": 12} + "binding": {"kind": "uniform", "offset": 16, "size": 12, "elementStride": 4} }, { "name": "vertexCD", @@ -130,11 +130,11 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 32, "size": 8} + "binding": {"kind": "uniform", "offset": 32, "size": 8, "elementStride": 4} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 40} + "binding": {"kind": "uniform", "offset": 0, "size": 40, "elementStride": 0} } } }, @@ -179,7 +179,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 12} + "binding": {"kind": "uniform", "offset": 0, "size": 12, "elementStride": 4} }, { "name": "fragmentCB", @@ -187,7 +187,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 12, "size": 4} + "binding": {"kind": "uniform", "offset": 12, "size": 4, "elementStride": 0} }, { "name": "fragmentCC", @@ -199,7 +199,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 16, "size": 12} + "binding": {"kind": "uniform", "offset": 16, "size": 12, "elementStride": 4} }, { "name": "fragmentCD", @@ -211,7 +211,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 32, "size": 8} + "binding": {"kind": "uniform", "offset": 32, "size": 8, "elementStride": 4} } ] }, @@ -232,7 +232,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 12} + "binding": {"kind": "uniform", "offset": 0, "size": 12, "elementStride": 4} }, { "name": "fragmentCB", @@ -240,7 +240,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 12, "size": 4} + "binding": {"kind": "uniform", "offset": 12, "size": 4, "elementStride": 0} }, { "name": "fragmentCC", @@ -252,7 +252,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 16, "size": 12} + "binding": {"kind": "uniform", "offset": 16, "size": 12, "elementStride": 4} }, { "name": "fragmentCD", @@ -264,11 +264,11 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 32, "size": 8} + "binding": {"kind": "uniform", "offset": 32, "size": 8, "elementStride": 4} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 40} + "binding": {"kind": "uniform", "offset": 0, "size": 40, "elementStride": 0} } } }, @@ -313,7 +313,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 12} + "binding": {"kind": "uniform", "offset": 0, "size": 12, "elementStride": 4} }, { "name": "sharedCB", @@ -321,7 +321,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 12, "size": 4} + "binding": {"kind": "uniform", "offset": 12, "size": 4, "elementStride": 0} }, { "name": "sharedCC", @@ -333,7 +333,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 16, "size": 12} + "binding": {"kind": "uniform", "offset": 16, "size": 12, "elementStride": 4} }, { "name": "sharedCD", @@ -345,7 +345,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 32, "size": 8} + "binding": {"kind": "uniform", "offset": 32, "size": 8, "elementStride": 4} } ] }, @@ -366,7 +366,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 12} + "binding": {"kind": "uniform", "offset": 0, "size": 12, "elementStride": 4} }, { "name": "sharedCB", @@ -374,7 +374,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 12, "size": 4} + "binding": {"kind": "uniform", "offset": 12, "size": 4, "elementStride": 0} }, { "name": "sharedCC", @@ -386,7 +386,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 16, "size": 12} + "binding": {"kind": "uniform", "offset": 16, "size": 12, "elementStride": 4} }, { "name": "sharedCD", @@ -398,11 +398,11 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 32, "size": 8} + "binding": {"kind": "uniform", "offset": 32, "size": 8, "elementStride": 4} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 40} + "binding": {"kind": "uniform", "offset": 0, "size": 40, "elementStride": 0} } } }, diff --git a/tests/reflection/parameter-block-explicit-space.slang.expected b/tests/reflection/parameter-block-explicit-space.slang.expected index 347f0fd5c..9d4d2d609 100644 --- a/tests/reflection/parameter-block-explicit-space.slang.expected +++ b/tests/reflection/parameter-block-explicit-space.slang.expected @@ -23,7 +23,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 16} + "binding": {"kind": "uniform", "offset": 0, "size": 16, "elementStride": 4} }, { "name": "at1", @@ -87,7 +87,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 16} + "binding": {"kind": "uniform", "offset": 0, "size": 16, "elementStride": 4} }, { "name": "at1", @@ -133,7 +133,7 @@ standard output = { "bindings": [ {"kind": "shaderResource", "index": 0, "count": 2}, {"kind": "samplerState", "index": 0}, - {"kind": "uniform", "offset": 0, "size": 16} + {"kind": "uniform", "offset": 0, "size": 16, "elementStride": 0} ] } } @@ -157,7 +157,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 16} + "binding": {"kind": "uniform", "offset": 0, "size": 16, "elementStride": 4} }, { "name": "bt", @@ -205,7 +205,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 16} + "binding": {"kind": "uniform", "offset": 0, "size": 16, "elementStride": 4} }, { "name": "bt", @@ -235,7 +235,7 @@ standard output = { "bindings": [ {"kind": "shaderResource", "index": 0}, {"kind": "samplerState", "index": 0}, - {"kind": "uniform", "offset": 0, "size": 16} + {"kind": "uniform", "offset": 0, "size": 16, "elementStride": 0} ] } } diff --git a/tests/reflection/ptr/ptr-generic.slang.expected b/tests/reflection/ptr/ptr-generic.slang.expected index e2473db42..1a4c8acfa 100644 --- a/tests/reflection/ptr/ptr-generic.slang.expected +++ b/tests/reflection/ptr/ptr-generic.slang.expected @@ -6,7 +6,7 @@ standard output = { "parameters": [ { "name": "genericPtr", - "binding": {"kind": "uniform", "offset": 0, "size": 8}, + "binding": {"kind": "uniform", "offset": 0, "size": 8, "elementStride": 0}, "type": { "kind": "pointer", "valueType": "GenericStruct" @@ -14,7 +14,7 @@ standard output = { }, { "name": "outputBuffer", - "binding": {"kind": "uniform", "offset": 8, "size": 16}, + "binding": {"kind": "uniform", "offset": 8, "size": 16, "elementStride": 0}, "type": { "kind": "resource", "baseShape": "structuredBuffer", diff --git a/tests/reflection/ptr/ptr-global.slang.expected b/tests/reflection/ptr/ptr-global.slang.expected index 1a6c15a7e..d040027d5 100644 --- a/tests/reflection/ptr/ptr-global.slang.expected +++ b/tests/reflection/ptr/ptr-global.slang.expected @@ -6,7 +6,7 @@ standard output = { "parameters": [ { "name": "inputBuffer", - "binding": {"kind": "uniform", "offset": 0, "size": 16}, + "binding": {"kind": "uniform", "offset": 0, "size": 16, "elementStride": 0}, "type": { "kind": "resource", "baseShape": "structuredBuffer", @@ -21,7 +21,7 @@ standard output = { "kind": "pointer", "valueType": "int" }, - "binding": {"kind": "uniform", "offset": 0, "size": 8} + "binding": {"kind": "uniform", "offset": 0, "size": 8, "elementStride": 0} }, { "name": "regularGlobal2", @@ -29,7 +29,7 @@ standard output = { "kind": "pointer", "valueType": "int" }, - "binding": {"kind": "uniform", "offset": 8, "size": 8} + "binding": {"kind": "uniform", "offset": 8, "size": 8, "elementStride": 0} }, { "name": "regularGlobal3", @@ -37,7 +37,7 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 16, "size": 4} + "binding": {"kind": "uniform", "offset": 16, "size": 4, "elementStride": 0} } ] } @@ -45,7 +45,7 @@ standard output = { }, { "name": "outputBuffer", - "binding": {"kind": "uniform", "offset": 16, "size": 16}, + "binding": {"kind": "uniform", "offset": 16, "size": 16, "elementStride": 0}, "type": { "kind": "resource", "baseShape": "structuredBuffer", diff --git a/tests/reflection/ptr/ptr-self-reference.slang.expected b/tests/reflection/ptr/ptr-self-reference.slang.expected index 81745fb20..ed704579f 100644 --- a/tests/reflection/ptr/ptr-self-reference.slang.expected +++ b/tests/reflection/ptr/ptr-self-reference.slang.expected @@ -6,7 +6,7 @@ standard output = { "parameters": [ { "name": "inputBuffer", - "binding": {"kind": "uniform", "offset": 0, "size": 16}, + "binding": {"kind": "uniform", "offset": 0, "size": 16, "elementStride": 0}, "type": { "kind": "resource", "baseShape": "structuredBuffer", @@ -21,7 +21,7 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "next", @@ -29,7 +29,7 @@ standard output = { "kind": "pointer", "valueType": "SomeStruct" }, - "binding": {"kind": "uniform", "offset": 8, "size": 8} + "binding": {"kind": "uniform", "offset": 8, "size": 8, "elementStride": 0} } ] } @@ -37,7 +37,7 @@ standard output = { }, { "name": "outputBuffer", - "binding": {"kind": "uniform", "offset": 16, "size": 16}, + "binding": {"kind": "uniform", "offset": 16, "size": 16, "elementStride": 0}, "type": { "kind": "resource", "baseShape": "structuredBuffer", diff --git a/tests/reflection/ptr/ptr-struct.slang.expected b/tests/reflection/ptr/ptr-struct.slang.expected index 3ae17416c..71e495dd7 100644 --- a/tests/reflection/ptr/ptr-struct.slang.expected +++ b/tests/reflection/ptr/ptr-struct.slang.expected @@ -6,7 +6,7 @@ standard output = { "parameters": [ { "name": "inputBuffer", - "binding": {"kind": "uniform", "offset": 0, "size": 16}, + "binding": {"kind": "uniform", "offset": 0, "size": 16, "elementStride": 0}, "type": { "kind": "resource", "baseShape": "structuredBuffer", @@ -21,7 +21,7 @@ standard output = { "kind": "pointer", "valueType": "int" }, - "binding": {"kind": "uniform", "offset": 0, "size": 8} + "binding": {"kind": "uniform", "offset": 0, "size": 8, "elementStride": 0} }, { "name": "ptrInt2", @@ -29,7 +29,7 @@ standard output = { "kind": "pointer", "valueType": "int" }, - "binding": {"kind": "uniform", "offset": 8, "size": 8} + "binding": {"kind": "uniform", "offset": 8, "size": 8, "elementStride": 0} }, { "name": "anInt", @@ -37,7 +37,7 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 16, "size": 4} + "binding": {"kind": "uniform", "offset": 16, "size": 4, "elementStride": 0} }, { "name": "another", @@ -51,7 +51,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "b", @@ -59,7 +59,7 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 4, "size": 4} + "binding": {"kind": "uniform", "offset": 4, "size": 4, "elementStride": 0} }, { "name": "ptrC", @@ -67,11 +67,11 @@ standard output = { "kind": "pointer", "valueType": "int" }, - "binding": {"kind": "uniform", "offset": 8, "size": 8} + "binding": {"kind": "uniform", "offset": 8, "size": 8, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 24, "size": 16} + "binding": {"kind": "uniform", "offset": 24, "size": 16, "elementStride": 0} }, { "name": "anotherPtr", @@ -79,7 +79,7 @@ standard output = { "kind": "pointer", "valueType": "AnotherStruct" }, - "binding": {"kind": "uniform", "offset": 40, "size": 8} + "binding": {"kind": "uniform", "offset": 40, "size": 8, "elementStride": 0} } ] } @@ -87,7 +87,7 @@ standard output = { }, { "name": "outputBuffer", - "binding": {"kind": "uniform", "offset": 16, "size": 16}, + "binding": {"kind": "uniform", "offset": 16, "size": 16, "elementStride": 0}, "type": { "kind": "resource", "baseShape": "structuredBuffer", diff --git a/tests/reflection/reflect-imported-code.hlsl.expected b/tests/reflection/reflect-imported-code.hlsl.expected index 8a906d0f7..ce67919c9 100644 --- a/tests/reflection/reflect-imported-code.hlsl.expected +++ b/tests/reflection/reflect-imported-code.hlsl.expected @@ -41,7 +41,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} } ] }, @@ -58,11 +58,11 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} } } }, @@ -103,7 +103,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} } ] }, @@ -120,11 +120,11 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} } } } diff --git a/tests/reflection/reflect-static.slang.expected b/tests/reflection/reflect-static.slang.expected index e7d5aa356..df3288a6f 100644 --- a/tests/reflection/reflect-static.slang.expected +++ b/tests/reflection/reflect-static.slang.expected @@ -44,7 +44,7 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "b", @@ -52,7 +52,7 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 4, "size": 4} + "binding": {"kind": "uniform", "offset": 4, "size": 4, "elementStride": 0} } ] }, @@ -70,7 +70,7 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "b", @@ -78,11 +78,11 @@ standard output = { "kind": "scalar", "scalarType": "int32" }, - "binding": {"kind": "uniform", "offset": 4, "size": 4} + "binding": {"kind": "uniform", "offset": 4, "size": 4, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 8} + "binding": {"kind": "uniform", "offset": 0, "size": 8, "elementStride": 0} } } }, diff --git a/tests/reflection/reflection0.hlsl.expected b/tests/reflection/reflection0.hlsl.expected index f435aa829..e1712e616 100644 --- a/tests/reflection/reflection0.hlsl.expected +++ b/tests/reflection/reflection0.hlsl.expected @@ -41,7 +41,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} } ] }, @@ -58,11 +58,11 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} } } } diff --git a/tests/reflection/resource-in-cbuffer.hlsl.expected b/tests/reflection/resource-in-cbuffer.hlsl.expected index f85a5fb59..3eef66d06 100644 --- a/tests/reflection/resource-in-cbuffer.hlsl.expected +++ b/tests/reflection/resource-in-cbuffer.hlsl.expected @@ -26,7 +26,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 12} + "binding": {"kind": "uniform", "offset": 0, "size": 12, "elementStride": 4} }, { "name": "myTexture", @@ -50,7 +50,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 12, "size": 4} + "binding": {"kind": "uniform", "offset": 12, "size": 4, "elementStride": 0} }, { "name": "mySampler", @@ -78,7 +78,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 12} + "binding": {"kind": "uniform", "offset": 0, "size": 12, "elementStride": 4} }, { "name": "myTexture", @@ -102,7 +102,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 12, "size": 4} + "binding": {"kind": "uniform", "offset": 12, "size": 4, "elementStride": 0} }, { "name": "mySampler", @@ -116,7 +116,7 @@ standard output = { "bindings": [ {"kind": "shaderResource", "index": 0}, {"kind": "samplerState", "index": 0}, - {"kind": "uniform", "offset": 0, "size": 16} + {"kind": "uniform", "offset": 0, "size": 16, "elementStride": 0} ] } } diff --git a/tests/reflection/structured-buffer.slang.expected b/tests/reflection/structured-buffer.slang.expected index 54842d8f0..b65e8e1d2 100644 --- a/tests/reflection/structured-buffer.slang.expected +++ b/tests/reflection/structured-buffer.slang.expected @@ -52,7 +52,7 @@ standard output = { "scalarType": "float32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 8} + "binding": {"kind": "uniform", "offset": 0, "size": 8, "elementStride": 4} }, { "name": "b", @@ -60,7 +60,7 @@ standard output = { "kind": "scalar", "scalarType": "float32" }, - "binding": {"kind": "uniform", "offset": 8, "size": 4} + "binding": {"kind": "uniform", "offset": 8, "size": 4, "elementStride": 0} }, { "name": "c", @@ -68,7 +68,7 @@ standard output = { "kind": "scalar", "scalarType": "uint32" }, - "binding": {"kind": "uniform", "offset": 12, "size": 4} + "binding": {"kind": "uniform", "offset": 12, "size": 4, "elementStride": 0} } ] } diff --git a/tests/reflection/used-parameters.slang.expected b/tests/reflection/used-parameters.slang.expected index 59b1ae14d..33846f8af 100644 --- a/tests/reflection/used-parameters.slang.expected +++ b/tests/reflection/used-parameters.slang.expected @@ -23,7 +23,7 @@ standard output = { "scalarType": "uint32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 8} + "binding": {"kind": "uniform", "offset": 0, "size": 8, "elementStride": 4} } ] }, @@ -45,11 +45,11 @@ standard output = { "scalarType": "uint32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 8} + "binding": {"kind": "uniform", "offset": 0, "size": 8, "elementStride": 4} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 8} + "binding": {"kind": "uniform", "offset": 0, "size": 8, "elementStride": 0} } } }, @@ -72,7 +72,7 @@ standard output = { "scalarType": "uint32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 8} + "binding": {"kind": "uniform", "offset": 0, "size": 8, "elementStride": 4} } ] }, @@ -94,11 +94,11 @@ standard output = { "scalarType": "uint32" } }, - "binding": {"kind": "uniform", "offset": 0, "size": 8} + "binding": {"kind": "uniform", "offset": 0, "size": 8, "elementStride": 4} } ] }, - "binding": {"kind": "uniform", "offset": 0, "size": 8} + "binding": {"kind": "uniform", "offset": 0, "size": 8, "elementStride": 0} } } }, @@ -272,7 +272,7 @@ standard output = { }, { "name": "UsedUniform", - "binding": {"kind": "uniform", "offset": 0, "size": 4}, + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0}, "type": { "kind": "scalar", "scalarType": "uint32" @@ -280,7 +280,7 @@ standard output = { }, { "name": "UnusedUniform", - "binding": {"kind": "uniform", "offset": 4, "size": 4}, + "binding": {"kind": "uniform", "offset": 4, "size": 4, "elementStride": 0}, "type": { "kind": "scalar", "scalarType": "uint32" @@ -377,11 +377,11 @@ standard output = { }, { "name": "UsedUniform", - "binding": {"kind": "uniform", "offset": 0, "size": 4} + "binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0} }, { "name": "UnusedUniform", - "binding": {"kind": "uniform", "offset": 4, "size": 4} + "binding": {"kind": "uniform", "offset": 4, "size": 4, "elementStride": 0} } ] } |