wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/spirv: Support double in spirv_compiler_emit_ftou().

Browse Source
This commit is contained in:
Conor McCarthy 2023-11-07 13:08:56 +10:00 committed by Alexandre Julliard
parent 92d546f3a2
commit bd77cbb33f
Notes: Alexandre Julliard 2023-11-10 00:09:32 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/436
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/vkd3d-shader/spirv.c
View File

@ -7250,10 +7250,19 @@ static void spirv_compiler_emit_ftou(struct spirv_compiler *compiler,
dst_type_id = spirv_compiler_get_type_id_for_dst(compiler, dst); dst_type_id = spirv_compiler_get_type_id_for_dst(compiler, dst);
src_id = spirv_compiler_emit_load_src(compiler, src, dst->write_mask); src_id = spirv_compiler_emit_load_src(compiler, src, dst->write_mask);
zero_id = spirv_compiler_get_constant_float_vector(compiler, 0.0f, component_count); if (src->reg.data_type == VKD3D_DATA_DOUBLE)
{
zero_id = spirv_compiler_get_constant_double_vector(compiler, 0.0, component_count);
float_max_id = spirv_compiler_get_constant_double_vector(compiler, 4294967296.0, component_count);
}
else
{
zero_id = spirv_compiler_get_constant_float_vector(compiler, 0.0f, component_count);
float_max_id = spirv_compiler_get_constant_float_vector(compiler, 4294967296.0f, component_count);
}
val_id = vkd3d_spirv_build_op_glsl_std450_max(builder, src_type_id, src_id, zero_id); val_id = vkd3d_spirv_build_op_glsl_std450_max(builder, src_type_id, src_id, zero_id);
float_max_id = spirv_compiler_get_constant_float_vector(compiler, 4294967296.0f, component_count);
uint_max_id = spirv_compiler_get_constant_uint_vector(compiler, UINT_MAX, component_count); uint_max_id = spirv_compiler_get_constant_uint_vector(compiler, UINT_MAX, component_count);
condition_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_BOOL, component_count); condition_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_BOOL, component_count);
condition_id = vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, condition_id = vkd3d_spirv_build_op_tr2(builder, &builder->function_stream,
@ -9525,7 +9534,6 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler,
case VKD3DSIH_DIV: case VKD3DSIH_DIV:
case VKD3DSIH_DMUL: case VKD3DSIH_DMUL:
case VKD3DSIH_DTOF: case VKD3DSIH_DTOF:
case VKD3DSIH_DTOU:
case VKD3DSIH_FREM: case VKD3DSIH_FREM:
case VKD3DSIH_FTOD: case VKD3DSIH_FTOD:
case VKD3DSIH_IADD: case VKD3DSIH_IADD:
@ -9596,6 +9604,7 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler,
case VKD3DSIH_FTOI: case VKD3DSIH_FTOI:
spirv_compiler_emit_ftoi(compiler, instruction); spirv_compiler_emit_ftoi(compiler, instruction);
break; break;
case VKD3DSIH_DTOU:
case VKD3DSIH_FTOU: case VKD3DSIH_FTOU:
spirv_compiler_emit_ftou(compiler, instruction); spirv_compiler_emit_ftou(compiler, instruction);
break; break;