From cd20e94af9f384c03e8be69f6c8ce9e97212cc9b Mon Sep 17 00:00:00 2001
From: Devon <devonrutledge03@gmail.com>
Date: Thu, 27 Feb 2025 18:52:14 -0700
Subject: Add inner texture type to reflection json (#6416)

* Add inner texture type to reflection json

* Add expected result of test

* Adjust test expected results

* Fix ci test result

---------

Co-authored-by: Yong He <yonghe@outlook.com>
---
 tests/bindings/hlsl-to-vulkan-array.hlsl.expected    | 10 +++++++++-
 tests/bindings/hlsl-to-vulkan-combined.hlsl.expected | 16 ++++++++++++++--
 tests/bindings/hlsl-to-vulkan-global.hlsl.expected   | 10 +++++++++-
 .../hlsl-to-vulkan-shift-implicit.hlsl.expected      | 20 ++++++++++++++++++--
 tests/bindings/hlsl-to-vulkan-shift.hlsl.expected    | 20 ++++++++++++++++++--
 5 files changed, 68 insertions(+), 8 deletions(-)

(limited to 'tests/bindings')

diff --git a/tests/bindings/hlsl-to-vulkan-array.hlsl.expected b/tests/bindings/hlsl-to-vulkan-array.hlsl.expected
index c5d71a65f..b8deb1314 100644
--- 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
index 1194d50b4..32c99bd78 100644
--- a/tests/bindings/hlsl-to-vulkan-combined.hlsl.expected
+++ b/tests/bindings/hlsl-to-vulkan-combined.hlsl.expected
@@ -9,7 +9,11 @@ standard output = {
             "binding": {"kind": "descriptorTableSlot", "index": 0},
             "type": {
                 "kind": "resource",
-                "baseShape": "texture2D"
+                "baseShape": "texture2D",
+                "resultType": {
+                    "kind": "scalar",
+                    "scalarType": "float32"
+                }
             }
         },
         {
@@ -17,7 +21,15 @@ standard output = {
             "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
index 7fe1f8e42..8d3a19458 100644
--- 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
index a873b4149..85d13552a 100644
--- 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
index 23e2b1bda..fd54b9692 100644
--- 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"
+                    }
+                }
             }
         },
         {
-- 
cgit v1.2.3