Call _mesa_problem() from i915_program_error() so we get a nice error message.

diff --git a/src/mesa/drivers/dri/i915/i915_program.c b/src/mesa/drivers/dri/i915/i915_program.c
index 0faadb4f1a740c79e7f85be3f870c8a934537df3..9c13290d118e75fc97bc3501e4776541442aabd1 100644 (file)
--- a/src/mesa/drivers/dri/i915/i915_program.c
+++ b/src/mesa/drivers/dri/i915/i915_program.c
@@ -369,10 +369,7 @@ GLuint i915_emit_param4fv( struct i915_fragment_program *p,
 
 void i915_program_error( struct i915_fragment_program *p, const char *msg )
 {
-   /* XXX we shouldn't print anything to stdout, record GL error or
-    * call _mesa_problem()
-    */
-   fprintf(stderr, "%s\n", msg);
+   _mesa_problem(NULL, "i915_program_error: %s", msg);
    p->error = 1;
 }
 

diff --git a/src/mesa/drivers/dri/i915tex/i915_program.c b/src/mesa/drivers/dri/i915tex/i915_program.c
index 4fb56222c63080b21189f523ec9484b6f5c9420f..0be89d332061b685dd62947725571d1459bde820 100644 (file)
--- a/src/mesa/drivers/dri/i915tex/i915_program.c
+++ b/src/mesa/drivers/dri/i915tex/i915_program.c
@@ -379,17 +379,14 @@ i915_emit_param4fv(struct i915_fragment_program * p, const GLfloat * values)
 
 
 
-
 void
 i915_program_error(struct i915_fragment_program *p, const char *msg)
 {
-   /* XXX we shouldn't print anything to stdout, record GL error or
-    * call _mesa_problem()
-    */
-   fprintf(stderr, "%s\n", msg);
+   _mesa_problem(NULL, "i915_program_error: %s", msg);
    p->error = 1;
 }
 
+
 void
 i915_init_program(struct i915_context *i915, struct i915_fragment_program *p)
 {