GLSL/SPIRV Fixes. (#3337)

2 files changed, 49 insertions, 0 deletions

diff --git a/tests/glsl/flat-in-float.slang b/tests/glsl/flat-in-float.slang
new file mode 100644
index 000000000..895e3c058
--- /dev/null
+++ b/tests/glsl/flat-in-float.slang
@@ -0,0 +1,24 @@
+//TEST:SIMPLE(filecheck=CHECK): -target spirv -stage fragment -entry main -allow-glsl -emit-spirv-directly
+//TEST:SIMPLE(filecheck=CHECK): -target spirv -stage fragment -entry main -allow-glsl
+
+#version 310 es
+precision highp float;
+precision highp int;
+
+layout(location = 0) out mediump vec4 dEQP_FragColor;
+
+bool isOk(float a, float b)   { return (a == b); }
+
+layout(location = 0) flat in float out0;
+layout(binding = 0, std140) uniform Reference
+{
+	uint out0;
+} ref;
+
+void main()
+{
+	bool RES = isOk(out0, ref.out0);
+    dEQP_FragColor = vec4(RES, RES, RES, 1.0);
+    // CHECK: OpDecorate {{.*}} Flat
+}
+
diff --git a/tests/spirv/array-resource.slang b/tests/spirv/array-resource.slang
new file mode 100644
index 000000000..b6edf9b27
--- /dev/null
+++ b/tests/spirv/array-resource.slang
@@ -0,0 +1,25 @@
+// array-resource.slang
+
+// Test direct SPIR-V emit on arrays of buffers.
+
+//TEST:SIMPLE(filecheck=CHECK):-target spirv -entry computeMain -stage compute -emit-spirv-directly
+//TEST_INPUT:set resultBuffer = out ubuffer(data=[0 0 0 0], stride=4)
+
+// Note: we can't run this test at the moment because gfx doesn't support allocating shader objects with unsized arrays.
+//TEST_DISABLED(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=BUFFER):-vk -compute -output-using-type
+
+RWStructuredBuffer<uint> inputBuffers[];
+
+RWStructuredBuffer<uint> resultBuffer;
+
+//TEST_INPUT: set inputBuffers = {ubuffer(data=[1 0 0 0], stride=4), ubuffer(data=[2 0 0 0], stride=4)}
+
+[numthreads(4,1,1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+    uint threadId = dispatchThreadID.x;
+    resultBuffer[threadId] = inputBuffers[0][threadId] + inputBuffers[1][threadId];
+    // CHECK: OpCapability RuntimeDescriptorArray
+    // CHECK: OpExtension "SPV_EXT_descriptor_indexing"
+    // BUFFER: 3
+}