diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2019-03-05 17:24:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-05 17:24:44 -0500 |
| commit | dcd9e574782b87d6280f1db8ee9ba6dbb7c96c8b (patch) | |
| tree | dcb900ec86c6454ff2fcbe16dea6512fdec49413 /tests/diagnostics | |
| parent | 3d5546600fb4c585b6f6f6dcdb5e122698d1225e (diff) | |
Hotfix/crash invalid vk binding (#875)
* Add diagnostic for vk::binding failure.
* Add test for vk::binding failure.
* Add the expected output for glsl-layout-define.hlsl
* * Copy over initialize expr if available when validating unchecked
* Fix unloop - because now it always has one parameter (when before it could have none)
* Split vk::binding and layout tests with invalid parameters
* Removed the diagnostic for 2 ints expected
* Added vk::binding that doesn't specify set in vk-bindings.slang
* * Fix typo
* Improve comments.
Diffstat (limited to 'tests/diagnostics')
| -rw-r--r-- | tests/diagnostics/vk-bindings.slang | 3 | ||||
| -rw-r--r-- | tests/diagnostics/vk-bindings.slang.expected | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/diagnostics/vk-bindings.slang b/tests/diagnostics/vk-bindings.slang index f5a8bdeba..a329fcdde 100644 --- a/tests/diagnostics/vk-bindings.slang +++ b/tests/diagnostics/vk-bindings.slang @@ -5,6 +5,9 @@ // D3D `register` without VK binding Texture2D t : register(t0); +[[vk::binding(3)]] +Texture2D t1 : register(t3); + struct S { float4 a; }; // Parameter block with non-zero binding: diff --git a/tests/diagnostics/vk-bindings.slang.expected b/tests/diagnostics/vk-bindings.slang.expected index 8e085b55f..8744787ed 100644 --- a/tests/diagnostics/vk-bindings.slang.expected +++ b/tests/diagnostics/vk-bindings.slang.expected @@ -1,7 +1,7 @@ result code = -1 standard error = { tests/diagnostics/vk-bindings.slang(6): warning 39013: shader parameter 't' has a 'register' specified for D3D, but no '[[vk::binding(...)]]` specified for Vulkan -tests/diagnostics/vk-bindings.slang(11): error 39015: shader parameter 'b' consumes whole descriptor sets, so the binding must be in the form '[[vk::binding(0, ...)]]'; the non-zero binding '2' is not allowed +tests/diagnostics/vk-bindings.slang(14): error 39015: shader parameter 'b' consumes whole descriptor sets, so the binding must be in the form '[[vk::binding(0, ...)]]'; the non-zero binding '2' is not allowed } standard output = { } |