[PATCH 03/10] vkd3d-shader/hlsl: Set component count for objects to 1.

[Francisco Casas]

From: Francisco Casas

Signed-off-by: Francisco Casas 
---
 libs/vkd3d-shader/hlsl.c                   | 17 ++++++++++-------
 tests/hlsl-initializer-objects.shader_test |  4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index a47e3d2d..f076f9cf 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -558,15 +558,18 @@ unsigned int hlsl_type_component_count(const struct hlsl_type *type)
     {
         return hlsl_type_component_count(type->e.array.type) * type->e.array.elements_count;
     }
-    if (type->type != HLSL_CLASS_STRUCT)
+    if (type->type == HLSL_CLASS_OBJECT)
     {
-        ERR("Unexpected data type %#x.\n", type->type);
-        return 0;
+        return 1;
     }
-
-    for (i = 0; i < type->e.record.field_count; ++i)
-        count += hlsl_type_component_count(type->e.record.fields[i].type);
-    return count;
+    if (type->type == HLSL_CLASS_STRUCT)
+    {
+        for (i = 0; i < type->e.record.field_count; ++i)
+            count += hlsl_type_component_count(type->e.record.fields[i].type);
+        return count;
+    }
+    assert(0);
+    return 0;
 }

bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2)
diff --git a/tests/hlsl-initializer-objects.shader_test b/tests/hlsl-initializer-objects.shader_test
index 2306d07f..70f060c2 100644
--- a/tests/hlsl-initializer-objects.shader_test
+++ b/tests/hlsl-initializer-objects.shader_test
@@ -71,7 +71,7 @@ float4 main() : sv_target
 }

-[pixel shader fail todo]
+[pixel shader fail]
 Texture2D tex;

struct foo
@@ -90,7 +90,7 @@ float4 main() : sv_target
 }

-[pixel shader fail todo]
+[pixel shader fail]
 Texture2D tex;

struct foo