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

glsl: Build a list of inexact function matches

Browse source 
This will facilitate GLSL 4.0 / ARB_gpu_shader5's enhanced overload
resolution rules, and also possibly better error reporting for ambiguous
function calls.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Chris Forbes 2014-05-04 20:23:59 +12:00
parent 4312e973f2
commit 59dd444cac
1 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/glsl/ir_function.cpp
View file

@ -23,6 +23,7 @@
#include "glsl_types.h"
#include "ir.h"
#include "glsl_parser_extras.h"
typedef enum {
PARAMETER_LIST_NO_MATCH,
@ -116,6 +117,22 @@ parameter_lists_match(_mesa_glsl_parse_state *state,
}
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)
{
if (num_matches == 0)
return NULL;
if (num_matches == 1)
return *matches;
return NULL; /* no best candidate */
}
ir_function_signature *
ir_function::matching_signature(_mesa_glsl_parse_state *state,
const exec_list *actual_parameters)
@ -127,10 +144,11 @@ ir_function::matching_signature(_mesa_glsl_parse_state *state,
ir_function_signature *
ir_function::matching_signature(_mesa_glsl_parse_state *state,
const exec_list *actual_parameters,
bool *is_exact)
bool *is_exact)
{
ir_function_signature **inexact_matches = NULL;
ir_function_signature *match = NULL;
bool multiple_inexact_matches = false;
int num_inexact_matches = 0;
/* From page 42 (page 49 of the PDF) of the GLSL 1.20 spec:
*
@ -151,14 +169,16 @@ ir_function::matching_signature(_mesa_glsl_parse_state *state,
switch (parameter_lists_match(state, & sig->parameters, actual_parameters)) {
case PARAMETER_LIST_EXACT_MATCH:
*is_exact = true;
return sig;
*is_exact = true;
free(inexact_matches);
return sig;
case PARAMETER_LIST_INEXACT_MATCH:
if (match == NULL)
match = sig;
else
multiple_inexact_matches = true;
continue;
inexact_matches = realloc(inexact_matches,
sizeof(*inexact_matches) *
(num_inexact_matches + 1));
assert(inexact_matches);
inexact_matches[num_inexact_matches++] = sig;
continue;
case PARAMETER_LIST_NO_MATCH:
continue;
default:
@ -176,9 +196,10 @@ ir_function::matching_signature(_mesa_glsl_parse_state *state,
*/
*is_exact = false;
if (multiple_inexact_matches)
return NULL;
match = choose_best_inexact_overload(state, actual_parameters,
inexact_matches, num_inexact_matches);
free(inexact_matches);
return match;
}