linker: Make linker_{error,warning} generally available

linker_warning is a new function.  It's identical to linker_error
except that it doesn't set LinkStatus=false and it prepends "warning: "
on messages instead of "error: ".

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/glsl/ir_function_detect_recursion.cpp b/src/glsl/ir_function_detect_recursion.cpp
index a3b461818d3837cae7afedba4383efa7fbdb95be..8f805bf1ba96097a215d2e2ae67623d166702462 100644 (file)
--- a/src/glsl/ir_function_detect_recursion.cpp
+++ b/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;

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 35d893f499e2c50d50f50013591e58a9a38f6b67..19eb9b5ff6f5a40383d92350f1177a9413449c7b 100644 (file)
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -177,6 +177,19 @@ linker_error(gl_shader_program *prog, const char *fmt, ...)
 }
 
 
+void
+linker_warning(gl_shader_program *prog, const char *fmt, ...)
+{
+   va_list ap;
+
+   ralloc_strcat(&prog->InfoLog, "error: ");
+   va_start(ap, fmt);
+   ralloc_vasprintf_append(&prog->InfoLog, fmt, ap);
+   va_end(ap);
+
+}
+
+
 void
 invalidate_variable_locations(gl_shader *sh, enum ir_variable_mode mode,
                              int generic_base)

diff --git a/src/glsl/linker.h b/src/glsl/linker.h
index dfae073c274f2c4dd3b399584f20f713731f27ac..769cf68b6ad0207b92a94d6f7697c2107d17c90f 100644 (file)
--- a/src/glsl/linker.h
+++ b/src/glsl/linker.h
@@ -25,9 +25,6 @@
 #ifndef GLSL_LINKER_H
 #define GLSL_LINKER_H
 
-extern void
-linker_error(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);

diff --git a/src/glsl/program.h b/src/glsl/program.h
index db602fa9ec2ee0838261f711224df00949a2b7dd..437ca1462faf98837de734700545fb9119968490 100644 (file)
--- a/src/glsl/program.h
+++ b/src/glsl/program.h
@@ -25,3 +25,11 @@
 
 extern void
 link_shaders(struct gl_context *ctx, struct gl_shader_program *prog);
+
+extern void
+linker_error(gl_shader_program *prog, const char *fmt, ...)
+   PRINTFLIKE(2, 3);
+
+extern void
+linker_warning(gl_shader_program *prog, const char *fmt, ...)
+   PRINTFLIKE(2, 3);