diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-10 10:38:33 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-10 10:42:30 +0200 |
| commit | 2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7 (patch) | |
| tree | a32e3d5f8bb662ba5c14a72d97a553c4927c0b76 /mesalib/src/glsl/link_functions.cpp | |
| parent | d53900c52abc2402f978b72278712e4bcdbde9f2 (diff) | |
| parent | 889d7dd8e94a5538f388cc619115bf5c0b6fc0b7 (diff) | |
| download | vcxsrv-2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7.tar.gz vcxsrv-2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7.tar.bz2 vcxsrv-2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 libXmu libxcb mesa xserver git update 10 Sep 2013
Conflicts:
mesalib/src/glsl/.gitignore
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winsetsp.c
Diffstat (limited to 'mesalib/src/glsl/link_functions.cpp')
| -rw-r--r-- | mesalib/src/glsl/link_functions.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mesalib/src/glsl/link_functions.cpp b/mesalib/src/glsl/link_functions.cpp index dd6f24716..9e96365e6 100644 --- a/mesalib/src/glsl/link_functions.cpp +++ b/mesalib/src/glsl/link_functions.cpp @@ -113,10 +113,10 @@ public: } ir_function_signature *linked_sig = - f->exact_matching_signature(&callee->parameters); + f->exact_matching_signature(NULL, &callee->parameters); if ((linked_sig == NULL) || ((linked_sig != NULL) - && (linked_sig->is_builtin != ir->use_builtin))) { + && (linked_sig->is_builtin() != ir->use_builtin))) { linked_sig = new(linked) ir_function_signature(callee->return_type); f->add_signature(linked_sig); } @@ -288,7 +288,8 @@ find_matching_signature(const char *name, const exec_list *actual_parameters, if (f == NULL) continue; - ir_function_signature *sig = f->matching_signature(actual_parameters); + ir_function_signature *sig = + f->matching_signature(NULL, actual_parameters); if ((sig == NULL) || !sig->is_defined) continue; @@ -297,7 +298,7 @@ find_matching_signature(const char *name, const exec_list *actual_parameters, * signature that we found isn't a built-in, keep looking. Also keep * looking if we expect a non-built-in but found a built-in. */ - if (use_builtin != sig->is_builtin) + if (use_builtin != sig->is_builtin()) continue; return sig; |