From 841cf65a411b992b0f8b86d60e42e41c2ffc7252 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Mon, 26 May 2025 21:11:13 +0200 Subject: [PATCH] vkd3d-shader/msl: Implement VKD3DSIH_GATHER4. --- libs/vkd3d-shader/msl.c | 44 ++++++++++++++++++++++++----------- tests/hlsl/gather.shader_test | 12 +++++----- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/msl.c b/libs/vkd3d-shader/msl.c index d23019f06..61bec776f 100644 --- a/libs/vkd3d-shader/msl.c +++ b/libs/vkd3d-shader/msl.c @@ -61,6 +61,8 @@ struct msl_resource_type_info bool array; /* Whether the resource type has a shadow/comparison variant. */ bool comparison; + /* Whether the resource type supports texel sample offsets. */ + bool offset; /* The type suffix for the resource type. I.e., the "2d_ms" part of * "texture2d_ms_array" or "depth2d_ms_array". */ const char *type_suffix; @@ -84,17 +86,17 @@ static const struct msl_resource_type_info *msl_get_resource_type_info(enum vkd3 { static const struct msl_resource_type_info info[] = { - [VKD3D_SHADER_RESOURCE_NONE] = {0, 0, 0, "none"}, - [VKD3D_SHADER_RESOURCE_BUFFER] = {1, 0, 0, "_buffer"}, - [VKD3D_SHADER_RESOURCE_TEXTURE_1D] = {1, 0, 0, "1d"}, - [VKD3D_SHADER_RESOURCE_TEXTURE_2D] = {2, 0, 1, "2d"}, - [VKD3D_SHADER_RESOURCE_TEXTURE_2DMS] = {2, 0, 1, "2d_ms"}, - [VKD3D_SHADER_RESOURCE_TEXTURE_3D] = {3, 0, 0, "3d"}, - [VKD3D_SHADER_RESOURCE_TEXTURE_CUBE] = {3, 0, 1, "cube"}, - [VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY] = {1, 1, 0, "1d"}, - [VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY] = {2, 1, 1, "2d"}, - [VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY] = {2, 1, 1, "2d_ms"}, - [VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY] = {3, 1, 1, "cube"}, + [VKD3D_SHADER_RESOURCE_NONE] = {0, 0, 0, 0, "none"}, + [VKD3D_SHADER_RESOURCE_BUFFER] = {1, 0, 0, 0, "_buffer"}, + [VKD3D_SHADER_RESOURCE_TEXTURE_1D] = {1, 0, 0, 0, "1d"}, + [VKD3D_SHADER_RESOURCE_TEXTURE_2D] = {2, 0, 1, 1, "2d"}, + [VKD3D_SHADER_RESOURCE_TEXTURE_2DMS] = {2, 0, 1, 0, "2d_ms"}, + [VKD3D_SHADER_RESOURCE_TEXTURE_3D] = {3, 0, 0, 1, "3d"}, + [VKD3D_SHADER_RESOURCE_TEXTURE_CUBE] = {3, 0, 1, 0, "cube"}, + [VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY] = {1, 1, 0, 0, "1d"}, + [VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY] = {2, 1, 1, 1, "2d"}, + [VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY] = {2, 1, 1, 0, "2d_ms"}, + [VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY] = {3, 1, 1, 0, "cube"}, }; if (!t || t >= ARRAY_SIZE(info)) @@ -963,7 +965,7 @@ static void msl_ld(struct msl_generator *gen, const struct vkd3d_shader_instruct static void msl_sample(struct msl_generator *gen, const struct vkd3d_shader_instruction *ins) { - bool bias, compare, comparison_sampler, grad, lod, lod_zero; + bool bias, compare, comparison_sampler, gather, grad, lod, lod_zero; const struct msl_resource_type_info *resource_type_info; unsigned int resource_id, resource_idx, resource_space; const struct vkd3d_shader_descriptor_binding *binding; @@ -973,11 +975,13 @@ static void msl_sample(struct msl_generator *gen, const struct vkd3d_shader_inst unsigned int srv_binding, sampler_binding; struct vkd3d_string_buffer *sample; enum vkd3d_data_type data_type; + unsigned int component_idx; uint32_t coord_mask; struct msl_dst dst; bias = ins->opcode == VKD3DSIH_SAMPLE_B; compare = ins->opcode == VKD3DSIH_SAMPLE_C || ins->opcode == VKD3DSIH_SAMPLE_C_LZ; + gather = ins->opcode == VKD3DSIH_GATHER4; grad = ins->opcode == VKD3DSIH_SAMPLE_GRAD; lod = ins->opcode == VKD3DSIH_SAMPLE_LOD; lod_zero = ins->opcode == VKD3DSIH_SAMPLE_C_LZ; @@ -1020,6 +1024,11 @@ static void msl_sample(struct msl_generator *gen, const struct vkd3d_shader_inst msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_UNSUPPORTED, "Resource type %#x does not support mipmapping.", resource_type); + if ((resource_type == VKD3D_SHADER_RESOURCE_TEXTURE_1D || resource_type == VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY + || resource_type == VKD3D_SHADER_RESOURCE_TEXTURE_3D) && gather) + msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_UNSUPPORTED, + "Resource type %#x does not support gather operations.", resource_type); + if (!(resource_type_info = msl_get_resource_type_info(resource_type))) { msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL, @@ -1086,7 +1095,9 @@ static void msl_sample(struct msl_generator *gen, const struct vkd3d_shader_inst if (ins->dst[0].reg.data_type == VKD3D_DATA_UINT) vkd3d_string_buffer_printf(sample, "as_type("); msl_print_srv_name(sample, gen, srv_binding, resource_type_info, data_type, compare); - if (compare) + if (gather) + vkd3d_string_buffer_printf(sample, ".gather("); + else if (compare) vkd3d_string_buffer_printf(sample, ".sample_compare("); else vkd3d_string_buffer_printf(sample, ".sample("); @@ -1131,6 +1142,12 @@ static void msl_sample(struct msl_generator *gen, const struct vkd3d_shader_inst msl_print_src_with_type(sample, gen, &ins->src[3], VKD3DSP_WRITEMASK_0, ins->src[3].reg.data_type); vkd3d_string_buffer_printf(sample, ")"); } + if (gather && (component_idx = vsir_swizzle_get_component(ins->src[2].swizzle, 0))) + { + if (resource_type_info->offset) + vkd3d_string_buffer_printf(sample, ", int2(0)"); + vkd3d_string_buffer_printf(sample, ", component::%c", "xyzw"[component_idx]); + } vkd3d_string_buffer_printf(sample, ")"); if (ins->dst[0].reg.data_type == VKD3D_DATA_UINT) vkd3d_string_buffer_printf(sample, ")"); @@ -1278,6 +1295,7 @@ static void msl_handle_instruction(struct msl_generator *gen, const struct vkd3d case VKD3DSIH_FTOU: msl_cast(gen, ins, "uint"); break; + case VKD3DSIH_GATHER4: case VKD3DSIH_SAMPLE: case VKD3DSIH_SAMPLE_B: case VKD3DSIH_SAMPLE_C: diff --git a/tests/hlsl/gather.shader_test b/tests/hlsl/gather.shader_test index 7c7a8b9b0..fdfc05bb3 100644 --- a/tests/hlsl/gather.shader_test +++ b/tests/hlsl/gather.shader_test @@ -23,7 +23,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.0, 0.1, 0.1, 0.0) @@ -37,7 +37,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.1, 0.2, 0.2, 0.1) @@ -55,7 +55,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.1, 0.1, 0.0, 0.0) @@ -69,7 +69,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.2, 0.2, 0.1, 0.1) @@ -97,7 +97,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.0, 0.5, 0.0, 0.5) @@ -111,5 +111,5 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.4, 0.0, 0.4, 0.0)