Merge branch 'master' into glsl-loop

1 files changed, 7 insertions, 0 deletions

diff --git a/tests/diagnostics/void-function-returning-value.slang.expected b/tests/diagnostics/void-function-returning-value.slang.expected
new file mode 100644
index 000000000..a94132971
--- /dev/null
+++ b/tests/diagnostics/void-function-returning-value.slang.expected
@@ -0,0 +1,7 @@
+result code = -1
+standard error = {
+tests/diagnostics/void-function-returning-value.slang(16): error 30019: expected an expression of type 'void', got 'int'
+tests/diagnostics/void-function-returning-value.slang(16): note: explicit conversion from 'int' to 'void' is possible
+}
+standard output = {
+}