[PATCH v2 0/3] MR339: vkd3d-shader/hlsl: Produce 2D resource declarations and loads for tex1D().

[Nikolay Sivov (＠nsivov)]

Signed-off-by: Nikolay Sivov

--
  v2: vkd3d-shader/asm: Tweak TEXCOORD declaration name.
      vkd3d-shader/d3dbc: Disallow 1D sampler types when writing sampler declaration.
      vkd3d-shader/hlsl: Produce 2D resource declarations and loads for tex1D().

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

[PATCH v2 1/3] vkd3d-shader/hlsl: Produce 2D resource declarations and loads for tex1D().

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 libs/vkd3d-shader/hlsl.y                 | 37 +++++++++++++++++++++++-
 tests/hlsl/combined-samplers.shader_test |  6 ++--
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 67fd9f6f..fb6d485e 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -3457,7 +3457,42 @@ static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer *

if (!(coords = add_implicit_conversion(ctx, params->instrs, params->args[1],
             hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, hlsl_sampler_dim_count(dim)), loc)))
-        coords = params->args[1];
+    {
+        return false;
+    }
+
+    /* tex1D() functions never produce 1D resource declarations. For newer profiles half offset
+       is used for the second coordinate, while older ones appear to replicate first coordinate.*/
+    if (dim == HLSL_SAMPLER_DIM_1D)
+    {
+        struct hlsl_ir_load *load;
+        struct hlsl_ir_node *half;
+        struct hlsl_ir_var *var;
+        unsigned int idx = 0;
+
+        if (!(var = hlsl_new_synthetic_var(ctx, "coords", hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, 2), loc)))
+            return false;
+
+        initialize_var_components(ctx, params->instrs, var, &idx, coords);
+        if (shader_profile_version_ge(ctx, 4, 0))
+        {
+            if (!(half = hlsl_new_float_constant(ctx, 0.5f, loc)))
+                return false;
+            hlsl_block_add_instr(params->instrs, half);
+
+            initialize_var_components(ctx, params->instrs, var, &idx, half);
+        }
+        else
+            initialize_var_components(ctx, params->instrs, var, &idx, coords);
+
+        if (!(load = hlsl_new_var_load(ctx, var, loc)))
+            return false;
+        hlsl_block_add_instr(params->instrs, &load->node);
+
+        coords = &load->node;
+
+        dim = HLSL_SAMPLER_DIM_2D;
+    }

load_params.coords = coords;
     load_params.resource = params->args[0];
diff --git a/tests/hlsl/combined-samplers.shader_test b/tests/hlsl/combined-samplers.shader_test
index 57644c26..465c11cb 100644
--- a/tests/hlsl/combined-samplers.shader_test
+++ b/tests/hlsl/combined-samplers.shader_test
@@ -121,7 +121,7 @@ float4 main() : sv_target
 }

-[pixel shader todo]
+[pixel shader]
 sampler sam[2];

float4 main() : sv_target
@@ -130,8 +130,8 @@ float4 main() : sv_target
 }

[test]
-todo draw quad
-todo probe all rgba (1, 1, 1, 11)
+draw quad
+probe all rgba (1, 1, 1, 11)

[require]

[PATCH v2 2/3] vkd3d-shader/d3dbc: Disallow 1D sampler types when writing sampler declaration.

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 libs/vkd3d-shader/d3dbc.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c
index 2b02d51f..d5104ae9 100644
--- a/libs/vkd3d-shader/d3dbc.c
+++ b/libs/vkd3d-shader/d3dbc.c
@@ -1982,10 +1982,6 @@ static void write_sm1_sampler_dcl(struct hlsl_ctx *ctx, struct vkd3d_bytecode_bu

switch (sampler_dim)
     {
-        case HLSL_SAMPLER_DIM_1D:
-            res_type = VKD3D_SM1_RESOURCE_TEXTURE_1D;
-            break;
-
         case HLSL_SAMPLER_DIM_2D:
             res_type = VKD3D_SM1_RESOURCE_TEXTURE_2D;
             break;

[PATCH v2 3/3] vkd3d-shader/asm: Tweak TEXCOORD declaration name.

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 libs/vkd3d-shader/d3d_asm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c
index d72402eb..f0c386f1 100644
--- a/libs/vkd3d-shader/d3d_asm.c
+++ b/libs/vkd3d-shader/d3d_asm.c
@@ -714,7 +714,7 @@ static void shader_dump_decl_usage(struct vkd3d_d3d_asm_compiler *compiler,
                 break;

case VKD3D_DECL_USAGE_TEXCOORD:
-                shader_addline(buffer, "texture%u", semantic->usage_idx);
+                shader_addline(buffer, "texcoord%u", semantic->usage_idx);
                 break;

case VKD3D_DECL_USAGE_TANGENT:

[Nikolay Sivov (＠nsivov)]

On Wed Sep 13 05:35:57 2023 +0000, Nikolay Sivov wrote:
> changed this line in [version 2 of the diff](/wine/vkd3d/-/merge_requests/339/diffs?diff_id=68717&start_sha=6d801c583d359b70141ce89cd7c0539a1184bbb1#9155b9453b4ec8ea0b9b025dfb55c061bd931610_3481_3479)

Done.

[Giovanni Mascellani (＠giomasce)]

Giovanni Mascellani (@giomasce) commented about libs/vkd3d-shader/hlsl.y:
> -
>    unsigned int idx = 0;
> -
> -
>    if (!(var = hlsl_new_synthetic_var(ctx, "coords", hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, 2), loc)))
> -
>        return false;
> -
> -
>    initialize_var_components(ctx, params->instrs, var, &idx, coords);
> -
>    if (shader_profile_version_ge(ctx, 4, 0))
> -
>    {
> -
>        if (!(half = hlsl_new_float_constant(ctx, 0.5f, loc)))
> -
>            return false;
> -
>        hlsl_block_add_instr(params->instrs, half);
> -
> -
>        initialize_var_components(ctx, params->instrs, var, &idx, half);
> -
>    }
> -
>    else
> -
>        initialize_var_components(ctx, params->instrs, var, &idx, coords);

Nitpick: this should be enclosed in braces (because the other branch is).

[PATCH v2 0/3] MR339: vkd3d-shader/hlsl: Produce 2D resource declarations and loads for tex1D(). - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.

[PATCH v2 0/3] MR339: vkd3d-shader/hlsl: Produce 2D resource declarations and loads for tex1D(). - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.

[PATCH v2 0/3] MR339: vkd3d-shader/hlsl: Produce 2D resource declarations and loads for tex1D(). - approved

[Francisco Casas (＠fcasas)]

This merge request was approved by Francisco Casas.