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_SAMPLE_C_LZ

Browse Source
This commit is contained in:
Henri Verbeet
2025-05-26 00:30:36 +02:00
parent f30510a9b3
commit db89687807
Notes: Henri Verbeet 2025-06-23 20:18:16 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1565
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -966,17 +966,18 @@ static void msl_sample(struct msl_generator *gen, const struct vkd3d_shader_inst
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;
unsigned int sampler_id, sampler_idx, sampler_space; unsigned int sampler_id, sampler_idx, sampler_space;
bool bias, compare, comparison_sampler, lod_zero;
const struct vkd3d_shader_descriptor_info1 *d; const struct vkd3d_shader_descriptor_info1 *d;
enum vkd3d_shader_resource_type resource_type; enum vkd3d_shader_resource_type resource_type;
unsigned int srv_binding, sampler_binding; unsigned int srv_binding, sampler_binding;
bool bias, compare, comparison_sampler;
struct vkd3d_string_buffer *sample; struct vkd3d_string_buffer *sample;
enum vkd3d_data_type data_type; enum vkd3d_data_type data_type;
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; compare = ins->opcode == VKD3DSIH_SAMPLE_C || ins->opcode == VKD3DSIH_SAMPLE_C_LZ;
lod_zero = ins->opcode == VKD3DSIH_SAMPLE_C_LZ;
if (vkd3d_shader_instruction_has_texel_offset(ins)) if (vkd3d_shader_instruction_has_texel_offset(ins))
msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL, msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL,
@@ -1012,7 +1013,7 @@ static void msl_sample(struct msl_generator *gen, const struct vkd3d_shader_inst
"Sampling resource type %#x is not supported.", resource_type); "Sampling resource type %#x is not supported.", resource_type);
if ((resource_type == VKD3D_SHADER_RESOURCE_TEXTURE_1D || resource_type == VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY) if ((resource_type == VKD3D_SHADER_RESOURCE_TEXTURE_1D || resource_type == VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY)
&& bias) && (bias || lod_zero))
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);
@@ -1103,6 +1104,10 @@ static void msl_sample(struct msl_generator *gen, const struct vkd3d_shader_inst
vkd3d_string_buffer_printf(sample, ", "); vkd3d_string_buffer_printf(sample, ", ");
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);
} }
if (lod_zero)
{
vkd3d_string_buffer_printf(sample, ", level(0.0f)");
}
if (bias) if (bias)
{ {
vkd3d_string_buffer_printf(sample, ", bias("); vkd3d_string_buffer_printf(sample, ", bias(");
@@ -1290,6 +1295,7 @@ static void msl_handle_instruction(struct msl_generator *gen, const struct vkd3d
case VKD3DSIH_SAMPLE: case VKD3DSIH_SAMPLE:
case VKD3DSIH_SAMPLE_B: case VKD3DSIH_SAMPLE_B:
case VKD3DSIH_SAMPLE_C: case VKD3DSIH_SAMPLE_C:
case VKD3DSIH_SAMPLE_C_LZ:
msl_sample(gen, ins); msl_sample(gen, ins);
break; break;
case VKD3DSIH_GEO: case VKD3DSIH_GEO:

18
tests/hlsl/sample-cmp.shader_test
View File

@@ -27,7 +27,7 @@ float4 main() : sv_target
} }
[test] [test]
todo(msl) draw quad draw quad
probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0) probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0)
[sampler 0] [sampler 0]
@@ -36,7 +36,7 @@ address clamp clamp clamp
comparison less comparison less
[test] [test]
todo(msl) draw quad draw quad
probe (0, 0) rgba (1.0, 0.0, 0.0, 1.0) probe (0, 0) rgba (1.0, 0.0, 0.0, 1.0)
[sampler 0] [sampler 0]
@@ -45,7 +45,7 @@ address clamp clamp clamp
comparison equal comparison equal
[test] [test]
todo(msl) draw quad draw quad
probe (0, 0) rgba (0.0, 1.0, 0.0, 1.0) probe (0, 0) rgba (0.0, 1.0, 0.0, 1.0)
[sampler 0] [sampler 0]
@@ -54,7 +54,7 @@ address clamp clamp clamp
comparison less equal comparison less equal
[test] [test]
todo(msl) draw quad draw quad
probe (0, 0) rgba (1.0, 1.0, 0.0, 1.0) probe (0, 0) rgba (1.0, 1.0, 0.0, 1.0)
[sampler 0] [sampler 0]
@@ -63,7 +63,7 @@ address clamp clamp clamp
comparison greater comparison greater
[test] [test]
todo(msl) draw quad draw quad
probe (0, 0) rgba (0.0, 0.0, 1.0, 1.0) probe (0, 0) rgba (0.0, 0.0, 1.0, 1.0)
[sampler 0] [sampler 0]
@@ -72,7 +72,7 @@ address clamp clamp clamp
comparison not equal comparison not equal
[test] [test]
todo(msl) draw quad draw quad
probe (0, 0) rgba (1.0, 0.0, 1.0, 1.0) probe (0, 0) rgba (1.0, 0.0, 1.0, 1.0)
[sampler 0] [sampler 0]
@@ -81,7 +81,7 @@ address clamp clamp clamp
comparison greater equal comparison greater equal
[test] [test]
todo(msl) draw quad draw quad
probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0) probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0)
[sampler 0] [sampler 0]
@@ -90,7 +90,7 @@ address clamp clamp clamp
comparison always comparison always
[test] [test]
todo(msl) draw quad draw quad
probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0)
@@ -118,7 +118,7 @@ float4 main() : sv_target
[test] [test]
uniform 0 float 0.5 uniform 0 float 0.5
uniform 1 float 0.00000007 uniform 1 float 0.00000007
todo(msl) draw quad draw quad
probe (0, 0) rgba (0.0, 0.0, 1.0, 1.0) probe (0, 0) rgba (0.0, 0.0, 1.0, 1.0)