Fixed stage and result field names in json reflection (shader-slang#5927)

stanoddly · web-flow · commit 76fdeaa477a5 · 2024-12-21T08:14:56.000-08:00
diff --git a/source/slang/slang-reflection-json.cpp b/source/slang/slang-reflection-json.cpp
@@ -1006,22 +1006,22 @@ static void emitReflectionEntryPointJSON(
     switch (entryPoint->getStage())
     {
     case SLANG_STAGE_VERTEX:
-        writer << ",\n\"stage:\": \"vertex\"";
+        writer << ",\n\"stage\": \"vertex\"";
         break;
     case SLANG_STAGE_HULL:
-        writer << ",\n\"stage:\": \"hull\"";
+        writer << ",\n\"stage\": \"hull\"";
         break;
     case SLANG_STAGE_DOMAIN:
-        writer << ",\n\"stage:\": \"domain\"";
+        writer << ",\n\"stage\": \"domain\"";
         break;
     case SLANG_STAGE_GEOMETRY:
-        writer << ",\n\"stage:\": \"geometry\"";
+        writer << ",\n\"stage\": \"geometry\"";
         break;
     case SLANG_STAGE_FRAGMENT:
-        writer << ",\n\"stage:\": \"fragment\"";
+        writer << ",\n\"stage\": \"fragment\"";
         break;
     case SLANG_STAGE_COMPUTE:
-        writer << ",\n\"stage:\": \"compute\"";
+        writer << ",\n\"stage\": \"compute\"";
         break;
     default:
         break;
@@ -1051,7 +1051,7 @@ static void emitReflectionEntryPointJSON(
     }
     if (auto resultVarLayout = entryPoint->getResultVarLayout())
     {
-        writer << ",\n\"result:\": ";
+        writer << ",\n\"result\": ";
         emitReflectionParamJSON(writer, resultVarLayout);
     }
 
diff --git a/tests/bindings/hlsl-to-vulkan-array.hlsl.expected b/tests/bindings/hlsl-to-vulkan-array.hlsl.expected
@@ -64,8 +64,8 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment",
-            "result:": {
+            "stage": "fragment",
+            "result": {
                 "stage": "fragment",
                 "binding": {"kind": "varyingOutput", "index": 0},
                 "semanticName": "SV_TARGET",
diff --git a/tests/bindings/hlsl-to-vulkan-combined.hlsl.expected b/tests/bindings/hlsl-to-vulkan-combined.hlsl.expected
@@ -24,8 +24,8 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment",
-            "result:": {
+            "stage": "fragment",
+            "result": {
                 "stage": "fragment",
                 "binding": {"kind": "varyingOutput", "index": 0},
                 "semanticName": "SV_TARGET",
diff --git a/tests/bindings/hlsl-to-vulkan-global.hlsl.expected b/tests/bindings/hlsl-to-vulkan-global.hlsl.expected
@@ -39,8 +39,8 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment",
-            "result:": {
+            "stage": "fragment",
+            "result": {
                 "stage": "fragment",
                 "binding": {"kind": "varyingOutput", "index": 0},
                 "semanticName": "SV_TARGET",
diff --git a/tests/bindings/hlsl-to-vulkan-shift-implicit.hlsl.expected b/tests/bindings/hlsl-to-vulkan-shift-implicit.hlsl.expected
@@ -132,8 +132,8 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment",
-            "result:": {
+            "stage": "fragment",
+            "result": {
                 "stage": "fragment",
                 "binding": {"kind": "varyingOutput", "index": 0},
                 "semanticName": "SV_TARGET",
diff --git a/tests/bindings/hlsl-to-vulkan-shift.hlsl.expected b/tests/bindings/hlsl-to-vulkan-shift.hlsl.expected
@@ -132,8 +132,8 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment",
-            "result:": {
+            "stage": "fragment",
+            "result": {
                 "stage": "fragment",
                 "binding": {"kind": "varyingOutput", "index": 0},
                 "semanticName": "SV_TARGET",
diff --git a/tests/cross-compile/cpp-resource-reflection.slang.32.expected b/tests/cross-compile/cpp-resource-reflection.slang.32.expected
@@ -109,7 +109,7 @@ standard output = {
     "entryPoints": [
         {
             "name": "computeMain",
-            "stage:": "compute",
+            "stage": "compute",
             "parameters": [
                 {
                     "name": "dispatchThreadID",
diff --git a/tests/cross-compile/cpp-resource-reflection.slang.64.expected b/tests/cross-compile/cpp-resource-reflection.slang.64.expected
@@ -109,7 +109,7 @@ standard output = {
     "entryPoints": [
         {
             "name": "computeMain",
-            "stage:": "compute",
+            "stage": "compute",
             "parameters": [
                 {
                     "name": "dispatchThreadID",
diff --git a/tests/cuda/cuda-reflection.slang.expected b/tests/cuda/cuda-reflection.slang.expected
@@ -228,7 +228,7 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "compute",
+            "stage": "compute",
             "parameters": [
                 {
                     "name": "dispatchThreadID",
diff --git a/tests/hlsl-intrinsic/sampler-feedback/sampler-feedback-basic.slang.expected b/tests/hlsl-intrinsic/sampler-feedback/sampler-feedback-basic.slang.expected
@@ -90,8 +90,8 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment",
-            "result:": {
+            "stage": "fragment",
+            "result": {
                 "stage": "fragment",
                 "binding": {"kind": "varyingOutput", "index": 0},
                 "semanticName": "SV_TARGET",
diff --git a/tests/ir/string-literal-hash-reflection.slang.expected b/tests/ir/string-literal-hash-reflection.slang.expected
@@ -21,7 +21,7 @@ standard output = {
     "entryPoints": [
         {
             "name": "computeMain",
-            "stage:": "compute",
+            "stage": "compute",
             "parameters": [
                 {
                     "name": "tid",
diff --git a/tests/reflection/actual-global.slang.expected b/tests/reflection/actual-global.slang.expected
@@ -29,7 +29,7 @@ standard output = {
     "entryPoints": [
         {
             "name": "computeMain",
-            "stage:": "compute",
+            "stage": "compute",
             "parameters": [
                 {
                     "name": "dispatchThreadID",
diff --git a/tests/reflection/arrays.hlsl.expected b/tests/reflection/arrays.hlsl.expected
@@ -142,8 +142,8 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment",
-            "result:": {
+            "stage": "fragment",
+            "result": {
                 "stage": "fragment",
                 "binding": {"kind": "varyingOutput", "index": 0},
                 "semanticName": "SV_TARGET",
diff --git a/tests/reflection/attribute.slang.expected b/tests/reflection/attribute.slang.expected
@@ -265,7 +265,7 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "compute",
+            "stage": "compute",
             "parameters": [
                 {
                     "name": "dispatchThreadID",
diff --git a/tests/reflection/binding-gl.hlsl.expected b/tests/reflection/binding-gl.hlsl.expected
@@ -138,8 +138,8 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment",
-            "result:": {
+            "stage": "fragment",
+            "result": {
                 "stage": "fragment",
                 "binding": {"kind": "varyingOutput", "index": 0},
                 "semanticName": "SV_TARGET",
diff --git a/tests/reflection/binding-push-constant-gl.hlsl.expected b/tests/reflection/binding-push-constant-gl.hlsl.expected
@@ -195,8 +195,8 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment",
-            "result:": {
+            "stage": "fragment",
+            "result": {
                 "stage": "fragment",
                 "binding": {"kind": "varyingOutput", "index": 0},
                 "semanticName": "SV_TARGET",
diff --git a/tests/reflection/buffer-layout.slang.1.expected b/tests/reflection/buffer-layout.slang.1.expected
@@ -249,7 +249,7 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "compute",
+            "stage": "compute",
             "parameters": [
                 {
                     "name": "dispatchThreadID",
diff --git a/tests/reflection/buffer-layout.slang.expected b/tests/reflection/buffer-layout.slang.expected
@@ -249,7 +249,7 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "compute",
+            "stage": "compute",
             "parameters": [
                 {
                     "name": "dispatchThreadID",
diff --git a/tests/reflection/cross-compile.slang.expected b/tests/reflection/cross-compile.slang.expected
@@ -70,8 +70,8 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment",
-            "result:": {
+            "stage": "fragment",
+            "result": {
                 "stage": "fragment",
                 "binding": {"kind": "varyingOutput", "index": 0},
                 "semanticName": "SV_TARGET",
diff --git a/tests/reflection/default-space.slang.expected b/tests/reflection/default-space.slang.expected
@@ -57,8 +57,8 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment",
-            "result:": {
+            "stage": "fragment",
+            "result": {
                 "stage": "fragment",
                 "binding": {"kind": "varyingOutput", "index": 0},
                 "semanticName": "SV_TARGET",
diff --git a/tests/reflection/explicit-register-space.slang.expected b/tests/reflection/explicit-register-space.slang.expected
@@ -16,8 +16,8 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment",
-            "result:": {
+            "stage": "fragment",
+            "result": {
                 "stage": "fragment",
                 "binding": {"kind": "varyingOutput", "index": 0},
                 "semanticName": "SV_TARGET",
diff --git a/tests/reflection/gh-55.glsl.expected b/tests/reflection/gh-55.glsl.expected
@@ -44,7 +44,7 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment"
+            "stage": "fragment"
         }
     ]
 }
diff --git a/tests/reflection/global-type-params.slang.expected b/tests/reflection/global-type-params.slang.expected
@@ -180,8 +180,8 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment",
-            "result:": {
+            "stage": "fragment",
+            "result": {
                 "stage": "fragment",
                 "binding": {"kind": "varyingOutput", "index": 0},
                 "semanticName": "SV_TARGET",
diff --git a/tests/reflection/global-uniforms.hlsl.expected b/tests/reflection/global-uniforms.hlsl.expected
@@ -71,7 +71,7 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment"
+            "stage": "fragment"
         }
     ]
 }
diff --git a/tests/reflection/matrix-layout.slang.1.expected b/tests/reflection/matrix-layout.slang.1.expected
@@ -230,8 +230,8 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment",
-            "result:": {
+            "stage": "fragment",
+            "result": {
                 "stage": "fragment",
                 "binding": {"kind": "varyingOutput", "index": 0},
                 "semanticName": "SV_TARGET",
diff --git a/tests/reflection/matrix-layout.slang.expected b/tests/reflection/matrix-layout.slang.expected
@@ -230,8 +230,8 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment",
-            "result:": {
+            "stage": "fragment",
+            "result": {
                 "stage": "fragment",
                 "binding": {"kind": "varyingOutput", "index": 0},
                 "semanticName": "SV_TARGET",
diff --git a/tests/reflection/mix-explicit-and-implicit-spaces.slang.expected b/tests/reflection/mix-explicit-and-implicit-spaces.slang.expected
@@ -140,7 +140,7 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "compute",
+            "stage": "compute",
             "threadGroupSize": [1, 1, 1]
         }
     ]
diff --git a/tests/reflection/multi-file.hlsl.expected b/tests/reflection/multi-file.hlsl.expected
@@ -402,8 +402,8 @@ standard output = {
     "entryPoints": [
         {
             "name": "mainVS",
-            "stage:": "vertex",
-            "result:": {
+            "stage": "vertex",
+            "result": {
                 "semanticName": "SV_POSITION",
                 "type": {
                     "kind": "vector",
@@ -417,8 +417,8 @@ standard output = {
         },
         {
             "name": "mainFS",
-            "stage:": "fragment",
-            "result:": {
+            "stage": "fragment",
+            "result": {
                 "stage": "fragment",
                 "binding": {"kind": "varyingOutput", "index": 0},
                 "semanticName": "SV_TARGET",
diff --git a/tests/reflection/parameter-block-explicit-space.slang.expected b/tests/reflection/parameter-block-explicit-space.slang.expected
@@ -196,8 +196,8 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment",
-            "result:": {
+            "stage": "fragment",
+            "result": {
                 "stage": "fragment",
                 "binding": {"kind": "varyingOutput", "index": 0},
                 "semanticName": "SV_TARGET",
diff --git a/tests/reflection/parameter-block.slang.1.expected b/tests/reflection/parameter-block.slang.1.expected
@@ -77,8 +77,8 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment",
-            "result:": {
+            "stage": "fragment",
+            "result": {
                 "stage": "fragment",
                 "binding": {"kind": "varyingOutput", "index": 0},
                 "semanticName": "SV_TARGET",
diff --git a/tests/reflection/parameter-block.slang.2.expected b/tests/reflection/parameter-block.slang.2.expected
@@ -74,8 +74,8 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment",
-            "result:": {
+            "stage": "fragment",
+            "result": {
                 "stage": "fragment",
                 "binding": {"kind": "varyingOutput", "index": 0},
                 "semanticName": "SV_TARGET",
diff --git a/tests/reflection/parameter-block.slang.expected b/tests/reflection/parameter-block.slang.expected
@@ -71,8 +71,8 @@ standard output = {
     "entryPoints": [
         {
             "name": "main",
-            "stage:": "fragment",
-            "result:": {
+            "stage": "fragment",
+            "result": {
                 "stage": "fragment",
                 "binding": {"kind": "varyingOutput", "index": 0},
                 "semanticName": "SV_TARGET",
diff --git a/tests/reflection/ptr/ptr-generic.slang.expected b/tests/reflection/ptr/ptr-generic.slang.expected
@@ -29,7 +29,7 @@ standard output = {
     "entryPoints": [
         {
             "name": "computeMain",
-            "stage:": "compute",
+            "stage": "compute",
             "parameters": [
                 {
                     "name": "dispatchThreadID",
diff --git a/tests/reflection/ptr/ptr-global.slang.expected b/tests/reflection/ptr/ptr-global.slang.expected
@@ -60,7 +60,7 @@ standard output = {
     "entryPoints": [
         {
             "name": "computeMain",
-            "stage:": "compute",
+            "stage": "compute",
             "parameters": [
                 {
                     "name": "dispatchThreadID",
diff --git a/tests/reflection/ptr/ptr-self-reference.slang.expected b/tests/reflection/ptr/ptr-self-reference.slang.expected
@@ -52,7 +52,7 @@ standard output = {
     "entryPoints": [
         {
             "name": "computeMain",
-            "stage:": "compute",
+            "stage": "compute",
             "parameters": [
                 {
                     "name": "dispatchThreadID",
diff --git a/tests/reflection/ptr/ptr-struct.slang.expected b/tests/reflection/ptr/ptr-struct.slang.expected
diff --git a/tests/reflection/reflect-imported-code.hlsl.expected b/tests/reflection/reflect-imported-code.hlsl.expected
diff --git a/tests/reflection/reflect-static.slang.expected b/tests/reflection/reflect-static.slang.expected
diff --git a/tests/reflection/reflection0.hlsl.expected b/tests/reflection/reflection0.hlsl.expected
diff --git a/tests/reflection/resource-in-cbuffer.hlsl.expected b/tests/reflection/resource-in-cbuffer.hlsl.expected
diff --git a/tests/reflection/sample-index-input.hlsl.expected b/tests/reflection/sample-index-input.hlsl.expected
diff --git a/tests/reflection/sample-rate-input.hlsl.expected b/tests/reflection/sample-rate-input.hlsl.expected
diff --git a/tests/reflection/shared-modifier.hlsl.expected b/tests/reflection/shared-modifier.hlsl.expected
diff --git a/tests/reflection/std430-layout.glsl.expected b/tests/reflection/std430-layout.glsl.expected
diff --git a/tests/reflection/structured-buffer.slang.expected b/tests/reflection/structured-buffer.slang.expected
diff --git a/tests/reflection/thread-group-size.hlsl.expected b/tests/reflection/thread-group-size.hlsl.expected
diff --git a/tests/reflection/unbounded-arrays.hlsl.1.expected b/tests/reflection/unbounded-arrays.hlsl.1.expected
diff --git a/tests/reflection/used-parameters.slang.expected b/tests/reflection/used-parameters.slang.expected
diff --git a/tests/reflection/vertex-input-semantics.hlsl.expected b/tests/reflection/vertex-input-semantics.hlsl.expected
diff --git a/tests/slang-extension/dynamic-resource-gl.slang.1.expected b/tests/slang-extension/dynamic-resource-gl.slang.1.expected

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ standard output = {`
`109`	`109`	`"entryPoints": [`
`110`	`110`	`{`
`111`	`111`	`"name": "computeMain",`
`112`		`- "stage:": "compute",`
	`112`	`+ "stage": "compute",`
`113`	`113`	`"parameters": [`
`114`	`114`	`{`
`115`	`115`	`"name": "dispatchThreadID",`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ standard output = {`
`228`	`228`	`"entryPoints": [`
`229`	`229`	`{`
`230`	`230`	`"name": "main",`
`231`		`- "stage:": "compute",`
	`231`	`+ "stage": "compute",`
`232`	`232`	`"parameters": [`
`233`	`233`	`{`
`234`	`234`	`"name": "dispatchThreadID",`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ standard output = {`
`21`	`21`	`"entryPoints": [`
`22`	`22`	`{`
`23`	`23`	`"name": "computeMain",`
`24`		`- "stage:": "compute",`
	`24`	`+ "stage": "compute",`
`25`	`25`	`"parameters": [`
`26`	`26`	`{`
`27`	`27`	`"name": "tid",`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ standard output = {`
`29`	`29`	`"entryPoints": [`
`30`	`30`	`{`
`31`	`31`	`"name": "computeMain",`
`32`		`- "stage:": "compute",`
	`32`	`+ "stage": "compute",`
`33`	`33`	`"parameters": [`
`34`	`34`	`{`
`35`	`35`	`"name": "dispatchThreadID",`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ standard output = {`
`265`	`265`	`"entryPoints": [`
`266`	`266`	`{`
`267`	`267`	`"name": "main",`
`268`		`- "stage:": "compute",`
	`268`	`+ "stage": "compute",`
`269`	`269`	`"parameters": [`
`270`	`270`	`{`
`271`	`271`	`"name": "dispatchThreadID",`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ standard output = {`
`249`	`249`	`"entryPoints": [`
`250`	`250`	`{`
`251`	`251`	`"name": "main",`
`252`		`- "stage:": "compute",`
	`252`	`+ "stage": "compute",`
`253`	`253`	`"parameters": [`
`254`	`254`	`{`
`255`	`255`	`"name": "dispatchThreadID",`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ standard output = {`
`44`	`44`	`"entryPoints": [`
`45`	`45`	`{`
`46`	`46`	`"name": "main",`
`47`		`- "stage:": "fragment"`
	`47`	`+ "stage": "fragment"`
`48`	`48`	`}`
`49`	`49`	`]`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ standard output = {`
`71`	`71`	`"entryPoints": [`
`72`	`72`	`{`
`73`	`73`	`"name": "main",`
`74`		`- "stage:": "fragment"`
	`74`	`+ "stage": "fragment"`
`75`	`75`	`}`
`76`	`76`	`]`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ standard output = {`
`140`	`140`	`"entryPoints": [`
`141`	`141`	`{`
`142`	`142`	`"name": "main",`
`143`		`- "stage:": "compute",`
	`143`	`+ "stage": "compute",`
`144`	`144`	`"threadGroupSize": [1, 1, 1]`
`145`	`145`	`}`
`146`	`146`	`]`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ standard output = {`
`60`	`60`	`"entryPoints": [`
`61`	`61`	`{`
`62`	`62`	`"name": "computeMain",`
`63`		`- "stage:": "compute",`
	`63`	`+ "stage": "compute",`
`64`	`64`	`"parameters": [`
`65`	`65`	`{`
`66`	`66`	`"name": "dispatchThreadID",`