don't be fooled into emitting padding for wpos when not used

diff --git a/src/mesa/drivers/dri/i915/i915_fragprog.c b/src/mesa/drivers/dri/i915/i915_fragprog.c
index 150d9bd2c224574f89fa4754767fdb68db35f36a..ce14f8050e4f1b9ec26e668c2b52d06a3c01a9ee 100644 (file)
--- a/src/mesa/drivers/dri/i915/i915_fragprog.c
+++ b/src/mesa/drivers/dri/i915/i915_fragprog.c
@@ -788,7 +788,7 @@ static void check_wpos( struct i915_fragment_program *p )
    GLuint inputs = p->FragProg.InputsRead;
    GLint i;
 
-   p->wpos_tex = 0;
+   p->wpos_tex = -1;
 
    for (i = 0; i < p->ctx->Const.MaxTextureCoordUnits; i++) {
       if (inputs & FRAG_BIT_TEX(i)) 

diff --git a/src/mesa/drivers/dri/i915/i915_program.c b/src/mesa/drivers/dri/i915/i915_program.c
index 160774d9ac41ad59765fd84ed9762c989a9e06ec..cf3ebc171094d8a627f043e89fc3d6c427d69965 100644 (file)
--- a/src/mesa/drivers/dri/i915/i915_program.c
+++ b/src/mesa/drivers/dri/i915/i915_program.c
@@ -380,7 +380,7 @@ void i915_init_program( i915ContextPtr i915, struct i915_fragment_program *p )
    p->decl_t = 0;
    p->temp_flag = 0xffff000;
    p->utemp_flag = ~0x7;
-   p->wpos_tex = 0;
+   p->wpos_tex = -1;
    p->depth_written = 0;
    p->nr_params = 0;