[PATCH v3 0/2] MR109: vkd3d-shader/hlsl: Improve handling of builtin aliases "matrix" and "vector".

[Nikolay Sivov (＠nsivov)]

--
  v3: vkd3d-shader/hlsl: Improve handling of builtin alias type "vector".
      vkd3d-shader/hlsl: Improve handling of builtin alias type "matrix".

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/109

[PATCH v3 1/2] vkd3d-shader/hlsl: Improve handling of builtin alias type "matrix".

[Nikolay Sivov]

From: Nikolay Sivov

---
 libs/vkd3d-shader/hlsl.c          |  3 ++-
 tests/hlsl-type-names.shader_test | 32 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index 64d6e870..f84b60fe 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -614,6 +614,7 @@ static const char * get_case_insensitive_typename(const char *name)
     {
         "dword",
         "float",
+        "matrix",
     };
     unsigned int i;

@@ -2845,7 +2846,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx)
         {"dword",           HLSL_CLASS_SCALAR, HLSL_TYPE_UINT,          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},
+        {"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},
diff --git a/tests/hlsl-type-names.shader_test b/tests/hlsl-type-names.shader_test
index e88f1cda..69510b34 100644
--- a/tests/hlsl-type-names.shader_test
+++ b/tests/hlsl-type-names.shader_test
@@ -2,6 +2,7 @@
 typedef float2 Dword;
 typedef float3 dWord;
 typedef float2 fLoat;
+typedef float2 mAtrix;

float4 f()
 {
@@ -10,6 +11,9 @@ float4 f()
     dword v1 = {1, 2};
     float v2 = {2, 3};
     DWORD v4 = 4;
+    mAtrix v5 = {1, 2};
+    maTrix v6 = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
+    matrix v7 = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
     return float4(v1.x, v2.x, v2.y, v4);
 }

@@ -55,3 +59,31 @@ float4 main() : sv_target
 {
     return float4(0, 0, 0, 0);
 }
+
+[pixel shader fail]
+typedef float2 matrix;
+
+float4 main() : sv_target
+{
+    return float4(0, 0, 0, 0);
+}
+
+[pixel shader fail]
+float4 f()
+{
+    typedef float2 matrix;
+    return float4(0, 0, 0, 0);
+}
+
+float4 main() : SV_TARGET
+{
+    return f();
+}
+
+[pixel shader fail]
+Matrix<float, 2, 2> m;
+
+float4 main() : sv_target
+{
+    return float4(0, 0, 0, 0);
+}

[PATCH v3 2/2] vkd3d-shader/hlsl: Improve handling of builtin alias type "vector".

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 libs/vkd3d-shader/hlsl.c          |  3 ++-
 tests/hlsl-type-names.shader_test | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index f84b60fe..4effb986 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -615,6 +615,7 @@ static const char * get_case_insensitive_typename(const char *name)
         "dword",
         "float",
         "matrix",
+        "vector",
     };
     unsigned int i;

@@ -2845,7 +2846,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx)
     {
         {"dword",           HLSL_CLASS_SCALAR, HLSL_TYPE_UINT,          1, 1},
         {"float",           HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT,         1, 1},
-        {"VECTOR",          HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT,         4, 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},
diff --git a/tests/hlsl-type-names.shader_test b/tests/hlsl-type-names.shader_test
index 69510b34..f382ffae 100644
--- a/tests/hlsl-type-names.shader_test
+++ b/tests/hlsl-type-names.shader_test
@@ -3,6 +3,7 @@ typedef float2 Dword;
 typedef float3 dWord;
 typedef float2 fLoat;
 typedef float2 mAtrix;
+typedef float2 vEctor;

float4 f()
 {
@@ -14,6 +15,10 @@ float4 f()
     mAtrix v5 = {1, 2};
     maTrix v6 = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
     matrix v7 = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
+    vector v8 = {1, 2, 3, 4};
+    vEctor v9 = {1, 2};
+    Vector v10 = {1, 2, 3, 4};
+    vectoR v11 = {1, 2, 3, 4};
     return float4(v1.x, v2.x, v2.y, v4);
 }

@@ -80,6 +85,18 @@ float4 main() : SV_TARGET
     return f();
 }

+[pixel shader fail]
+float4 f()
+{
+    typedef float2 vector;
+    return float4(0, 0, 0, 0);
+}
+
+float4 main() : SV_TARGET
+{
+    return f();
+}
+
 [pixel shader fail]
 Matrix<float, 2, 2> m;

@@ -87,3 +104,11 @@ float4 main() : sv_target
 {
     return float4(0, 0, 0, 0);
 }
+
+[pixel shader fail]
+Vector<float, 2> v;
+
+float4 main() : sv_target
+{
+    return float4(0, 0, 0, 0);
+}

[Nikolay Sivov (＠nsivov)]

On Wed Mar 22 11:42:36 2023 +0000, Giovanni Mascellani wrote:
> Well, for example my comment...

Okay, I added something for 'vector' keyword that fails otherwise.

[PATCH v3 0/2] MR109: vkd3d-shader/hlsl: Improve handling of builtin aliases "matrix" and "vector". - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.

[PATCH v3 0/2] MR109: vkd3d-shader/hlsl: Improve handling of builtin aliases "matrix" and "vector". - approved

[Francisco Casas (＠fcasas)]

This merge request was approved by Francisco Casas.

[PATCH v3 0/2] MR109: vkd3d-shader/hlsl: Improve handling of builtin aliases "matrix" and "vector". - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.

[PATCH v3 0/2] MR109: vkd3d-shader/hlsl: Improve handling of builtin aliases "matrix" and "vector". - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.