Francisco Casas : vkd3d-shader/hlsl: Use proper dimensions on Sample method offset parameter.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 652906aea7e90926534a0abd3d9b968888489754
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/652906aea7e90926534a0abd3d9b96...

Author: Francisco Casas 
Date:   Wed Apr 27 14:32:39 2022 -0400

vkd3d-shader/hlsl: Use proper dimensions on Sample method offset parameter.

Signed-off-by: Francisco Casas

---

libs/vkd3d-shader/hlsl.y | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 6fb329d7..7e92f1ac 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -2491,6 +2491,30 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type
     return params->instrs;
 }

+static unsigned int hlsl_offset_dim_count(enum hlsl_sampler_dim dim)
+{
+    switch (dim)
+    {
+        case HLSL_SAMPLER_DIM_1D:
+        case HLSL_SAMPLER_DIM_1DARRAY:
+            return 1;
+        case HLSL_SAMPLER_DIM_2D:
+        case HLSL_SAMPLER_DIM_2DMS:
+        case HLSL_SAMPLER_DIM_2DARRAY:
+        case HLSL_SAMPLER_DIM_2DMSARRAY:
+            return 2;
+        case HLSL_SAMPLER_DIM_3D:
+            return 3;
+        case HLSL_SAMPLER_DIM_CUBE:
+        case HLSL_SAMPLER_DIM_CUBEARRAY:
+            /* Offset parameters not supported for these types. */
+            return 0;
+        default:
+            assert(0);
+            return 0;
+    }
+}
+
 static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *object,
         const char *name, const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
 {
@@ -2554,6 +2578,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl
             && object_type->sampler_dim != HLSL_SAMPLER_DIM_2DMSARRAY)
     {
         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);
         const struct hlsl_type *sampler_type;
         struct hlsl_ir_resource_load *load;
         struct hlsl_ir_node *offset = NULL;
@@ -2587,10 +2612,10 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl
                 hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, sampler_dim), loc)))
             return false;

-        if (params->args_count == 3)
+        if (!!offset_dim && params->args_count == 3)
         {
             if (!(offset = add_implicit_conversion(ctx, instrs, params->args[2],
-                    hlsl_get_vector_type(ctx, HLSL_TYPE_INT, sampler_dim), loc)))
+                    hlsl_get_vector_type(ctx, HLSL_TYPE_INT, offset_dim), loc)))
                 return false;
         }