Nikolay Sivov : vkd3d-shader/sm4: Write sample count field for multisampled texture declaration.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 2880be647e77f6cde7f8efcba3bcdd1ccc0afbb1
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/2880be647e77f6cde7f8efcba3bcdd...

Author: Nikolay Sivov 
Date:   Sat Mar  4 19:59:02 2023 +0100

vkd3d-shader/sm4: Write sample count field for multisampled texture declaration.

Signed-off-by: Nikolay Sivov

---

libs/vkd3d-shader/hlsl_sm4.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c
index 3e1769ac..f81be3e9 100644
--- a/libs/vkd3d-shader/hlsl_sm4.c
+++ b/libs/vkd3d-shader/hlsl_sm4.c
@@ -1164,7 +1164,7 @@ static void write_sm4_dcl_sampler(struct vkd3d_bytecode_buffer *buffer, const st
 static void write_sm4_dcl_texture(struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_var *var)
 {
     bool uav = (var->data_type->base_type == HLSL_TYPE_UAV);
-    const struct sm4_instruction instr =
+    struct sm4_instruction instr =
     {
         .opcode = (uav ? VKD3D_SM5_OP_DCL_UAV_TYPED : VKD3D_SM4_OP_DCL_RESOURCE)
                 | (sm4_resource_dimension(var->data_type) << VKD3D_SM4_RESOURCE_TYPE_SHIFT),
@@ -1177,6 +1177,13 @@ static void write_sm4_dcl_texture(struct vkd3d_bytecode_buffer *buffer, const st
         .idx[0] = sm4_resource_format(var->data_type) * 0x1111,
         .idx_count = 1,
     };
+
+    if (var->data_type->sampler_dim == HLSL_SAMPLER_DIM_2DMS
+            || var->data_type->sampler_dim == HLSL_SAMPLER_DIM_2DMSARRAY)
+    {
+        instr.opcode |= var->data_type->sample_count << VKD3D_SM4_RESOURCE_SAMPLE_COUNT_SHIFT;
+    }
+
     write_sm4_instruction(buffer, &instr);
 }