Mesa (gallium-mesa-7.4): mesa: fix merge of MESA_GLSL debugging

Alan Hourihane alanh at kemper.freedesktop.org
Fri Feb 20 01:30:25 UTC 2009


Module: Mesa
Branch: gallium-mesa-7.4
Commit: 621a3d759a038d01d1dbea231437820957f77737
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=621a3d759a038d01d1dbea231437820957f77737

Author: Alan Hourihane <alanh at vmware.com>
Date:   Fri Feb 20 01:26:27 2009 +0000

mesa: fix merge of MESA_GLSL debugging

---

 src/mesa/state_tracker/st_draw.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 942f913..1ab3cd6 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -541,9 +541,8 @@ st_draw_vbo(GLcontext *ctx,
    vp = ctx->st->vp;
    vs = &ctx->st->vp->state;
 
-   if (MESA_VERBOSE & VERBOSE_GLSL) {
+   if (ctx->Shader.Flags & GLSL_UNIFORMS)
       check_uniforms(ctx);
-   }
 
    /*
     * Setup the vbuffer[] and velements[] arrays.




More information about the mesa-commit mailing list