[PATCH v2 0/1] MR188: vkd3d-shader/tpf: Add support for emitting sample_l instructions

[Ethan Lee (＠flibitijibibo)]

> From what I can tell, the recent work on SampleBias/SampleLevel did all of the work for us, we just need to take the same framework and include the case for the `sample_l` instruction.

Tested with some shaders from the native Linux version of Little Racers STREET.

--
  v2: vkd3d-shader/tpf: Add support for emitting sample_l instructions
 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/188

[PATCH v2 1/1] vkd3d-shader/tpf: Add support for emitting sample_l instructions

[Ethan Lee]

From: Ethan Lee <flibitijibibo(a)gmail.com>

Signed-off-by: Ethan Lee <flibitijibibo(a)gmail.com>
---
 libs/vkd3d-shader/tpf.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c
index 3debe952..1aa4d3c7 100644
--- a/libs/vkd3d-shader/tpf.c
+++ b/libs/vkd3d-shader/tpf.c
@@ -3717,6 +3717,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;
@@ -3743,7 +3747,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_BIAS
+           || load->load_type == HLSL_RESOURCE_SAMPLE_LOD)
     {
         sm4_src_from_node(&instr.srcs[3], load->lod.node, VKD3DSP_WRITEMASK_ALL);
         ++instr.src_count;
@@ -4515,6 +4520,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:
             if (!load->sampler.var)
             {
@@ -4543,10 +4549,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;
     }
 }
 
-- 
GitLab

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

[Ethan Lee (＠flibitijibibo)]

Quick push to add `LOD` to what was previously only checking for `LOD_BIAS` - this gets LRS to run with the vkd3d HLSL compiler (the error I was getting before looked like BZ#54832 again, turns out that was wrong)!

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/188#note_31554