[PATCH 0/1] MR440: vkd3d-shader/dxil: Allow empty struct types.

[PATCH 1/1] vkd3d-shader/dxil: Allow empty struct types.

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/dxil.c                    | 2 +-
 tests/hlsl/object-field-offsets.shader_test | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index 86e12afe5..8cb764084 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -1374,7 +1374,7 @@ static enum vkd3d_result sm6_parser_type_table_init(struct sm6_parser *sm6)

case TYPE_CODE_STRUCT_ANON:
             case TYPE_CODE_STRUCT_NAMED:
-                if (!dxil_record_validate_operand_min_count(record, 2, sm6))
+                if (!dxil_record_validate_operand_min_count(record, 1, sm6))
                     return VKD3D_ERROR_INVALID_SHADER;
                 if (record->code == TYPE_CODE_STRUCT_NAMED && !struct_name)
                 {
diff --git a/tests/hlsl/object-field-offsets.shader_test b/tests/hlsl/object-field-offsets.shader_test
index 9cc4581ba..8afd9af7d 100644
--- a/tests/hlsl/object-field-offsets.shader_test
+++ b/tests/hlsl/object-field-offsets.shader_test
@@ -45,7 +45,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 5.0 6.0 7.0 8.0
-todo(sm>=6) draw quad
+draw quad
 probe all rgba (1.0, 2.0, 5.0, 0.0)

[PATCH 0/1] MR440: vkd3d-shader/dxil: Allow empty struct types. - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.

[PATCH 0/1] MR440: vkd3d-shader/dxil: Allow empty struct types. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.