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

Fix matching of integer function parameters

Browse source 
This causes the following tests to pass:

    glslparsertest/shaders/function10.frag
This commit is contained in:
Ian Romanick 2010-04-02 11:45:06 -07:00
parent c2cb84e17b
commit fe1c7ff6c6
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ir_function.cpp
View file

@ -35,16 +35,18 @@ type_compare(const glsl_type *a, const glsl_type *b)
switch (a->base_type) {
case GLSL_TYPE_UINT:
case GLSL_TYPE_INT:
case GLSL_TYPE_FLOAT:
case GLSL_TYPE_BOOL:
if ((a->vector_elements != b->vector_elements)
|| (a->matrix_columns != b->matrix_columns))
/* There is no implicit conversion to or from integer types or bool.
*/
if ((a->is_integer() != b->is_integer())
|| (a->is_boolean() != b->is_boolean()))
return -1;
/* There is no implicit conversion to or from bool.
*/
if ((a->base_type == GLSL_TYPE_BOOL)
|| (b->base_type == GLSL_TYPE_BOOL))
/* FALLTHROUGH */
case GLSL_TYPE_FLOAT:
if ((a->vector_elements != b->vector_elements)
|| (a->matrix_columns != b->matrix_columns))
return -1;
return 1;