Francisco Casas : vkd3d-shader/hlsl: Add offset parameter to 'Load' method.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 8e07423ba1ec3d32b06c31f66e7e31fd94e9d1fb
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/8e07423ba1ec3d32b06c31f66e7e31...

Author: Francisco Casas 
Date:   Tue Apr  5 17:28:09 2022 -0400

vkd3d-shader/hlsl: Add offset parameter to 'Load' method.

Signed-off-by: Francisco Casas

---

libs/vkd3d-shader/hlsl.y | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 1dae75f9..624481d8 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -2541,26 +2541,38 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl
             && object_type->sampler_dim != HLSL_SAMPLER_DIM_CUBEARRAY)
     {
         const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim);
+        const unsigned int offset_dim = hlsl_offset_dim_count(object_type->sampler_dim);
         struct hlsl_ir_resource_load *load;
+        struct hlsl_ir_node *offset = NULL;
         struct hlsl_ir_node *coords;
+        bool multisampled;
+
+        multisampled = object_type->sampler_dim == HLSL_SAMPLER_DIM_2DMS
+                || object_type->sampler_dim == HLSL_SAMPLER_DIM_2DMSARRAY;

-        if (object_type->sampler_dim == HLSL_SAMPLER_DIM_2DMS
-                || object_type->sampler_dim == HLSL_SAMPLER_DIM_2DMSARRAY)
+        if (params->args_count < 1 + multisampled || params->args_count > 3 + multisampled)
         {
-            FIXME("'Load' method for multi-sample textures.\n");
+            hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT,
+                    "Wrong number of arguments to method 'Load': expected between %u and %u, but got %u.",
+                    1 + multisampled, 3 + multisampled, params->args_count);
             return false;
         }
+        if (multisampled)
+        {
+            hlsl_fixme(ctx, loc, "Load() sampling index parameter.");
+        }

-        if (params->args_count < 1 || params->args_count > 3)
+        assert(offset_dim);
+        if (params->args_count > 1 + multisampled)
         {
-            hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT,
-                    "Wrong number of arguments to method 'Load': expected 1, 2, or 3, but got %u.", params->args_count);
-            return false;
+            if (!(offset = add_implicit_conversion(ctx, instrs, params->args[1 + multisampled],
+                    hlsl_get_vector_type(ctx, HLSL_TYPE_INT, offset_dim), loc)))
+                return false;
         }
-        if (params->args_count >= 2)
-            hlsl_fixme(ctx, loc, "Offset parameter.");
-        if (params->args_count == 3)
+        if (params->args_count > 2 + multisampled)
+        {
             hlsl_fixme(ctx, loc, "Tiled resource status argument.");
+        }

/* +1 for the mipmap level */
         if (!(coords = add_implicit_conversion(ctx, instrs, params->args[0],
@@ -2568,7 +2580,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl
             return false;

if (!(load = hlsl_new_resource_load(ctx, object_type->e.resource_format, HLSL_RESOURCE_LOAD,
-                &object_load->src, NULL, coords, NULL, loc)))
+                &object_load->src, NULL, coords, offset, loc)))
             return false;
         list_add_tail(instrs, &load->node.entry);
         return true;