diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2002-08-13 09:29:38 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2002-08-13 09:29:38 +0000 |
| commit | 46f3c135024a0992c2e42a8a36f895f2e8945930 (patch) | |
| tree | bf96fb7e883f8fa14bb97834b7ebe1c26479186a | |
| parent | 7adbd50d969c7c213e2c7a608738f62e9fd03781 (diff) | |
Restore correct scissor bounds.
| -rw-r--r-- | shared-core/radeon_state.c | 7 | ||||
| -rw-r--r-- | shared/radeon_state.c | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/shared-core/radeon_state.c b/shared-core/radeon_state.c index 1706170b..7b2dbdfb 100644 --- a/shared-core/radeon_state.c +++ b/shared-core/radeon_state.c @@ -50,8 +50,7 @@ static __inline__ void radeon_emit_clip_rect( drm_radeon_private_t *dev_priv, OUT_RING( CP_PACKET0( RADEON_RE_TOP_LEFT, 0 ) ); OUT_RING( (box->y1 << 16) | box->x1 ); OUT_RING( CP_PACKET0( RADEON_RE_WIDTH_HEIGHT, 0 ) ); -/* OUT_RING( ((box->y2 - 1) << 16) | (box->x2 - 1) );*/ - OUT_RING( (box->y2 << 16) | box->x2 ); + OUT_RING( ((box->y2 - 1) << 16) | (box->x2 - 1) ); ADVANCE_RING(); } @@ -412,7 +411,6 @@ static void radeon_cp_dispatch_clear( drm_device_t *dev, RING_LOCALS; DRM_DEBUG( "flags = 0x%x\n", flags ); - dev_priv->stats.clears++; if ( dev_priv->page_flipping && dev_priv->current_page == 1 ) { @@ -810,9 +808,6 @@ static void radeon_cp_dispatch_flip( drm_device_t *dev ) BEGIN_RING( 4 ); RADEON_WAIT_UNTIL_3D_IDLE(); -/* - RADEON_WAIT_UNTIL_PAGE_FLIPPED(); -*/ OUT_RING( CP_PACKET0( RADEON_CRTC_OFFSET, 0 ) ); if ( dev_priv->current_page == 0 ) { diff --git a/shared/radeon_state.c b/shared/radeon_state.c index 1706170b..7b2dbdfb 100644 --- a/shared/radeon_state.c +++ b/shared/radeon_state.c @@ -50,8 +50,7 @@ static __inline__ void radeon_emit_clip_rect( drm_radeon_private_t *dev_priv, OUT_RING( CP_PACKET0( RADEON_RE_TOP_LEFT, 0 ) ); OUT_RING( (box->y1 << 16) | box->x1 ); OUT_RING( CP_PACKET0( RADEON_RE_WIDTH_HEIGHT, 0 ) ); -/* OUT_RING( ((box->y2 - 1) << 16) | (box->x2 - 1) );*/ - OUT_RING( (box->y2 << 16) | box->x2 ); + OUT_RING( ((box->y2 - 1) << 16) | (box->x2 - 1) ); ADVANCE_RING(); } @@ -412,7 +411,6 @@ static void radeon_cp_dispatch_clear( drm_device_t *dev, RING_LOCALS; DRM_DEBUG( "flags = 0x%x\n", flags ); - dev_priv->stats.clears++; if ( dev_priv->page_flipping && dev_priv->current_page == 1 ) { @@ -810,9 +808,6 @@ static void radeon_cp_dispatch_flip( drm_device_t *dev ) BEGIN_RING( 4 ); RADEON_WAIT_UNTIL_3D_IDLE(); -/* - RADEON_WAIT_UNTIL_PAGE_FLIPPED(); -*/ OUT_RING( CP_PACKET0( RADEON_CRTC_OFFSET, 0 ) ); if ( dev_priv->current_page == 0 ) { |