diff options
| author | Gareth Hughes <gareth@users.sourceforge.net> | 2001-02-26 16:06:55 +0000 |
|---|---|---|
| committer | Gareth Hughes <gareth@users.sourceforge.net> | 2001-02-26 16:06:55 +0000 |
| commit | 13e8184e649ba7386f90fe19e534306482571e02 (patch) | |
| tree | 90faffc73b60ce4f02ccdf32e0451c5b133f6b98 | |
| parent | d6804a3e8c9120581b5b71a971e508b9ae99350f (diff) | |
Checkpoint commit before blit coordinate space change. This is to allowtdfx-3-1-0-20010301-freeze
optimized TexSubImage updates. Everything else works...
| -rw-r--r-- | linux/radeon_state.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/linux/radeon_state.c b/linux/radeon_state.c index 621adffb0..ff1b3512f 100644 --- a/linux/radeon_state.c +++ b/linux/radeon_state.c @@ -1030,7 +1030,8 @@ static int radeon_cp_dispatch_texture( drm_device_t *dev, return -EINVAL; } - DRM_DEBUG( " tex=%d blit=%d\n", tex_width, blit_width ); + DRM_DEBUG( " tex=%dx%d blit=%d\n", + tex_width, tex->height, blit_width ); /* Flush the pixel cache. This ensures no pixel data gets mixed * up with the texture data from the host data blit, otherwise @@ -1087,11 +1088,7 @@ static int radeon_cp_dispatch_texture( drm_device_t *dev, RADEON_GMC_CLR_CMP_CNTL_DIS | RADEON_GMC_WR_MSK_DIS); -#if 1 buffer[2] = (tex->pitch << 22) | (tex->offset >> 10); -#else - buffer[2] = dev_priv->front_pitch_offset; -#endif buffer[3] = 0xffffffff; buffer[4] = 0xffffffff; buffer[5] = (y << 16) | image->x; @@ -1112,10 +1109,6 @@ static int radeon_cp_dispatch_texture( drm_device_t *dev, * width. */ for ( i = 0 ; i < tex->height ; i++ ) { - int j; - for ( j = 0 ; j < 8 ; j++ ) { - buffer[j] = 0xf800f800; - } if ( copy_from_user( buffer, data, tex_width ) ) return -EFAULT; buffer += 8; |