diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2007-09-10 16:27:07 -0600 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2007-09-10 16:27:07 -0600 |
| commit | 21c925f49191df46ed8788ac09bbb3bd4a437c99 (patch) | |
| tree | fab109d4c39f57a91bd71c2bd1336750bb64b358 | |
| parent | 63a51aee86f76ae54fb1ce572d584fb0f01aaec5 (diff) | |
move FLUSH_CURRENT
| -rw-r--r-- | src/mesa/main/rastpos.c | 3 | ||||
| -rw-r--r-- | src/mesa/tnl/t_rasterpos.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c index eef3b09d6d..ee163e0c71 100644 --- a/src/mesa/main/rastpos.c +++ b/src/mesa/main/rastpos.c @@ -53,6 +53,9 @@ rasterpos(GLfloat x, GLfloat y, GLfloat z, GLfloat w) if (ctx->NewState) _mesa_update_state( ctx ); + ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); + FLUSH_CURRENT(ctx, 0); + ctx->Driver.RasterPos(ctx, p); } diff --git a/src/mesa/tnl/t_rasterpos.c b/src/mesa/tnl/t_rasterpos.c index 272f855fc1..be963867c0 100644 --- a/src/mesa/tnl/t_rasterpos.c +++ b/src/mesa/tnl/t_rasterpos.c @@ -393,9 +393,6 @@ compute_texgen(GLcontext *ctx, const GLfloat vObj[4], const GLfloat vEye[4], void _tnl_RasterPos(GLcontext *ctx, const GLfloat vObj[4]) { - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); - FLUSH_CURRENT(ctx, 0); - if (ctx->VertexProgram._Enabled) { /* XXX implement this */ _mesa_problem(ctx, "Vertex programs not implemented for glRasterPos"); |