[PATCH v2 0/1] MR496: vkd3d-shader: Handle 'linear centroid' modifier.

[Nikolay Sivov (＠nsivov)]

--
  v2: vkd3d-shader/hlsl: Handle 'linear centroid' modifier.

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

[PATCH v2 1/1] vkd3d-shader/hlsl: Handle 'linear centroid' modifier.

[Nikolay Sivov]

From: Nikolay Sivov

---
 libs/vkd3d-shader/hlsl.h | 3 ++-
 libs/vkd3d-shader/hlsl.l | 1 +
 libs/vkd3d-shader/hlsl.y | 5 +++++
 libs/vkd3d-shader/tpf.c  | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index f35967642..21b2fe383 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -357,13 +357,14 @@ struct hlsl_attribute
 #define HLSL_MODIFIER_INLINE         0x00002000
 #define HLSL_STORAGE_CENTROID        0x00004000
 #define HLSL_STORAGE_NOPERSPECTIVE   0x00008000
+#define HLSL_STORAGE_LINEAR          0x00010000

#define HLSL_TYPE_MODIFIERS_MASK     (HLSL_MODIFIER_PRECISE | HLSL_MODIFIER_VOLATILE | \
                                       HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \
                                       HLSL_MODIFIER_COLUMN_MAJOR)

#define HLSL_INTERPOLATION_MODIFIERS_MASK (HLSL_STORAGE_NOINTERPOLATION | HLSL_STORAGE_CENTROID | \
-                                           HLSL_STORAGE_NOPERSPECTIVE)
+                                           HLSL_STORAGE_NOPERSPECTIVE | HLSL_STORAGE_LINEAR)

#define HLSL_MODIFIERS_MAJORITY_MASK (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR)

diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l
index 401fba604..fe8387507 100644
--- a/libs/vkd3d-shader/hlsl.l
+++ b/libs/vkd3d-shader/hlsl.l
@@ -95,6 +95,7 @@ if                      {return KW_IF;                  }
 in                      {return KW_IN;                  }
 inline                  {return KW_INLINE;              }
 inout                   {return KW_INOUT;               }
+linear                  {return KW_LINEAR;              }
 matrix                  {return KW_MATRIX;              }
 namespace               {return KW_NAMESPACE;           }
 nointerpolation         {return KW_NOINTERPOLATION;     }
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 67b012936..0dde4c185 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -4893,6 +4893,7 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls
 %token KW_IN
 %token KW_INLINE
 %token KW_INOUT
+%token KW_LINEAR
 %token KW_MATRIX
 %token KW_NAMESPACE
 %token KW_NOINTERPOLATION
@@ -6262,6 +6263,10 @@ var_modifiers:
         {
             $$ = add_modifiers(ctx, $2, HLSL_STORAGE_CENTROID, &@1);
         }
+    | KW_LINEAR var_modifiers
+        {
+            $$ = add_modifiers(ctx, $2, HLSL_STORAGE_LINEAR, &@1);
+        }
     | KW_NOPERSPECTIVE var_modifiers
         {
             $$ = add_modifiers(ctx, $2, HLSL_STORAGE_NOPERSPECTIVE, &@1);
diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c
index 61d14e30d..6eb07abc9 100644
--- a/libs/vkd3d-shader/tpf.c
+++ b/libs/vkd3d-shader/tpf.c
@@ -4311,6 +4311,7 @@ static void write_sm4_dcl_semantic(const struct tpf_writer *tpf, const struct hl
                     { HLSL_STORAGE_CENTROID | HLSL_STORAGE_NOPERSPECTIVE, VKD3DSIM_LINEAR_NOPERSPECTIVE_CENTROID },
                     { HLSL_STORAGE_NOPERSPECTIVE, VKD3DSIM_LINEAR_NOPERSPECTIVE },
                     { HLSL_STORAGE_CENTROID, VKD3DSIM_LINEAR_CENTROID },
+                    { HLSL_STORAGE_CENTROID | HLSL_STORAGE_LINEAR, VKD3DSIM_LINEAR_CENTROID },
                 };
                 unsigned int i;

[Zebediah Figura (＠zfigura)]

> Some test coverage wouldn't hurt either.

Yeah, I wouldn't have approved this without any tests. Oh well, I'll add it to the list [1]...

At least I can say it *looks* right.

[1] https://wiki.winehq.org/Vkd3d-todo#Tests