fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 08:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: fix function overload resolution at link time

Browse source 
Previously we didn't check if the glsl version supported overload resolution
at link time only compile time. Note with this change we just use the
has_implicit_int_to_uint_conversion bool as support for both is added under
the same conditions.

Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30752>
This commit is contained in:
Timothy Arceri 2024-08-21 13:39:03 +10:00
parent 8e4b14dcfd
commit 4c32709c74
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -280,8 +280,8 @@ is_best_inexact_overload(const exec_list *actual_parameters,
static ir_function_signature *
choose_best_inexact_overload(_mesa_glsl_parse_state *state,
const exec_list *actual_parameters,
ir_function_signature **matches,
int num_matches)
ir_function_signature **matches, int num_matches,
bool has_choose_best_inexact_overload)
{
if (num_matches == 0)
return NULL;
@ -289,14 +289,7 @@ choose_best_inexact_overload(_mesa_glsl_parse_state *state,
if (num_matches == 1)
return *matches;
/* Without GLSL 4.0, ARB_gpu_shader5, or MESA_shader_integer_functions,
* there is no overload resolution among multiple inexact matches. Note
* that state may be NULL here if called from the linker; in that case we
* assume everything supported in any GLSL version is available.
*/
if (!state || state->is_version(400, 0) || state->ARB_gpu_shader5_enable ||
state->MESA_shader_integer_functions_enable ||
state->EXT_shader_implicit_conversions_enable) {
if (has_choose_best_inexact_overload) {
for (ir_function_signature **sig = matches; sig < matches + num_matches; sig++) {
if (is_best_inexact_overload(actual_parameters, matches, num_matches, *sig))
return *sig;
@ -390,7 +383,8 @@ ir_function::matching_signature(_mesa_glsl_parse_state *state,
*is_exact = false;
match = choose_best_inexact_overload(state, actual_parameters,
inexact_matches, num_inexact_matches);
inexact_matches, num_inexact_matches,
has_implicit_int_to_uint_conversion);
free(inexact_matches);
return match;