diff options
| author | Chia-I Wu <olvaffe@gmail.com> | 2009-09-15 23:50:45 +0800 |
|---|---|---|
| committer | Chia-I Wu <olvaffe@gmail.com> | 2009-09-15 23:51:18 +0800 |
| commit | 62e7cd2aca3f07438a8b25658918b3c87e6ebda6 (patch) | |
| tree | 7cfa14aaad56af02a49e01116aeb3f6798cfa8cc | |
| parent | 705fed33eaf60341b6ebc7c0d202dab3f18543a8 (diff) | |
mesa: Save META_SHADER in _mesa_meta_draw_tex.
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 5c794ee443..737ffd36bd 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -2061,7 +2061,7 @@ _mesa_meta_generate_mipmap(GLcontext *ctx, GLenum target, /** * Meta implementation of ctx->Driver.DrawTex() in terms - * of texture mapping and polygon rendering. + * of polygon rendering. */ void _mesa_meta_draw_tex(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z, @@ -2072,16 +2072,13 @@ _mesa_meta_draw_tex(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z, GLfloat x, y, z, st[MAX_TEXTURE_UNITS][2]; }; struct vertex verts[4]; - GLboolean vp_enabled; GLuint i; _mesa_meta_begin(ctx, (META_RASTERIZATION | + META_SHADER | META_TRANSFORM | META_VERTEX | META_VIEWPORT)); - vp_enabled = ctx->VertexProgram.Enabled; - if (vp_enabled) - _mesa_set_enable(ctx, GL_VERTEX_PROGRAM_ARB, GL_FALSE); if (drawtex->ArrayObj == 0) { /* one-time setup */ @@ -2174,8 +2171,6 @@ _mesa_meta_draw_tex(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z, _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4); - if (vp_enabled) - _mesa_set_enable(ctx, GL_VERTEX_PROGRAM_ARB, GL_TRUE); _mesa_meta_end(ctx); } |