diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-11-11 14:42:41 -0700 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-11-11 14:42:41 -0700 |
| commit | 19e4222f937c9bb95d3a899dd788afb930eecaa4 (patch) | |
| tree | 5bb25227f53ad93fbdb9dc889ded690dc40ad1d9 /src/mesa/main/rastpos.c | |
| parent | 7f3d45758ccbbcff6428d57d26794960e3e9532c (diff) | |
| parent | 90246d3ea54f54d60593dce1b89f0226058a3c56 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/shader/prog_execute.c
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
Diffstat (limited to 'src/mesa/main/rastpos.c')
| -rw-r--r-- | src/mesa/main/rastpos.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c index 155140f3cc..9842172f46 100644 --- a/src/mesa/main/rastpos.c +++ b/src/mesa/main/rastpos.c @@ -50,12 +50,12 @@ rasterpos(GLfloat x, GLfloat y, GLfloat z, GLfloat w) p[2] = z; p[3] = w; - if (ctx->NewState) - _mesa_update_state( ctx ); - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); FLUSH_CURRENT(ctx, 0); + if (ctx->NewState) + _mesa_update_state( ctx ); + ctx->Driver.RasterPos(ctx, p); } |