fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-01 21:08:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: Ensure that we are dealing with ir_variable and ir_rvalue

Browse source 
Use the built-in function from ir_instruction to make sure that we are actually
not casting to anther type by mistake.

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27114>
This commit is contained in:
Corentin Noël 2024-01-15 12:21:31 +01:00 • committed by Marge Bot
parent d795bd380a
commit bc11e6ee8d
1 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/compiler/glsl/ir_function.cpp
View file

@ -32,6 +32,18 @@ typedef enum {
PARAMETER_LIST_INEXACT_MATCH /*< Match requires implicit conversion. */
} parameter_list_match_t;
static inline const glsl_type *
get_param_type(const ir_instruction *inst)
{
const ir_variable *var = inst->as_variable();
if (var)
return var->type;
const ir_rvalue *rvalue = inst->as_rvalue();
assert(rvalue != NULL);
return rvalue->type;
}
/**
* \brief Check if two parameter lists match.
*
@ -60,12 +72,15 @@ parameter_lists_match(_mesa_glsl_parse_state *state,
if (node_b->is_tail_sentinel())
return PARAMETER_LIST_NO_MATCH;
const ir_instruction *inst_a = (const ir_instruction *) node_a;
const ir_instruction *inst_b = (const ir_instruction *) node_b;
const ir_variable *const param = (ir_variable *) node_a;
const ir_rvalue *const actual = (ir_rvalue *) node_b;
const ir_variable *const param = inst_a->as_variable();
assert(param != NULL);
const glsl_type *actual_type = get_param_type(inst_b);
if (param->type == actual->type)
continue;
if (param->type == actual_type)
continue;
/* Try to find an implicit conversion from actual to param. */
inexact_match = true;
@ -84,12 +99,12 @@ parameter_lists_match(_mesa_glsl_parse_state *state,
case ir_var_const_in:
case ir_var_function_in:
if (param->data.implicit_conversion_prohibited ||
!_mesa_glsl_can_implicitly_convert(actual->type, param->type, state))
!_mesa_glsl_can_implicitly_convert(actual_type, param->type, state))
return PARAMETER_LIST_NO_MATCH;
break;
case ir_var_function_out:
if (!_mesa_glsl_can_implicitly_convert(param->type, actual->type, state))
if (!_mesa_glsl_can_implicitly_convert(param->type, actual_type, state))
return PARAMETER_LIST_NO_MATCH;
break;
@ -370,18 +385,6 @@ ir_function::matching_signature(_mesa_glsl_parse_state *state,
}
static inline const glsl_type *
get_param_type(ir_instruction *inst)
{
ir_variable *var = inst->as_variable();
if (var)
return var->type;
ir_rvalue *rvalue = inst->as_rvalue();
assert(rvalue != NULL);
return rvalue->type;
}
static bool
parameter_lists_match_exact(const exec_list *list_a, const exec_list *list_b)
{