From 138a44ef272841cb555fa0eb5c49cc889bf1d64a Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Sat, 15 Jul 2023 01:40:11 -0400 Subject: Fix vk-shift-* mapping issue (#2993) * Fix vk-shift-* mappings. * Add some doc info about vk-shift. * Fix diagnostic test. --- tests/bindings/hlsl-to-vulkan-shift.hlsl | 2 +- tests/bindings/hlsl-to-vulkan-shift.hlsl.expected | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/bindings') diff --git a/tests/bindings/hlsl-to-vulkan-shift.hlsl b/tests/bindings/hlsl-to-vulkan-shift.hlsl index 8981b6be6..13f76297d 100644 --- a/tests/bindings/hlsl-to-vulkan-shift.hlsl +++ b/tests/bindings/hlsl-to-vulkan-shift.hlsl @@ -1,4 +1,4 @@ -//TEST:REFLECTION:-target glsl -profile ps_4_0 -entry main -fvk-t-shift 5 all -fvk-t-shift 7 2 -fvk-s-shift -3 0 -fvk-b-shift 1 2 +//TEST:REFLECTION:-target glsl -profile ps_4_0 -entry main -fvk-t-shift 5 all -fvk-t-shift 7 2 -fvk-s-shift -3 0 -fvk-u-shift 0 all -fvk-u-shift 1 2 -fvk-b-shift 1 0 struct Data { diff --git a/tests/bindings/hlsl-to-vulkan-shift.hlsl.expected b/tests/bindings/hlsl-to-vulkan-shift.hlsl.expected index b0d8ace6f..939f847ca 100644 --- a/tests/bindings/hlsl-to-vulkan-shift.hlsl.expected +++ b/tests/bindings/hlsl-to-vulkan-shift.hlsl.expected @@ -21,7 +21,7 @@ standard output = { }, { "name": "c", - "binding": {"kind": "descriptorTableSlot", "index": 0}, + "binding": {"kind": "descriptorTableSlot", "index": 3}, "type": { "kind": "constantBuffer", "elementType": { @@ -86,7 +86,7 @@ standard output = { }, { "name": "u", - "binding": {"kind": "descriptorTableSlot", "index": 2}, + "binding": {"kind": "descriptorTableSlot", "index": 11}, "type": { "kind": "resource", "baseShape": "structuredBuffer", @@ -157,7 +157,7 @@ standard output = { }, { "name": "c", - "binding": {"kind": "descriptorTableSlot", "index": 0} + "binding": {"kind": "descriptorTableSlot", "index": 3} }, { "name": "t2", @@ -165,7 +165,7 @@ standard output = { }, { "name": "u", - "binding": {"kind": "descriptorTableSlot", "index": 2} + "binding": {"kind": "descriptorTableSlot", "index": 11} }, { "name": "u2", -- cgit v1.2.3