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/ir: Move applying flat interpolation to a dedicated pass.

Browse Source 
I/O normalisation is already a rather complicated pass that does a
lot of things, so it's better to keep anything not strictly
related to it somewhere else.
This commit is contained in:
Giovanni Mascellani 2024-11-15 10:51:24 +01:00 committed by Henri Verbeet
parent 1efc0ac740
commit 36510cd0be
Notes: Henri Verbeet 2024-11-20 15:00:28 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1267
1 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
libs/vkd3d-shader/ir.c
View File

@ -2222,35 +2222,9 @@ static void shader_instruction_normalise_io_params(struct vkd3d_shader_instructi
} }
} }
static bool use_flat_interpolation(const struct vsir_program *program,
struct vkd3d_shader_message_context *message_context)
{
static const struct vkd3d_shader_location no_loc;
const struct vkd3d_shader_parameter1 *parameter;
if (!(parameter = vsir_program_get_parameter(program, VKD3D_SHADER_PARAMETER_NAME_FLAT_INTERPOLATION)))
return false;
if (parameter->type != VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT)
{
vkd3d_shader_error(message_context, &no_loc, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED,
"Unsupported flat interpolation parameter type %#x.", parameter->type);
return false;
}
if (parameter->data_type != VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32)
{
vkd3d_shader_error(message_context, &no_loc, VKD3D_SHADER_ERROR_VSIR_INVALID_DATA_TYPE,
"Invalid flat interpolation parameter data type %#x.", parameter->data_type);
return false;
}
return parameter->u.immediate_constant.u.u32;
}
static enum vkd3d_result vsir_program_normalise_io_registers(struct vsir_program *program, static enum vkd3d_result vsir_program_normalise_io_registers(struct vsir_program *program,
struct vsir_transformation_context *ctx) struct vsir_transformation_context *ctx)
{ {
struct vkd3d_shader_message_context *message_context = ctx->message_context;
struct io_normaliser normaliser = {program->instructions}; struct io_normaliser normaliser = {program->instructions};
struct vkd3d_shader_instruction *ins; struct vkd3d_shader_instruction *ins;
unsigned int i; unsigned int i;
@ -2295,18 +2269,6 @@ static enum vkd3d_result vsir_program_normalise_io_registers(struct vsir_program
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
} }
if (program->shader_version.type == VKD3D_SHADER_TYPE_PIXEL
&& program->shader_version.major < 4 && use_flat_interpolation(program, message_context))
{
for (i = 0; i < program->input_signature.element_count; ++i)
{
struct signature_element *element = &program->input_signature.elements[i];
if (!ascii_strcasecmp(element->semantic_name, "COLOR"))
element->interpolation_mode = VKD3DSIM_CONSTANT;
}
}
normaliser.phase = VKD3DSIH_INVALID; normaliser.phase = VKD3DSIH_INVALID;
for (i = 0; i < normaliser.instructions.count; ++i) for (i = 0; i < normaliser.instructions.count; ++i)
shader_instruction_normalise_io_params(&normaliser.instructions.elements[i], &normaliser); shader_instruction_normalise_io_params(&normaliser.instructions.elements[i], &normaliser);
@ -5884,6 +5846,51 @@ static enum vkd3d_result vsir_program_materialize_undominated_ssas_to_temps(stru
return VKD3D_OK; return VKD3D_OK;
} }
static bool use_flat_interpolation(const struct vsir_program *program,
struct vkd3d_shader_message_context *message_context)
{
static const struct vkd3d_shader_location no_loc;
const struct vkd3d_shader_parameter1 *parameter;
if (!(parameter = vsir_program_get_parameter(program, VKD3D_SHADER_PARAMETER_NAME_FLAT_INTERPOLATION)))
return false;
if (parameter->type != VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT)
{
vkd3d_shader_error(message_context, &no_loc, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED,
"Unsupported flat interpolation parameter type %#x.", parameter->type);
return false;
}
if (parameter->data_type != VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32)
{
vkd3d_shader_error(message_context, &no_loc, VKD3D_SHADER_ERROR_VSIR_INVALID_DATA_TYPE,
"Invalid flat interpolation parameter data type %#x.", parameter->data_type);
return false;
}
return parameter->u.immediate_constant.u.u32;
}
static enum vkd3d_result vsir_program_apply_flat_interpolation(struct vsir_program *program,
struct vsir_transformation_context *ctx)
{
unsigned int i;
if (program->shader_version.type != VKD3D_SHADER_TYPE_PIXEL || program->shader_version.major >= 4
|| !use_flat_interpolation(program, ctx->message_context))
return VKD3D_OK;
for (i = 0; i < program->input_signature.element_count; ++i)
{
struct signature_element *element = &program->input_signature.elements[i];
if (!ascii_strcasecmp(element->semantic_name, "COLOR"))
element->interpolation_mode = VKD3DSIM_CONSTANT;
}
return VKD3D_OK;
}
static enum vkd3d_result insert_alpha_test_before_ret(struct vsir_program *program, static enum vkd3d_result insert_alpha_test_before_ret(struct vsir_program *program,
const struct vkd3d_shader_instruction *ret, enum vkd3d_shader_comparison_func compare_func, const struct vkd3d_shader_instruction *ret, enum vkd3d_shader_comparison_func compare_func,
const struct vkd3d_shader_parameter1 *ref, uint32_t colour_signature_idx, const struct vkd3d_shader_parameter1 *ref, uint32_t colour_signature_idx,
@ -8350,6 +8357,7 @@ enum vkd3d_result vsir_program_transform(struct vsir_program *program, uint64_t
vsir_transform(&ctx, vsir_program_flatten_control_flow_constructs); vsir_transform(&ctx, vsir_program_flatten_control_flow_constructs);
} }
vsir_transform(&ctx, vsir_program_apply_flat_interpolation);
vsir_transform(&ctx, vsir_program_insert_alpha_test); vsir_transform(&ctx, vsir_program_insert_alpha_test);
vsir_transform(&ctx, vsir_program_insert_clip_planes); vsir_transform(&ctx, vsir_program_insert_clip_planes);
vsir_transform(&ctx, vsir_program_insert_point_size); vsir_transform(&ctx, vsir_program_insert_point_size);