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/linker.h | |
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/linker.h')
-rw-r--r-- | mesalib/src/glsl/linker.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mesalib/src/glsl/linker.h b/mesalib/src/glsl/linker.h index a8ce16a7e..769cf68b6 100644 --- a/mesalib/src/glsl/linker.h +++ b/mesalib/src/glsl/linker.h @@ -25,9 +25,6 @@ #ifndef GLSL_LINKER_H #define GLSL_LINKER_H -extern void -linker_error_printf(gl_shader_program *prog, const char *fmt, ...); - extern bool link_function_calls(gl_shader_program *prog, gl_shader *main, gl_shader **shader_list, unsigned num_shaders); |