move FLUSH_CURRENT

diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index eef3b09..ee163e0 100644 (file)
--- 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 272f855..be96386 100644 (file)
--- 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");