Mesa (master): mesa: Use Add linker_error instead of fail_link

[Ian Romanick]

Module: Mesa
Branch: master
Commit: a9f25160af9c12cdd675819a74fb7b1a92cfce34
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a9f25160af9c12cdd675819a74fb7b1a92cfce34

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Thu Sep 22 16:56:58 2011 -0700

mesa: Use Add linker_error instead of fail_link

See also 8aadd89.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/program/sampler.cpp |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/mesa/program/sampler.cpp b/src/mesa/program/sampler.cpp
index e8d34c6..3b459d5 100644
--- a/src/mesa/program/sampler.cpp
+++ b/src/mesa/program/sampler.cpp
@@ -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;
    }