Francisco Casas : vkd3d-shader/hlsl: Express deref->offset in whole registers.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 1520f327e5602041469816ff5992e5fe0c3e1224
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/1520f327e5602041469816ff5992e5...

Author: Francisco Casas <fcasas(a)codeweavers.com>
Date:   Tue Oct  3 19:14:54 2023 -0300

vkd3d-shader/hlsl: Express deref->offset in whole registers.

This is required to use SM4 relative addressing, because it is limited
to whole-register granularity.

---

 libs/vkd3d-shader/hlsl.c         |  3 ---
 libs/vkd3d-shader/hlsl.h         |  2 +-
 libs/vkd3d-shader/hlsl_codegen.c | 22 ++++++++++++----------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index 437dd912..b26bde31 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -2437,10 +2437,7 @@ static void dump_deref(struct vkd3d_string_buffer *buffer, const struct hlsl_der
 
             vkd3d_string_buffer_printf(buffer, "[");
             if (show_rel)
-            {
                 dump_src(buffer, &deref->offset);
-                vkd3d_string_buffer_printf(buffer, "c");
-            }
             if (show_rel && show_const)
                 vkd3d_string_buffer_printf(buffer, " + ");
             if (show_const)
diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index 208615dd..39b57d2f 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -642,7 +642,7 @@ struct hlsl_deref
      *   regset) from the start of the variable, to the part of the variable that is referenced.
      * This offset is stored using two fields, one for a variable part and other for a constant
      *   part, which are added together:
-     *   - offset: An offset given by an instruction node, in number of register components.
+     *   - offset: An offset given by an instruction node, in whole registers.
      *   - const_offset: A constant number of register components.
      * Since the type information cannot longer be retrieved from the offset alone, the type is
      *   stored in the data_type field, which remains NULL if the deref hasn't been lowered yet. */
diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index f2389ad0..5c3b7eb6 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -37,14 +37,7 @@ static struct hlsl_ir_node *new_offset_from_path_index(struct hlsl_ctx *ctx, str
 
         case HLSL_CLASS_MATRIX:
         {
-            if (!(c = hlsl_new_uint_constant(ctx, 4, loc)))
-                return NULL;
-            hlsl_block_add_instr(block, c);
-
-            if (!(idx_offset = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, c, idx)))
-                return NULL;
-            hlsl_block_add_instr(block, idx_offset);
-
+            idx_offset = idx;
             break;
         }
 
@@ -52,6 +45,12 @@ static struct hlsl_ir_node *new_offset_from_path_index(struct hlsl_ctx *ctx, str
         {
             unsigned int size = hlsl_type_get_array_element_reg_size(type->e.array.type, regset);
 
+            if (regset == HLSL_REGSET_NUMERIC)
+            {
+                assert(size % 4 == 0);
+                size /= 4;
+            }
+
             if (!(c = hlsl_new_uint_constant(ctx, size, loc)))
                 return NULL;
             hlsl_block_add_instr(block, c);
@@ -73,7 +72,7 @@ static struct hlsl_ir_node *new_offset_from_path_index(struct hlsl_ctx *ctx, str
             {
                 assert(*offset_component == 0);
                 *offset_component = field_offset % 4;
-                field_offset -= *offset_component;
+                field_offset /= 4;
             }
 
             if (!(c = hlsl_new_uint_constant(ctx, field_offset, loc)))
@@ -4470,7 +4469,10 @@ bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref
         if (offset_node->type != HLSL_IR_CONSTANT)
             return false;
 
-        *offset += hlsl_ir_constant(offset_node)->value.u[0].u;
+        if (regset == HLSL_REGSET_NUMERIC)
+            *offset += 4 * hlsl_ir_constant(offset_node)->value.u[0].u;
+        else
+            *offset += hlsl_ir_constant(offset_node)->value.u[0].u;
     }
 
     size = deref->var->data_type->reg_size[regset];