From dcd9e574782b87d6280f1db8ee9ba6dbb7c96c8b Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Tue, 5 Mar 2019 17:24:44 -0500
Subject: 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.
---
 tests/bugs/glsl-layout-define.hlsl              | 5 +++++
 tests/bugs/glsl-layout-define.hlsl.expected     | 7 +++++++
 tests/bugs/glsl-vk-binding-define.hlsl          | 5 +++++
 tests/bugs/glsl-vk-binding-define.hlsl.expected | 7 +++++++
 tests/diagnostics/vk-bindings.slang             | 3 +++
 tests/diagnostics/vk-bindings.slang.expected    | 2 +-
 6 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 tests/bugs/glsl-layout-define.hlsl
 create mode 100644 tests/bugs/glsl-layout-define.hlsl.expected
 create mode 100644 tests/bugs/glsl-vk-binding-define.hlsl
 create mode 100644 tests/bugs/glsl-vk-binding-define.hlsl.expected

(limited to 'tests')

diff --git a/tests/bugs/glsl-layout-define.hlsl b/tests/bugs/glsl-layout-define.hlsl
new file mode 100644
index 000000000..8f09fd592
--- /dev/null
+++ b/tests/bugs/glsl-layout-define.hlsl
@@ -0,0 +1,5 @@
+//TEST:SIMPLE: -profile vs_5_0
+
+layout(binding = UNDEFINED_VK_BINDING, set = UNDEFINED_VK_SET) 
+Texture2DArray<float4> Float4Texture2DArrays[] : register(t0, space100);
+
diff --git a/tests/bugs/glsl-layout-define.hlsl.expected b/tests/bugs/glsl-layout-define.hlsl.expected
new file mode 100644
index 000000000..9c00916c3
--- /dev/null
+++ b/tests/bugs/glsl-layout-define.hlsl.expected
@@ -0,0 +1,7 @@
+result code = -1
+standard error = {
+tests/bugs/glsl-layout-define.hlsl(3): error 20001: unexpected identifier, expected integer literal
+tests/bugs/glsl-layout-define.hlsl(3): error 20001: unexpected ')', expected ';'
+}
+standard output = {
+}
diff --git a/tests/bugs/glsl-vk-binding-define.hlsl b/tests/bugs/glsl-vk-binding-define.hlsl
new file mode 100644
index 000000000..4e68c0f75
--- /dev/null
+++ b/tests/bugs/glsl-vk-binding-define.hlsl
@@ -0,0 +1,5 @@
+//TEST:SIMPLE: -profile vs_5_0
+
+[[vk::binding(UNDEFINED_VK_BINDING, UNDEFINED_VK_SET)]]
+Texture2DArray<float4> Float4Texture2DArrays[] : register(t0, space100);
+
diff --git a/tests/bugs/glsl-vk-binding-define.hlsl.expected b/tests/bugs/glsl-vk-binding-define.hlsl.expected
new file mode 100644
index 000000000..aaac7f0c6
--- /dev/null
+++ b/tests/bugs/glsl-vk-binding-define.hlsl.expected
@@ -0,0 +1,7 @@
+result code = -1
+standard error = {
+tests/bugs/glsl-vk-binding-define.hlsl(3): error 30015: undefined identifier 'UNDEFINED_VK_BINDING'.
+tests/bugs/glsl-vk-binding-define.hlsl(3): error 30015: undefined identifier 'UNDEFINED_VK_SET'.
+}
+standard output = {
+}
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 = {
 }
-- 
cgit v1.2.3