Adjust test expected results

Devon7925 · Devon7925 · commit 6310e0fad718 · 2025-02-21T12:03:07.000-07:00
diff --git a/tests/bindings/hlsl-to-vulkan-array.hlsl.expected b/tests/bindings/hlsl-to-vulkan-array.hlsl.expected
@@ -22,7 +22,15 @@ standard output = {
                             "name": "tex",
                             "type": {
                                 "kind": "resource",
-                                "baseShape": "texture2D"
+                                "baseShape": "texture2D",
+                                "resultType": {
+                                    "kind": "vector",
+                                    "elementCount": 4,
+                                    "elementType": {
+                                        "kind": "scalar",
+                                        "scalarType": "float32"
+                                    }
+                                }
                             },
                             "binding": {"kind": "shaderResource", "index": 0}
                         },
diff --git a/tests/bindings/hlsl-to-vulkan-combined.hlsl.expected b/tests/bindings/hlsl-to-vulkan-combined.hlsl.expected
@@ -9,15 +9,27 @@ standard output = {
             "binding": {"kind": "descriptorTableSlot", "index": 0},
             "type": {
                 "kind": "resource",
-                "baseShape": "texture2D"
+                "baseShape": "texture2D",
+                "resultType": {
+                    "kind": "scalar",
+                    "scalarType": "float32"
+                }
             }
         },
         {
             "name": "t1",
             "binding": {"kind": "descriptorTableSlot", "index": 1},
             "type": {
                 "kind": "resource",
-                "baseShape": "texture2D"
+                "baseShape": "texture2D",
+                "resultType": {
+                    "kind": "vector",
+                    "elementCount": 4,
+                    "elementType": {
+                        "kind": "scalar",
+                        "scalarType": "float32"
+                    }
+                }
             }
         }
     ],
diff --git a/tests/bindings/hlsl-to-vulkan-global.hlsl.expected b/tests/bindings/hlsl-to-vulkan-global.hlsl.expected
@@ -25,7 +25,15 @@ standard output = {
             "binding": {"kind": "descriptorTableSlot", "index": 0},
             "type": {
                 "kind": "resource",
-                "baseShape": "texture2D"
+                "baseShape": "texture2D",
+                "resultType": {
+                    "kind": "vector",
+                    "elementCount": 4,
+                    "elementType": {
+                        "kind": "scalar",
+                        "scalarType": "float32"
+                    }
+                }
             }
         },
         {
diff --git a/tests/bindings/hlsl-to-vulkan-shift-implicit.hlsl.expected b/tests/bindings/hlsl-to-vulkan-shift-implicit.hlsl.expected
@@ -9,7 +9,15 @@ standard output = {
             "binding": {"kind": "shaderResource", "index": 10},
             "type": {
                 "kind": "resource",
-                "baseShape": "texture2D"
+                "baseShape": "texture2D",
+                "resultType": {
+                    "kind": "vector",
+                    "elementCount": 4,
+                    "elementType": {
+                        "kind": "scalar",
+                        "scalarType": "float32"
+                    }
+                }
             }
         },
         {
@@ -81,7 +89,15 @@ standard output = {
             "binding": {"kind": "shaderResource", "index": 11},
             "type": {
                 "kind": "resource",
-                "baseShape": "texture2D"
+                "baseShape": "texture2D",
+                "resultType": {
+                    "kind": "vector",
+                    "elementCount": 4,
+                    "elementType": {
+                        "kind": "scalar",
+                        "scalarType": "float32"
+                    }
+                }
             }
         },
         {
diff --git a/tests/bindings/hlsl-to-vulkan-shift.hlsl.expected b/tests/bindings/hlsl-to-vulkan-shift.hlsl.expected
@@ -9,7 +9,15 @@ standard output = {
             "binding": {"kind": "shaderResource", "index": 5},
             "type": {
                 "kind": "resource",
-                "baseShape": "texture2D"
+                "baseShape": "texture2D",
+                "resultType": {
+                    "kind": "vector",
+                    "elementCount": 4,
+                    "elementType": {
+                        "kind": "scalar",
+                        "scalarType": "float32"
+                    }
+                }
             }
         },
         {
@@ -81,7 +89,15 @@ standard output = {
             "binding": {"kind": "shaderResource", "space": 2, "index": 7},
             "type": {
                 "kind": "resource",
-                "baseShape": "texture2D"
+                "baseShape": "texture2D",
+                "resultType": {
+                    "kind": "vector",
+                    "elementCount": 4,
+                    "elementType": {
+                        "kind": "scalar",
+                        "scalarType": "float32"
+                    }
+                }
             }
         },
         {
diff --git a/tests/cross-compile/cpp-resource-reflection.slang.64.expected b/tests/cross-compile/cpp-resource-reflection.slang.64.expected
@@ -95,7 +95,11 @@ standard output = {
             "binding": {"kind": "uniform", "offset": 24, "size": 8},
             "type": {
                 "kind": "resource",
-                "baseShape": "texture2D"
+                "baseShape": "texture2D",
+                "resultType": {
+                    "kind": "scalar",
+                    "scalarType": "float32"
+                }
             }
         },
         {
diff --git a/tests/hlsl-intrinsic/sampler-feedback/sampler-feedback-basic.slang.expected b/tests/hlsl-intrinsic/sampler-feedback/sampler-feedback-basic.slang.expected
@@ -67,7 +67,11 @@ standard output = {
             "binding": {"kind": "shaderResource", "index": 0},
             "type": {
                 "kind": "resource",
-                "baseShape": "texture2D"
+                "baseShape": "texture2D",
+                "resultType": {
+                    "kind": "scalar",
+                    "scalarType": "float32"
+                }
             }
         },
         {
@@ -76,7 +80,11 @@ standard output = {
             "type": {
                 "kind": "resource",
                 "baseShape": "texture2D",
-                "array": true
+                "array": true,
+                "resultType": {
+                    "kind": "scalar",
+                    "scalarType": "float32"
+                }
             }
         },
         {

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,11 @@ standard output = {`
`95`	`95`	`"binding": {"kind": "uniform", "offset": 24, "size": 8},`
`96`	`96`	`"type": {`
`97`	`97`	`"kind": "resource",`
`98`		`- "baseShape": "texture2D"`
	`98`	`+ "baseShape": "texture2D",`
	`99`	`+ "resultType": {`
	`100`	`+ "kind": "scalar",`
	`101`	`+ "scalarType": "float32"`
	`102`	`+ }`
`99`	`103`	`}`
`100`	`104`	`},`
`101`	`105`	`{`