summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-11-02 21:39:20 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-11-02 21:39:20 +0000
commit67a101759ec0b84e4f30fbb329e86ac5031cf7e7 (patch)
treefdc7b62ae0e369daaadaee84f9a8ce38d548ed5e /src
parentb6c2a6a0f295c078efc4737337ad67deaa7cee0a (diff)
Call _mesa_problem() from i915_program_error() so we get a nice error message.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/i915/i915_program.c5
-rw-r--r--src/mesa/drivers/dri/i915tex/i915_program.c7
2 files changed, 3 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_program.c b/src/mesa/drivers/dri/i915/i915_program.c
index 0faadb4f1a..9c13290d11 100644
--- 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 4fb56222c6..0be89d3320 100644
--- 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)
{