[PATCH v3 3/3] vkd3d-shader/hlsl: Support case-insensitive lookup for builtin 'float' type.

[Nikolay Sivov]

From: Nikolay Sivov

---
 libs/vkd3d-shader/hlsl.c          |  3 ++-
 tests/hlsl-type-names.shader_test | 13 +++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index e4797524..3a97b87f 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -547,6 +547,7 @@ static const char * get_case_insensitive_typename(const char *name)
     static const char *const names[] =
     {
         "dword",
+        "float",
     };
     unsigned int i;

@@ -2767,7 +2768,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx)
     effect_types[] =
     {
         {"dword",           HLSL_CLASS_SCALAR, HLSL_TYPE_UINT,          1, 1},
-        {"FLOAT",           HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT,         1, 1},
+        {"float",           HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT,         1, 1},
         {"VECTOR",          HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT,         4, 1},
         {"MATRIX",          HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT,         4, 4},
         {"STRING",          HLSL_CLASS_OBJECT, HLSL_TYPE_STRING,        1, 1},
diff --git a/tests/hlsl-type-names.shader_test b/tests/hlsl-type-names.shader_test
index 8d5e5e75..f739995d 100644
--- a/tests/hlsl-type-names.shader_test
+++ b/tests/hlsl-type-names.shader_test
@@ -1,19 +1,24 @@
 [pixel shader]
 typedef float2 Dword;
 typedef float3 dWord;
+typedef float2 fLoat;

float4 f()
 {
     typedef Dword dword;
-    dword v = {1, 2};
-    return float4(v.x, v.y, 3, 4);
+    typedef fLoat float;
+    dword v1 = {1, 2};
+    float v2 = {3, 4};
+    return float4(v1.x, v1.y, v2.x, v2.y);
 }

float4 f2()
 {
     typedef dword dword;
-    dword v = 1;
-    return float4(v, v, v, v);
+    typedef float float;
+    dword v1 = 1;
+    float v2 = 1;
+    return float4(v1, v2, v1, v1);
 }

float4 main() : SV_TARGET