From 76fdeaa477a5d21176facf0296f77e28e2d59477 Mon Sep 17 00:00:00 2001 From: Stan <109335133+stanoddly@users.noreply.github.com> Date: Sat, 21 Dec 2024 17:14:56 +0100 Subject: Fixed stage and result field names in json reflection (#5927) --- tests/reflection/actual-global.slang.expected | 2 +- tests/reflection/arrays.hlsl.expected | 4 ++-- tests/reflection/attribute.slang.expected | 2 +- tests/reflection/binding-gl.hlsl.expected | 4 ++-- tests/reflection/binding-push-constant-gl.hlsl.expected | 4 ++-- tests/reflection/buffer-layout.slang.1.expected | 2 +- tests/reflection/buffer-layout.slang.expected | 2 +- tests/reflection/cross-compile.slang.expected | 4 ++-- tests/reflection/default-space.slang.expected | 4 ++-- tests/reflection/explicit-register-space.slang.expected | 4 ++-- tests/reflection/gh-55.glsl.expected | 2 +- tests/reflection/global-type-params.slang.expected | 4 ++-- tests/reflection/global-uniforms.hlsl.expected | 2 +- tests/reflection/matrix-layout.slang.1.expected | 4 ++-- tests/reflection/matrix-layout.slang.expected | 4 ++-- tests/reflection/mix-explicit-and-implicit-spaces.slang.expected | 2 +- tests/reflection/multi-file.hlsl.expected | 8 ++++---- tests/reflection/parameter-block-explicit-space.slang.expected | 4 ++-- tests/reflection/parameter-block.slang.1.expected | 4 ++-- tests/reflection/parameter-block.slang.2.expected | 4 ++-- tests/reflection/parameter-block.slang.expected | 4 ++-- tests/reflection/ptr/ptr-generic.slang.expected | 2 +- tests/reflection/ptr/ptr-global.slang.expected | 2 +- tests/reflection/ptr/ptr-self-reference.slang.expected | 2 +- tests/reflection/ptr/ptr-struct.slang.expected | 2 +- tests/reflection/reflect-imported-code.hlsl.expected | 4 ++-- tests/reflection/reflect-static.slang.expected | 2 +- tests/reflection/reflection0.hlsl.expected | 4 ++-- tests/reflection/resource-in-cbuffer.hlsl.expected | 4 ++-- tests/reflection/sample-index-input.hlsl.expected | 4 ++-- tests/reflection/sample-rate-input.hlsl.expected | 4 ++-- tests/reflection/shared-modifier.hlsl.expected | 4 ++-- tests/reflection/std430-layout.glsl.expected | 2 +- tests/reflection/structured-buffer.slang.expected | 4 ++-- tests/reflection/thread-group-size.hlsl.expected | 2 +- tests/reflection/unbounded-arrays.hlsl.1.expected | 2 +- tests/reflection/used-parameters.slang.expected | 2 +- tests/reflection/vertex-input-semantics.hlsl.expected | 4 ++-- 38 files changed, 62 insertions(+), 62 deletions(-) (limited to 'tests/reflection') diff --git a/tests/reflection/actual-global.slang.expected b/tests/reflection/actual-global.slang.expected index 5dbcde22e..bef1a05d9 100644 --- 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 index 2152ed0df..f53d63723 100644 --- 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 index a5bce747b..ee48b466c 100644 --- 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 index 8c2e761b5..73c4da3ae 100644 --- 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 index 0b906d461..6570625e9 100644 --- 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 index 0b01f54a1..be59f888f 100644 --- 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 index 4fc7b2381..84a3e4b49 100644 --- 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 index e3dd63095..f85e4e0e9 100644 --- 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 index 2667ae96e..c6ec6c19f 100644 --- 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 index 0c282f5f9..725318084 100644 --- 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 index 993984d93..8dc9a58bc 100644 --- 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 index a168ce03f..0da9c975e 100644 --- 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 index e36665673..ec2511533 100644 --- 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 index 0683a6edc..e471f060c 100644 --- 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 index c81207216..c42b1bfec 100644 --- 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 index 36943df02..3bf9fc3ec 100644 --- 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 index 1cbc73f5c..0472a0b0a 100644 --- 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 index 6a0c1467a..908029839 100644 --- 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 index b8f462e60..5b1b45624 100644 --- 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 index fdcc428e9..31477df38 100644 --- 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 index 1d0feaa77..48b1bccbd 100644 --- 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 index 7aebc0187..e2473db42 100644 --- 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 index bd57d6a4b..1a6c15a7e 100644 --- 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 index e17de757a..81745fb20 100644 --- 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 index 1a7ea5562..3ae17416c 100644 --- a/tests/reflection/ptr/ptr-struct.slang.expected +++ b/tests/reflection/ptr/ptr-struct.slang.expected @@ -102,7 +102,7 @@ standard output = { "entryPoints": [ { "name": "computeMain", - "stage:": "compute", + "stage": "compute", "parameters": [ { "name": "dispatchThreadID", diff --git a/tests/reflection/reflect-imported-code.hlsl.expected b/tests/reflection/reflect-imported-code.hlsl.expected index 5d51ddb5c..cff6c50bb 100644 --- a/tests/reflection/reflect-imported-code.hlsl.expected +++ b/tests/reflection/reflect-imported-code.hlsl.expected @@ -116,8 +116,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/reflect-static.slang.expected b/tests/reflection/reflect-static.slang.expected index 46bae4a17..e7d5aa356 100644 --- a/tests/reflection/reflect-static.slang.expected +++ b/tests/reflection/reflect-static.slang.expected @@ -103,7 +103,7 @@ standard output = { "entryPoints": [ { "name": "computeMain", - "stage:": "compute", + "stage": "compute", "parameters": [ { "name": "dispatchThreadID", diff --git a/tests/reflection/reflection0.hlsl.expected b/tests/reflection/reflection0.hlsl.expected index 64b8fcd85..10f228cb1 100644 --- a/tests/reflection/reflection0.hlsl.expected +++ b/tests/reflection/reflection0.hlsl.expected @@ -62,8 +62,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/resource-in-cbuffer.hlsl.expected b/tests/reflection/resource-in-cbuffer.hlsl.expected index 3be146d7c..7d4251684 100644 --- a/tests/reflection/resource-in-cbuffer.hlsl.expected +++ b/tests/reflection/resource-in-cbuffer.hlsl.expected @@ -109,8 +109,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/sample-index-input.hlsl.expected b/tests/reflection/sample-index-input.hlsl.expected index d0bc3c1b9..7eb2e1896 100644 --- a/tests/reflection/sample-index-input.hlsl.expected +++ b/tests/reflection/sample-index-input.hlsl.expected @@ -9,7 +9,7 @@ standard output = { "entryPoints": [ { "name": "main", - "stage:": "fragment", + "stage": "fragment", "parameters": [ { "name": "input", @@ -46,7 +46,7 @@ standard output = { } ], "usesAnySampleRateInput": true, - "result:": { + "result": { "stage": "fragment", "binding": {"kind": "varyingOutput", "index": 0}, "semanticName": "SV_TARGET", diff --git a/tests/reflection/sample-rate-input.hlsl.expected b/tests/reflection/sample-rate-input.hlsl.expected index 485594fae..61aeaa163 100644 --- a/tests/reflection/sample-rate-input.hlsl.expected +++ b/tests/reflection/sample-rate-input.hlsl.expected @@ -9,7 +9,7 @@ standard output = { "entryPoints": [ { "name": "main", - "stage:": "fragment", + "stage": "fragment", "parameters": [ { "name": "input", @@ -52,7 +52,7 @@ standard output = { } ], "usesAnySampleRateInput": true, - "result:": { + "result": { "stage": "fragment", "binding": {"kind": "varyingOutput", "index": 0}, "semanticName": "SV_TARGET", diff --git a/tests/reflection/shared-modifier.hlsl.expected b/tests/reflection/shared-modifier.hlsl.expected index 782e038de..61774ed19 100644 --- a/tests/reflection/shared-modifier.hlsl.expected +++ b/tests/reflection/shared-modifier.hlsl.expected @@ -24,7 +24,7 @@ standard output = { "entryPoints": [ { "name": "main", - "stage:": "fragment", + "stage": "fragment", "parameters": [ { "name": "uv", @@ -41,7 +41,7 @@ standard output = { } } ], - "result:": { + "result": { "stage": "fragment", "binding": {"kind": "varyingOutput", "index": 0}, "semanticName": "SV_TARGET", diff --git a/tests/reflection/std430-layout.glsl.expected b/tests/reflection/std430-layout.glsl.expected index 7c9c514d6..780775c82 100644 --- a/tests/reflection/std430-layout.glsl.expected +++ b/tests/reflection/std430-layout.glsl.expected @@ -107,7 +107,7 @@ standard output = { "entryPoints": [ { "name": "main", - "stage:": "fragment" + "stage": "fragment" } ] } diff --git a/tests/reflection/structured-buffer.slang.expected b/tests/reflection/structured-buffer.slang.expected index d0cb3e501..54842d8f0 100644 --- a/tests/reflection/structured-buffer.slang.expected +++ b/tests/reflection/structured-buffer.slang.expected @@ -78,8 +78,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/thread-group-size.hlsl.expected b/tests/reflection/thread-group-size.hlsl.expected index 46b0eb87e..2f49623d7 100644 --- a/tests/reflection/thread-group-size.hlsl.expected +++ b/tests/reflection/thread-group-size.hlsl.expected @@ -21,7 +21,7 @@ standard output = { "entryPoints": [ { "name": "main", - "stage:": "compute", + "stage": "compute", "parameters": [ { "name": "tid", diff --git a/tests/reflection/unbounded-arrays.hlsl.1.expected b/tests/reflection/unbounded-arrays.hlsl.1.expected index daa1cb789..c8d8f6bed 100644 --- a/tests/reflection/unbounded-arrays.hlsl.1.expected +++ b/tests/reflection/unbounded-arrays.hlsl.1.expected @@ -113,7 +113,7 @@ standard output = { "entryPoints": [ { "name": "main", - "stage:": "compute", + "stage": "compute", "parameters": [ { "name": "tid", diff --git a/tests/reflection/used-parameters.slang.expected b/tests/reflection/used-parameters.slang.expected index 2bbc5b41a..fb63e55f9 100644 --- a/tests/reflection/used-parameters.slang.expected +++ b/tests/reflection/used-parameters.slang.expected @@ -254,7 +254,7 @@ standard output = { "entryPoints": [ { "name": "main", - "stage:": "compute", + "stage": "compute", "parameters": [ { "name": "dispatchThreadID", diff --git a/tests/reflection/vertex-input-semantics.hlsl.expected b/tests/reflection/vertex-input-semantics.hlsl.expected index e15a3a258..4007a1a9d 100644 --- a/tests/reflection/vertex-input-semantics.hlsl.expected +++ b/tests/reflection/vertex-input-semantics.hlsl.expected @@ -9,7 +9,7 @@ standard output = { "entryPoints": [ { "name": "main", - "stage:": "vertex", + "stage": "vertex", "parameters": [ { "name": "a", @@ -161,7 +161,7 @@ standard output = { } } ], - "result:": { + "result": { "semanticName": "SV_POSITION", "type": { "kind": "vector", -- cgit v1.2.3