Mesa (radeon-rewrite): radeon: emit scissor before emiting vertices

Jerome Glisse glisse at kemper.freedesktop.org
Wed May 27 19:53:05 UTC 2009


Module: Mesa
Branch: radeon-rewrite
Commit: 3a6dd3ebb33a35779b0d5be2c8cab581a56f245a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3a6dd3ebb33a35779b0d5be2c8cab581a56f245a

Author: Jerome Glisse <glisse at freedesktop.org>
Date:   Wed May 27 21:50:03 2009 +0200

radeon: emit scissor before emiting vertices

---

 src/mesa/drivers/dri/radeon/radeon_ioctl.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_ioctl.c b/src/mesa/drivers/dri/radeon/radeon_ioctl.c
index 8f8878e..01c45df 100644
--- a/src/mesa/drivers/dri/radeon/radeon_ioctl.c
+++ b/src/mesa/drivers/dri/radeon/radeon_ioctl.c
@@ -206,8 +206,6 @@ void radeonFlushElts( GLcontext *ctx )
    assert( rmesa->radeon.dma.flush == radeonFlushElts );
    rmesa->radeon.dma.flush = NULL;
 
-   radeonEmitScissor(rmesa);
-
    nr = rmesa->tcl.elt_used;
 
 #if RADEON_OLD_PACKETS
@@ -260,6 +258,7 @@ GLushort *radeonAllocEltsOpenEnded( r100ContextPtr rmesa,
    assert((primitive & RADEON_CP_VC_CNTL_PRIM_WALK_IND));
 
    radeonEmitState(&rmesa->radeon);
+   radeonEmitScissor(rmesa);
 
    rmesa->tcl.elt_cmd_start = rmesa->radeon.cmdbuf.cs->cdw;
 
@@ -280,7 +279,6 @@ GLushort *radeonAllocEltsOpenEnded( r100ContextPtr rmesa,
 	     RADEON_CP_VC_CNTL_PRIM_WALK_IND |
 	     RADEON_CP_VC_CNTL_COLOR_ORDER_RGBA |
 	     RADEON_CP_VC_CNTL_VTX_FMT_RADEON_MODE);
-
 #else
    BEGIN_BATCH_NO_AUTOSTATE(ELTS_BUFSZ(align_min_nr)/4);
    OUT_BATCH_PACKET3_CLIP(RADEON_CP_PACKET3_DRAW_INDX, 0);




More information about the mesa-commit mailing list