diff options
| author | Yong He <yonghe@outlook.com> | 2023-08-14 16:23:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-14 16:23:19 -0700 |
| commit | 661d6198bbb9857d3fdc6df477e0742ed0b0765c (patch) | |
| tree | 974a57cfa2e43624e91502e9e652a0cc78105b3a /tests/spirv | |
| parent | 0403e0556b470f6b316153caea2dc6f5c314da5b (diff) | |
Support per field matrix layout (#3101)
* Support per field matrix layout
* Fix warnings.
* Fix.
* Fix tests.
* Fix spiv gen.
* Fix.
* More test fixes.
* Fix.
* Run only GPU tests on self-hosted servers.
* Remove -use-glsl-matrix-layout-modifier.
* Fix.
---------
Co-authored-by: Yong He <yhe@nvidia.com>
Diffstat (limited to 'tests/spirv')
| -rw-r--r-- | tests/spirv/spirv-debug-break.slang | 6 | ||||
| -rw-r--r-- | tests/spirv/spirv-debug-break.slang.expected | 37 |
2 files changed, 5 insertions, 38 deletions
diff --git a/tests/spirv/spirv-debug-break.slang b/tests/spirv/spirv-debug-break.slang index 18e8c8597..e57024037 100644 --- a/tests/spirv/spirv-debug-break.slang +++ b/tests/spirv/spirv-debug-break.slang @@ -1,5 +1,5 @@ // spirv-instruction.slang -//TEST(compute, vulkan):SIMPLE:-target glsl -entry computeMain -stage compute +//TEST(compute, vulkan):SIMPLE(filecheck=CHECK):-target glsl -entry computeMain -stage compute [[vk::spirv_instruction(1, "NonSemantic.DebugBreak")]] void _spvDebugBreak(int v); @@ -7,6 +7,10 @@ void _spvDebugBreak(int v); [ForceInline] void _debugBreak() { _spvDebugBreak(1); } +// CHECK:spirv_instruction(id = 1, set = "NonSemantic.DebugBreak") +// CHECK:void _spvDebugBreak_0(int _0); +// CHECK:void main() +// CHECK:_spvDebugBreak_0(1); //TEST_INPUT:set resultBuffer = out ubuffer(data=[0 0 0 0], stride=4) RWStructuredBuffer<uint> resultBuffer; diff --git a/tests/spirv/spirv-debug-break.slang.expected b/tests/spirv/spirv-debug-break.slang.expected deleted file mode 100644 index 219aab7d2..000000000 --- a/tests/spirv/spirv-debug-break.slang.expected +++ /dev/null @@ -1,37 +0,0 @@ -result code = 0 -standard error = { -} -standard output = { -#version 450 -#extension GL_EXT_spirv_intrinsics : require -layout(row_major) uniform; -layout(row_major) buffer; - -#line 12 0 -layout(std430, binding = 0) buffer _S1 { - uint _data[]; -} resultBuffer_0; - -#line 5 -spirv_instruction(id = 1, set = "NonSemantic.DebugBreak") -void _spvDebugBreak_0(int _0); - - -#line 15 -layout(local_size_x = 4, local_size_y = 1, local_size_z = 1) in; -void main() -{ - -#line 17 - uint threadId_0 = gl_GlobalInvocationID.x; - - _spvDebugBreak_0(1); - - uint _S2 = threadId_0 + threadId_0; - -#line 21 - ((resultBuffer_0)._data[(threadId_0)]) = _S2; - return; -} - -} |