Mesa (master): mesa: call _mesa_set_vp_override in glDrawTex*

Chia-I Wu olv at kemper.freedesktop.org
Mon Aug 22 18:12:29 PDT 2011


Module: Mesa
Branch: master
Commit: 29d7a0bb16dba1416e3a63f7f44cf82e307ac46a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=29d7a0bb16dba1416e3a63f7f44cf82e307ac46a

Author: Chia-I Wu <olvaffe at gmail.com>
Date:   Fri Mar 25 03:10:51 2011 +0800

mesa: call _mesa_set_vp_override in glDrawTex*

The driver may install its own vertex shader.  _mesa_set_vp_override
must be called so that core mesa can generate correct fragment program..

Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/main/drawtex.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/mesa/main/drawtex.c b/src/mesa/main/drawtex.c
index 2089cdf..83485a9 100644
--- a/src/mesa/main/drawtex.c
+++ b/src/mesa/main/drawtex.c
@@ -45,11 +45,15 @@ draw_texture(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
       return;
    }
 
+   _mesa_set_vp_override(ctx, GL_TRUE);
+
    if (ctx->NewState)
       _mesa_update_state(ctx);
 
    ASSERT(ctx->Driver.DrawTex);
    ctx->Driver.DrawTex(ctx, x, y, z, width, height);
+
+   _mesa_set_vp_override(ctx, GL_FALSE);
 }
 
 



More information about the mesa-commit mailing list