Ethan Lee : vkd3d-shader/tpf: Add support for emitting sample_l instructions.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: ea7d8c65bde9e1712b38638340c0fcfdc7ffdb23
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/ea7d8c65bde9e1712b38638340c0fc...

Author: Ethan Lee 
Date:   Fri May  5 12:54:15 2023 -0400

vkd3d-shader/tpf: Add support for emitting sample_l instructions.

Signed-off-by: Ethan Lee

---

libs/vkd3d-shader/tpf.c        | 12 +++++++-----
 tests/sample-level.shader_test |  8 ++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c
index 690b7b9b..2166eb41 100644
--- a/libs/vkd3d-shader/tpf.c
+++ b/libs/vkd3d-shader/tpf.c
@@ -4108,6 +4108,10 @@ static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer
             instr.opcode = VKD3D_SM4_OP_SAMPLE;
             break;

+        case HLSL_RESOURCE_SAMPLE_LOD:
+            instr.opcode = VKD3D_SM4_OP_SAMPLE_LOD;
+            break;
+
         case HLSL_RESOURCE_SAMPLE_LOD_BIAS:
             instr.opcode = VKD3D_SM4_OP_SAMPLE_B;
             break;
@@ -4138,7 +4142,8 @@ static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer
     sm4_src_from_deref(ctx, &instr.srcs[2], sampler, sampler->var->data_type, VKD3DSP_WRITEMASK_ALL);
     instr.src_count = 3;

-    if (load->load_type == HLSL_RESOURCE_SAMPLE_LOD_BIAS)
+    if (load->load_type == HLSL_RESOURCE_SAMPLE_LOD
+           || load->load_type == HLSL_RESOURCE_SAMPLE_LOD_BIAS)
     {
         sm4_src_from_node(&instr.srcs[3], load->lod.node, VKD3DSP_WRITEMASK_ALL);
         ++instr.src_count;
@@ -4947,6 +4952,7 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx,
             break;

case HLSL_RESOURCE_SAMPLE:
+        case HLSL_RESOURCE_SAMPLE_LOD:
         case HLSL_RESOURCE_SAMPLE_LOD_BIAS:
         case HLSL_RESOURCE_SAMPLE_GRAD:
             if (!load->sampler.var)
@@ -4976,10 +4982,6 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx,
             write_sm4_gather(ctx, buffer, resource_type, &load->node, &load->resource,
                     &load->sampler, coords, HLSL_SWIZZLE(W, W, W, W), texel_offset);
             break;
-
-        case HLSL_RESOURCE_SAMPLE_LOD:
-            hlsl_fixme(ctx, &load->node.loc, "SM4 sample-LOD expression.");
-            break;
     }
 }

diff --git a/tests/sample-level.shader_test b/tests/sample-level.shader_test
index 564826d0..ec7c7e2a 100644
--- a/tests/sample-level.shader_test
+++ b/tests/sample-level.shader_test
@@ -14,7 +14,7 @@ levels 2

0.0 0.0 1.0 0.0

-[pixel shader todo]
+[pixel shader]
 sampler s;
 Texture2D t;
 uniform float level;
@@ -26,11 +26,11 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0.0 0.0 0.0 0.0
-todo draw quad
+draw quad
 probe all rgba (1.0, 0.0, 1.0, 0.0)
 uniform 0 float4 0.5 0.0 0.0 0.0
-todo draw quad
+draw quad
 probe all rgba (0.5, 0.0, 1.0, 0.0)
 uniform 0 float4 1.0 0.0 0.0 0.0
-todo draw quad
+draw quad
 probe all rgba (0.0, 0.0, 1.0, 0.0)