diff options
author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-11-25 09:28:30 +0000 |
---|---|---|
committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-11-25 09:28:30 +0000 |
commit | 4af0d940a35536f096a9289470af0268a79402b3 (patch) | |
tree | 811a00ed03b1bcd5a99713108f831b41484153ff /src/mesa/state_tracker/st_cb_rasterpos.c | |
parent | c5b52b5e0e6f6e47c3953076fa788921b1c5a5e2 (diff) | |
parent | 55839ae064d64b7fcc180fcddb364bf31ab760dc (diff) |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
scons/gallium.py
src/gallium/auxiliary/pipebuffer/pb_buffer.h
Diffstat (limited to 'src/mesa/state_tracker/st_cb_rasterpos.c')
-rw-r--r-- | src/mesa/state_tracker/st_cb_rasterpos.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_cb_rasterpos.c b/src/mesa/state_tracker/st_cb_rasterpos.c index 3b30c2a61b..3eaccb74e1 100644 --- a/src/mesa/state_tracker/st_cb_rasterpos.c +++ b/src/mesa/state_tracker/st_cb_rasterpos.c @@ -146,7 +146,10 @@ rastpos_point(struct draw_stage *stage, struct prim_header *prim) /* update raster pos */ pos = prim->v[0]->data[0]; ctx->Current.RasterPos[0] = pos[0]; - ctx->Current.RasterPos[1] = height - pos[1]; /* invert Y */ + if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP) + ctx->Current.RasterPos[1] = height - pos[1]; /* invert Y */ + else + ctx->Current.RasterPos[1] = pos[1]; ctx->Current.RasterPos[2] = pos[2]; ctx->Current.RasterPos[3] = pos[3]; |