Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

[mesa.git] / src / mesa / drivers / dri / r300 / r300_vertprog.c

diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c
index 862f21208506e3f7f86a05d68dbc37a824b95b7f..dd0f27f9cba12f76d9b408873f7001be4ac0ddb7 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_vertprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
@@ -216,7 +216,7 @@ static struct r300_vertex_program *build_program(GLcontext *ctx,
        _mesa_memcpy(&vp->key, wanted_key, sizeof(vp->key));
 
        rc_init(&compiler.Base);
-       compiler.Base.Debug = (RADEON_DEBUG & DEBUG_VERTS) ? GL_TRUE : GL_FALSE;
+       compiler.Base.Debug = (RADEON_DEBUG & RADEON_VERTS) ? GL_TRUE : GL_FALSE;
 
        compiler.code = &vp->code;
        compiler.RequiredOutputs = compute_required_outputs(vp->Base, vp->key.FpReads);
@@ -225,7 +225,7 @@ static struct r300_vertex_program *build_program(GLcontext *ctx,
        if (compiler.Base.Debug) {
                fprintf(stderr, "Initial vertex program:\n");
                _mesa_print_program(&vp->Base->Base);
-               fflush(stdout);
+               fflush(stderr);
        }
 
        if (mesa_vp->IsPositionInvariant) {