[PATCH 1/4] vkd3d-shader/hlsl: Support case-insensitive lookup for selected builtin types.

[Nikolay Sivov]

From: Nikolay Sivov

---
 Makefile.am                       |  1 +
 libs/vkd3d-shader/hlsl.c          | 33 ++++++++++++++++++++++++++-----
 tests/hlsl-type-names.shader_test | 19 ++++++++++++++++++
 3 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 tests/hlsl-type-names.shader_test

diff --git a/Makefile.am b/Makefile.am
index f9199472..9080d907 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -113,6 +113,7 @@ vkd3d_shader_tests = \
    tests/hlsl-struct-assignment.shader_test \
    tests/hlsl-struct-semantics.shader_test \
    tests/hlsl-transpose.shader_test \
+	tests/hlsl-type-names.shader_test \
    tests/hlsl-vector-indexing.shader_test \
    tests/hlsl-vector-indexing-uniform.shader_test \
    tests/logic-operations.shader_test \
diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index 5dbdaf7e..ef6fb312 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -542,6 +542,24 @@ struct hlsl_type *hlsl_new_uav_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim
     return type;
 }

+static const char * get_case_insensitive_typename(const char *name)
+{
+    static const char *names[] =
+    {
+        "dword",
+        "float",
+        "matrix",
+        "string",
+        "vector",
+    };
+    unsigned int i;
+
+    for (i = 0; i < ARRAY_SIZE(names); ++i)
+        if (!ascii_strcasecmp(names[i], name)) return names[i];
+
+    return NULL;
+}
+
 struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive)
 {
     struct rb_entry *entry = rb_get(&scope->types, name);
@@ -549,6 +567,12 @@ struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool
     if (entry)
         return RB_ENTRY_VALUE(entry, struct hlsl_type, scope_entry);

+    if (!scope->upper && (name = get_case_insensitive_typename(name)))
+    {
+        if ((entry = rb_get(&scope->types, name)))
+            return RB_ENTRY_VALUE(entry, struct hlsl_type, scope_entry);
+    }
+
     if (recursive && scope->upper)
         return hlsl_get_type(scope->upper, name, recursive);
     return NULL;
@@ -2743,11 +2767,10 @@ static void declare_predefined_types(struct hlsl_ctx *ctx)
     }
     effect_types[] =
     {
-        {"DWORD",           HLSL_CLASS_SCALAR, HLSL_TYPE_INT,           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},
+        {"dword",           HLSL_CLASS_SCALAR, HLSL_TYPE_INT,           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},
         {"TEXTURE",         HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE,       1, 1},
         {"PIXELSHADER",     HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER,   1, 1},
         {"VERTEXSHADER",    HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER,  1, 1},
diff --git a/tests/hlsl-type-names.shader_test b/tests/hlsl-type-names.shader_test
new file mode 100644
index 00000000..f6506f6e
--- /dev/null
+++ b/tests/hlsl-type-names.shader_test
@@ -0,0 +1,19 @@
+[pixel shader]
+float4 main() : sv_target
+{
+    vector<fLoat, 4> f1 = {1.0, 2.0, 3.0, 4.0};
+    flOat f2 = 5.0;
+    dWord d = 6;
+    MaTrix m = {
+            0.0, 7.0, 0.0, 0.0,
+            0.0, 0.0, 0.0, 0.0,
+            0.0, 0.0, 0.0, 0.0,
+            0.0, 0.0, 0.0, 0.0,
+    };
+    Vector v;
+    return float4(f1.x, m._12, d, f2);
+}
+
+[test]
+draw quad
+probe all rgba (1.0, 7.0, 6.0, 5.0)