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: Return an error when the FLAT_INTERPOLATION parameter is invalid.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-11-15 10:58:15 +01:00 committed by Henri Verbeet
parent 36510cd0be
commit 05c87b02f6
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 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5847,13 +5847,15 @@ static enum vkd3d_result vsir_program_materialize_undominated_ssas_to_temps(stru
} }
static bool use_flat_interpolation(const struct vsir_program *program, static bool use_flat_interpolation(const struct vsir_program *program,
struct vkd3d_shader_message_context *message_context) struct vkd3d_shader_message_context *message_context, bool *flat)
{ {
static const struct vkd3d_shader_location no_loc; static const struct vkd3d_shader_location no_loc;
const struct vkd3d_shader_parameter1 *parameter; const struct vkd3d_shader_parameter1 *parameter;
*flat = false;
if (!(parameter = vsir_program_get_parameter(program, VKD3D_SHADER_PARAMETER_NAME_FLAT_INTERPOLATION))) if (!(parameter = vsir_program_get_parameter(program, VKD3D_SHADER_PARAMETER_NAME_FLAT_INTERPOLATION)))
return false; return true;
if (parameter->type != VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT) if (parameter->type != VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT)
{ {
@ -5868,16 +5870,23 @@ static bool use_flat_interpolation(const struct vsir_program *program,
return false; return false;
} }
return parameter->u.immediate_constant.u.u32; *flat = parameter->u.immediate_constant.u.u32;
return true;
} }
static enum vkd3d_result vsir_program_apply_flat_interpolation(struct vsir_program *program, static enum vkd3d_result vsir_program_apply_flat_interpolation(struct vsir_program *program,
struct vsir_transformation_context *ctx) struct vsir_transformation_context *ctx)
{ {
unsigned int i; unsigned int i;
bool flat;
if (program->shader_version.type != VKD3D_SHADER_TYPE_PIXEL || program->shader_version.major >= 4 if (program->shader_version.type != VKD3D_SHADER_TYPE_PIXEL || program->shader_version.major >= 4)
|| !use_flat_interpolation(program, ctx->message_context)) return VKD3D_OK;
if (!use_flat_interpolation(program, ctx->message_context, &flat))
return VKD3D_ERROR_INVALID_ARGUMENT;
if (!flat)
return VKD3D_OK; return VKD3D_OK;
for (i = 0; i < program->input_signature.element_count; ++i) for (i = 0; i < program->input_signature.element_count; ++i)