diff options
| author | marha <marha@users.sourceforge.net> | 2011-08-04 16:54:51 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-08-04 16:54:51 +0200 |
| commit | 23cc74efd16feb2676978b9919a8510ed7804ed9 (patch) | |
| tree | 15324c9a805744a54489f24c95f5eb94a0cc7adf /mesalib/src/glsl/ir_function_detect_recursion.cpp | |
| parent | 30aa3aea81afd082cba94028183ac9d5c7c1e123 (diff) | |
| parent | 9b009a8bdb31d08e3d07f68416373b9aa6f85724 (diff) | |
| download | vcxsrv-23cc74efd16feb2676978b9919a8510ed7804ed9.tar.gz vcxsrv-23cc74efd16feb2676978b9919a8510ed7804ed9.tar.bz2 vcxsrv-23cc74efd16feb2676978b9919a8510ed7804ed9.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/link_functions.cpp
mesalib/src/glsl/linker.cpp
mesalib/src/glsl/main.cpp
mesalib/src/mesa/program/ir_to_mesa.cpp
xorg-server/composite/compalloc.c
xorg-server/configure.ac
xorg-server/hw/xquartz/X11Application.m
xorg-server/hw/xquartz/bundle/Makefile.am
xorg-server/hw/xquartz/xpr/xprFrame.c
xorg-server/include/windowstr.h
Diffstat (limited to 'mesalib/src/glsl/ir_function_detect_recursion.cpp')
| -rw-r--r-- | mesalib/src/glsl/ir_function_detect_recursion.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesalib/src/glsl/ir_function_detect_recursion.cpp b/mesalib/src/glsl/ir_function_detect_recursion.cpp index 44a1cd0b9..8f805bf1b 100644 --- a/mesalib/src/glsl/ir_function_detect_recursion.cpp +++ b/mesalib/src/glsl/ir_function_detect_recursion.cpp @@ -125,6 +125,7 @@ #include "glsl_parser_extras.h" #include "linker.h" #include "program/hash_table.h" +#include "program.h" struct call_node : public exec_node { class function *func; @@ -311,9 +312,7 @@ emit_errors_linked(const void *key, void *data, void *closure) f->sig->function_name(), &f->sig->parameters); - linker_error_printf(prog, - "function `%s' has static recursion.\n", - proto); + linker_error(prog, "function `%s' has static recursion.\n", proto); ralloc_free(proto); prog->LinkStatus = false; } |