15 files changed, 137 insertions, 6 deletions
diff --git a/tests/reflection/arrays.hlsl.expected b/tests/reflection/arrays.hlsl.expected
index 052bd3927..b586e362a 100644
--- a/tests/reflection/arrays.hlsl.expected
+++ b/tests/reflection/arrays.hlsl.expected
@@ -98,6 +98,12 @@ standard output = {
                 "kind": "samplerState"
             }
         }
+    ],
+    "entryPoints": [
+        {
+            "name": "main",
+            "stage:": "fragment"
+        }
     ]
 }
 }
diff --git a/tests/reflection/gh-55.glsl.expected b/tests/reflection/gh-55.glsl.expected
index 8cdebdcd8..993984d93 100644
--- a/tests/reflection/gh-55.glsl.expected
+++ b/tests/reflection/gh-55.glsl.expected
@@ -40,6 +40,12 @@ standard output = {
                 }
             }
         }
+    ],
+    "entryPoints": [
+        {
+            "name": "main",
+            "stage:": "fragment"
+        }
     ]
 }
 }
diff --git a/tests/reflection/global-uniforms.hlsl.expected b/tests/reflection/global-uniforms.hlsl.expected
index b40b2d69c..e36665673 100644
--- a/tests/reflection/global-uniforms.hlsl.expected
+++ b/tests/reflection/global-uniforms.hlsl.expected
@@ -67,6 +67,12 @@ standard output = {
                 }
             }
         }
+    ],
+    "entryPoints": [
+        {
+            "name": "main",
+            "stage:": "fragment"
+        }
     ]
 }
 }
diff --git a/tests/reflection/image-types.glsl b/tests/reflection/image-types.glsl
index 21cd2b629..73ecdaa82 100644
--- a/tests/reflection/image-types.glsl
+++ b/tests/reflection/image-types.glsl
@@ -2,9 +2,11 @@
 
 // Confirm that we expose GLSL `image` types through reflection
 
-uniform imageBuffer iBuffer;
+layout(rgba32f)
+uniform writeonly imageBuffer iBuffer;
 
-uniform image2D i2D;
+layout(rgba32f)
+uniform writeonly image2D i2D;
 
 void main()
 {}
diff --git a/tests/reflection/image-types.glsl.expected b/tests/reflection/image-types.glsl.expected
index 19d28f329..dfe477287 100644
--- a/tests/reflection/image-types.glsl.expected
+++ b/tests/reflection/image-types.glsl.expected
@@ -22,6 +22,12 @@ standard output = {
                 "access": "readWrite"
             }
         }
+    ],
+    "entryPoints": [
+        {
+            "name": "main",
+            "stage:": "fragment"
+        }
     ]
 }
 }
diff --git a/tests/reflection/multi-file-extra.hlsl b/tests/reflection/multi-file-extra.hlsl
index 569ec2ce9..a5da70635 100644
--- a/tests/reflection/multi-file-extra.hlsl
+++ b/tests/reflection/multi-file-extra.hlsl
@@ -18,7 +18,7 @@ float4 use(float  val) { return val; };
 float4 use(float2 val) { return float4(val,0.0,0.0); };
 float4 use(float3 val) { return float4(val,0.0); };
 float4 use(float4 val) { return val; };
-float4 use(Texture2D t, SamplerState s) { return t.Sample(s, 0.0); }
+float4 use(Texture2D t, SamplerState s) { return t.SampleLevel(s, 0.0, 0.0); }
 
 // Start with some parameters that will appear in both shaders
 Texture2D sharedT;
@@ -51,7 +51,7 @@ Texture2D sharedTV;
 Texture2D sharedTF;
 
 
-float4 main() : SV_Target
+float4 mainVS() : SV_Position
 {
 	// Go ahead and use everything here, just to make sure things got placed correctly
 	return use(sharedT, sharedS)
diff --git a/tests/reflection/multi-file.hlsl b/tests/reflection/multi-file.hlsl
index b263a6b71..7f79f08c9 100644
--- a/tests/reflection/multi-file.hlsl
+++ b/tests/reflection/multi-file.hlsl
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:-profile ps_4_0 -target reflection-json Tests/bindings/multi-file-extra.hlsl
+//TEST:SIMPLE:-profile ps_4_0 -entry mainFS -target reflection-json tests/reflection/multi-file-extra.hlsl -profile vs_4_0 -entry mainVS
 
 // Here we are testing the case where multiple translation units are provided
 // at once, so that we want combined reflection information for the resulting
@@ -44,7 +44,7 @@ Texture2D sharedTV;
 Texture2D sharedTF;
 
 
-float4 main() : SV_Position
+float4 mainFS() : SV_Target
 {
 	// Go ahead and use everything here, just to make sure things got placed correctly
 	return use(sharedT, sharedS)
diff --git a/tests/reflection/multi-file.hlsl.expected b/tests/reflection/multi-file.hlsl.expected
index 38d028ffe..4ad95fb35 100644
--- a/tests/reflection/multi-file.hlsl.expected
+++ b/tests/reflection/multi-file.hlsl.expected
@@ -233,6 +233,16 @@ standard output = {
                 }
             }
         }
+    ],
+    "entryPoints": [
+        {
+            "name": "mainFS",
+            "stage:": "fragment"
+        },
+        {
+            "name": "mainVS",
+            "stage:": "vertex"
+        }
     ]
 }
 }
diff --git a/tests/reflection/reflect-imported-code.hlsl.expected b/tests/reflection/reflect-imported-code.hlsl.expected
index 1190ab550..78e7ce195 100644
--- a/tests/reflection/reflect-imported-code.hlsl.expected
+++ b/tests/reflection/reflect-imported-code.hlsl.expected
@@ -74,6 +74,12 @@ standard output = {
                 }
             }
         }
+    ],
+    "entryPoints": [
+        {
+            "name": "main",
+            "stage:": "fragment"
+        }
     ]
 }
 }
diff --git a/tests/reflection/reflection0.hlsl.expected b/tests/reflection/reflection0.hlsl.expected
index 3b74988b2..e4d6070ca 100644
--- a/tests/reflection/reflection0.hlsl.expected
+++ b/tests/reflection/reflection0.hlsl.expected
@@ -39,6 +39,12 @@ standard output = {
                 }
             }
         }
+    ],
+    "entryPoints": [
+        {
+            "name": "main",
+            "stage:": "fragment"
+        }
     ]
 }
 }
diff --git a/tests/reflection/resource-in-cbuffer.hlsl.expected b/tests/reflection/resource-in-cbuffer.hlsl.expected
index faae1c8b7..261fe2587 100644
--- a/tests/reflection/resource-in-cbuffer.hlsl.expected
+++ b/tests/reflection/resource-in-cbuffer.hlsl.expected
@@ -55,6 +55,12 @@ standard output = {
                 }
             }
         }
+    ],
+    "entryPoints": [
+        {
+            "name": "main",
+            "stage:": "fragment"
+        }
     ]
 }
 }
diff --git a/tests/reflection/sample-rate-input.glsl b/tests/reflection/sample-rate-input.glsl
new file mode 100644
index 000000000..66763f45d
--- /dev/null
+++ b/tests/reflection/sample-rate-input.glsl
@@ -0,0 +1,15 @@
+//TEST(smoke):SIMPLE:-profile ps_4_0 -no-checking -target reflection-json
+
+// Check that we report sample-rate entry point input correctly
+
+uniform texture2D t;
+uniform sampler s;
+
+sample in vec2 uv;
+
+out vec4 c;
+
+void main()
+{
+    c = texture(sampler2D(t,s), uv);
+}
diff --git a/tests/reflection/sample-rate-input.glsl.expected b/tests/reflection/sample-rate-input.glsl.expected
new file mode 100644
index 000000000..5800a3630
--- /dev/null
+++ b/tests/reflection/sample-rate-input.glsl.expected
@@ -0,0 +1,55 @@
+result code = 0
+standard error = {
+}
+standard output = {
+{
+    "parameters": [
+        {
+            "name": "t",
+            "binding": {"kind": "descriptorTableSlot", "index": 0},
+            "type": {
+                "kind": "resource",
+                "baseShape": "texture2D"
+            }
+        },
+        {
+            "name": "s",
+            "binding": {"kind": "descriptorTableSlot", "index": 1},
+            "type": {
+                "kind": "samplerState"
+            }
+        },
+        {
+            "name": "uv",
+            "binding": {"kind": "vertexInput", "index": 0},
+            "type": {
+                "kind": "vector",
+                "elementCount": 2,
+                "elementType": {
+                    "kind": "scalar",
+                    "scalarType": "float32"
+                }
+            }
+        },
+        {
+            "name": "c",
+            "binding": {"kind": "fragmentOutput", "index": 0},
+            "type": {
+                "kind": "vector",
+                "elementCount": 4,
+                "elementType": {
+                    "kind": "scalar",
+                    "scalarType": "float32"
+                }
+            }
+        }
+    ],
+    "entryPoints": [
+        {
+            "name": "main",
+            "stage:": "fragment",
+            "usesAnySampleRateInput": true
+        }
+    ]
+}
+}
diff --git a/tests/reflection/std430-layout.glsl b/tests/reflection/std430-layout.glsl
index 5d4dee88f..0e61556fc 100644
--- a/tests/reflection/std430-layout.glsl
+++ b/tests/reflection/std430-layout.glsl
@@ -1,3 +1,4 @@
+#version 450
 //TEST(smoke):SIMPLE:-profile ps_4_0 -target reflection-json
 
 // Confirm fix for GitHub issue #55
diff --git a/tests/reflection/std430-layout.glsl.expected b/tests/reflection/std430-layout.glsl.expected
index 701a36909..bd04c417f 100644
--- a/tests/reflection/std430-layout.glsl.expected
+++ b/tests/reflection/std430-layout.glsl.expected
@@ -102,6 +102,12 @@ standard output = {
                 }
             }
         }
+    ],
+    "entryPoints": [
+        {
+            "name": "main",
+            "stage:": "fragment"
+        }
     ]
 }
 }