wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/msl: Implement VKD3DSIH_GATHER4.

Browse Source
This commit is contained in:
Henri Verbeet
2025-05-26 21:11:13 +02:00
parent 3cc404759d
commit 841cf65a41
Notes: Henri Verbeet 2025-06-24 16:32:54 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1593
2 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
libs/vkd3d-shader/msl.c
View File

@@ -61,6 +61,8 @@ struct msl_resource_type_info
bool array; bool array;
/* Whether the resource type has a shadow/comparison variant. */ /* Whether the resource type has a shadow/comparison variant. */
bool comparison; 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 /* The type suffix for the resource type. I.e., the "2d_ms" part of
* "texture2d_ms_array" or "depth2d_ms_array". */ * "texture2d_ms_array" or "depth2d_ms_array". */
const char *type_suffix; 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[] = static const struct msl_resource_type_info info[] =
{ {
[VKD3D_SHADER_RESOURCE_NONE] = {0, 0, 0, "none"}, [VKD3D_SHADER_RESOURCE_NONE] = {0, 0, 0, 0, "none"},
[VKD3D_SHADER_RESOURCE_BUFFER] = {1, 0, 0, "_buffer"}, [VKD3D_SHADER_RESOURCE_BUFFER] = {1, 0, 0, 0, "_buffer"},
[VKD3D_SHADER_RESOURCE_TEXTURE_1D] = {1, 0, 0, "1d"}, [VKD3D_SHADER_RESOURCE_TEXTURE_1D] = {1, 0, 0, 0, "1d"},
[VKD3D_SHADER_RESOURCE_TEXTURE_2D] = {2, 0, 1, "2d"}, [VKD3D_SHADER_RESOURCE_TEXTURE_2D] = {2, 0, 1, 1, "2d"},
[VKD3D_SHADER_RESOURCE_TEXTURE_2DMS] = {2, 0, 1, "2d_ms"}, [VKD3D_SHADER_RESOURCE_TEXTURE_2DMS] = {2, 0, 1, 0, "2d_ms"},
[VKD3D_SHADER_RESOURCE_TEXTURE_3D] = {3, 0, 0, "3d"}, [VKD3D_SHADER_RESOURCE_TEXTURE_3D] = {3, 0, 0, 1, "3d"},
[VKD3D_SHADER_RESOURCE_TEXTURE_CUBE] = {3, 0, 1, "cube"}, [VKD3D_SHADER_RESOURCE_TEXTURE_CUBE] = {3, 0, 1, 0, "cube"},
[VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY] = {1, 1, 0, "1d"}, [VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY] = {1, 1, 0, 0, "1d"},
[VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY] = {2, 1, 1, "2d"}, [VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY] = {2, 1, 1, 1, "2d"},
[VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY] = {2, 1, 1, "2d_ms"}, [VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY] = {2, 1, 1, 0, "2d_ms"},
[VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY] = {3, 1, 1, "cube"}, [VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY] = {3, 1, 1, 0, "cube"},
}; };
if (!t || t >= ARRAY_SIZE(info)) 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) 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; const struct msl_resource_type_info *resource_type_info;
unsigned int resource_id, resource_idx, resource_space; unsigned int resource_id, resource_idx, resource_space;
const struct vkd3d_shader_descriptor_binding *binding; 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; unsigned int srv_binding, sampler_binding;
struct vkd3d_string_buffer *sample; struct vkd3d_string_buffer *sample;
enum vkd3d_data_type data_type; enum vkd3d_data_type data_type;
unsigned int component_idx;
uint32_t coord_mask; uint32_t coord_mask;
struct msl_dst dst; struct msl_dst dst;
bias = ins->opcode == VKD3DSIH_SAMPLE_B; bias = ins->opcode == VKD3DSIH_SAMPLE_B;
compare = ins->opcode == VKD3DSIH_SAMPLE_C || ins->opcode == VKD3DSIH_SAMPLE_C_LZ; compare = ins->opcode == VKD3DSIH_SAMPLE_C || ins->opcode == VKD3DSIH_SAMPLE_C_LZ;
gather = ins->opcode == VKD3DSIH_GATHER4;
grad = ins->opcode == VKD3DSIH_SAMPLE_GRAD; grad = ins->opcode == VKD3DSIH_SAMPLE_GRAD;
lod = ins->opcode == VKD3DSIH_SAMPLE_LOD; lod = ins->opcode == VKD3DSIH_SAMPLE_LOD;
lod_zero = ins->opcode == VKD3DSIH_SAMPLE_C_LZ; 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, msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_UNSUPPORTED,
"Resource type %#x does not support mipmapping.", resource_type); "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))) if (!(resource_type_info = msl_get_resource_type_info(resource_type)))
{ {
msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL, 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) if (ins->dst[0].reg.data_type == VKD3D_DATA_UINT)
vkd3d_string_buffer_printf(sample, "as_type<uint4>("); vkd3d_string_buffer_printf(sample, "as_type<uint4>(");
msl_print_srv_name(sample, gen, srv_binding, resource_type_info, data_type, compare); 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("); vkd3d_string_buffer_printf(sample, ".sample_compare(");
else else
vkd3d_string_buffer_printf(sample, ".sample("); 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); msl_print_src_with_type(sample, gen, &ins->src[3], VKD3DSP_WRITEMASK_0, ins->src[3].reg.data_type);
vkd3d_string_buffer_printf(sample, ")"); 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, ")"); vkd3d_string_buffer_printf(sample, ")");
if (ins->dst[0].reg.data_type == VKD3D_DATA_UINT) if (ins->dst[0].reg.data_type == VKD3D_DATA_UINT)
vkd3d_string_buffer_printf(sample, ")"); vkd3d_string_buffer_printf(sample, ")");
@@ -1278,6 +1295,7 @@ static void msl_handle_instruction(struct msl_generator *gen, const struct vkd3d
case VKD3DSIH_FTOU: case VKD3DSIH_FTOU:
msl_cast(gen, ins, "uint"); msl_cast(gen, ins, "uint");
break; break;
case VKD3DSIH_GATHER4:
case VKD3DSIH_SAMPLE: case VKD3DSIH_SAMPLE:
case VKD3DSIH_SAMPLE_B: case VKD3DSIH_SAMPLE_B:
case VKD3DSIH_SAMPLE_C: case VKD3DSIH_SAMPLE_C:

12
tests/hlsl/gather.shader_test
View File

@@ -23,7 +23,7 @@ float4 main() : sv_target
} }
[test] [test]
todo(msl) draw quad draw quad
probe (0, 0) rgba (0.0, 0.1, 0.1, 0.0) probe (0, 0) rgba (0.0, 0.1, 0.1, 0.0)
@@ -37,7 +37,7 @@ float4 main() : sv_target
} }
[test] [test]
todo(msl) draw quad draw quad
probe (0, 0) rgba (0.1, 0.2, 0.2, 0.1) probe (0, 0) rgba (0.1, 0.2, 0.2, 0.1)
@@ -55,7 +55,7 @@ float4 main() : sv_target
} }
[test] [test]
todo(msl) draw quad draw quad
probe (0, 0) rgba (0.1, 0.1, 0.0, 0.0) probe (0, 0) rgba (0.1, 0.1, 0.0, 0.0)
@@ -69,7 +69,7 @@ float4 main() : sv_target
} }
[test] [test]
todo(msl) draw quad draw quad
probe (0, 0) rgba (0.2, 0.2, 0.1, 0.1) probe (0, 0) rgba (0.2, 0.2, 0.1, 0.1)
@@ -97,7 +97,7 @@ float4 main() : sv_target
} }
[test] [test]
todo(msl) draw quad draw quad
probe (0, 0) rgba (0.0, 0.5, 0.0, 0.5) probe (0, 0) rgba (0.0, 0.5, 0.0, 0.5)
@@ -111,5 +111,5 @@ float4 main() : sv_target
} }
[test] [test]
todo(msl) draw quad draw quad
probe (0, 0) rgba (0.4, 0.0, 0.4, 0.0) probe (0, 0) rgba (0.4, 0.0, 0.4, 0.0)