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_LOD.

Browse Source
This commit is contained in:
Henri Verbeet
2025-05-26 10:27:34 +02:00
parent 99db7270f0
commit 3cc404759d
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 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -963,9 +963,9 @@ 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;
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;
bool bias, compare, comparison_sampler, grad, lod_zero;
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;
const struct vkd3d_shader_descriptor_info1 *d; const struct vkd3d_shader_descriptor_info1 *d;
@@ -979,6 +979,7 @@ static void msl_sample(struct msl_generator *gen, const struct vkd3d_shader_inst
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;
grad = ins->opcode == VKD3DSIH_SAMPLE_GRAD; grad = ins->opcode == VKD3DSIH_SAMPLE_GRAD;
lod = ins->opcode == VKD3DSIH_SAMPLE_LOD;
lod_zero = 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))
@@ -1015,7 +1016,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 || grad || lod_zero)) && (bias || grad || lod || 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);
@@ -1118,6 +1119,12 @@ static void msl_sample(struct msl_generator *gen, const struct vkd3d_shader_inst
{ {
vkd3d_string_buffer_printf(sample, ", level(0.0f)"); vkd3d_string_buffer_printf(sample, ", level(0.0f)");
} }
else if (lod)
{
vkd3d_string_buffer_printf(sample, ", level(");
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 (bias) if (bias)
{ {
vkd3d_string_buffer_printf(sample, ", bias("); vkd3d_string_buffer_printf(sample, ", bias(");
@@ -1276,6 +1283,7 @@ static void msl_handle_instruction(struct msl_generator *gen, const struct vkd3d
case VKD3DSIH_SAMPLE_C: case VKD3DSIH_SAMPLE_C:
case VKD3DSIH_SAMPLE_C_LZ: case VKD3DSIH_SAMPLE_C_LZ:
case VKD3DSIH_SAMPLE_GRAD: case VKD3DSIH_SAMPLE_GRAD:
case VKD3DSIH_SAMPLE_LOD:
msl_sample(gen, ins); msl_sample(gen, ins);
break; break;
case VKD3DSIH_GEO: case VKD3DSIH_GEO:

12
tests/hlsl/sample-level.shader_test
View File

@@ -26,13 +26,13 @@ float4 main() : sv_target
[test] [test]
uniform 0 float4 0.0 0.0 0.0 0.0 uniform 0 float4 0.0 0.0 0.0 0.0
todo(sm<4 | msl) draw quad todo(sm<4) draw quad
probe (0, 0) rgba (1.0, 0.0, 1.0, 0.0) probe (0, 0) rgba (1.0, 0.0, 1.0, 0.0)
uniform 0 float4 0.5 0.0 0.0 0.0 uniform 0 float4 0.5 0.0 0.0 0.0
todo(sm<4 | msl) draw quad todo(sm<4) draw quad
probe (0, 0) rgba (0.5, 0.0, 1.0, 0.0) probe (0, 0) rgba (0.5, 0.0, 1.0, 0.0)
uniform 0 float4 1.0 0.0 0.0 0.0 uniform 0 float4 1.0 0.0 0.0 0.0
todo(sm<4 | msl) draw quad todo(sm<4) draw quad
probe (0, 0) rgba (0.0, 0.0, 1.0, 0.0) probe (0, 0) rgba (0.0, 0.0, 1.0, 0.0)
[require] [require]
@@ -50,11 +50,11 @@ float4 main() : sv_target
[test] [test]
uniform 0 float4 0.0 0.0 0.0 0.0 uniform 0 float4 0.0 0.0 0.0 0.0
todo(sm<4 | msl) draw quad todo(sm<4) draw quad
probe (0, 0) rgba (1.0, 0.0, 1.0, 0.0) probe (0, 0) rgba (1.0, 0.0, 1.0, 0.0)
uniform 0 float4 0.5 0.0 0.0 0.0 uniform 0 float4 0.5 0.0 0.0 0.0
todo(sm<4 | msl) draw quad todo(sm<4) draw quad
probe (0, 0) rgba (0.5, 0.0, 1.0, 0.0) probe (0, 0) rgba (0.5, 0.0, 1.0, 0.0)
uniform 0 float4 1.0 0.0 0.0 0.0 uniform 0 float4 1.0 0.0 0.0 0.0
todo(sm<4 | msl) draw quad todo(sm<4) draw quad
probe (0, 0) rgba (0.0, 0.0, 1.0, 0.0) probe (0, 0) rgba (0.0, 0.0, 1.0, 0.0)