fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 02:28:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: Use Add linker_error instead of fail_link

Browse source 
See also 8aadd89.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Ian Romanick 2011-09-22 16:56:58 -07:00
parent aae342cff0
commit a9f25160af
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/mesa/program/sampler.cpp
View file

@ -26,6 +26,7 @@
#include "ir.h"
#include "glsl_types.h"
#include "ir_visitor.h"
#include "../glsl/program.h"
extern "C" {
#include "main/compiler.h"
@ -33,18 +34,6 @@ extern "C" {
#include "program/prog_parameter.h"
}
static void fail_link(struct gl_shader_program *prog, const char *fmt, ...) PRINTFLIKE(2, 3);
static void fail_link(struct gl_shader_program *prog, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
ralloc_vasprintf_append(&prog->InfoLog, fmt, args);
va_end(args);
prog->LinkStatus = GL_FALSE;
}
class get_sampler_name : public ir_hierarchical_visitor
{
public:
@ -125,8 +114,8 @@ _mesa_get_sampler_uniform_value(class ir_dereference *sampler,
getname.name);
if (index < 0) {
fail_link(shader_program,
"failed to find sampler named %s.\n", getname.name);
linker_error(shader_program,
"failed to find sampler named %s.\n", getname.name);
return 0;
}