summaryrefslogtreecommitdiff
path: root/src/radeon_exa.c
diff options
context:
space:
mode:
authorEric Anholt <anholt@freebsd.org>2005-09-17 20:02:01 +0000
committerEric Anholt <anholt@freebsd.org>2005-09-17 20:02:01 +0000
commit64e7db2698ee48af92594c16d72e33c16372c9d7 (patch)
treed61feddb232c4b6e8cb61a9edb727ed079f8d755 /src/radeon_exa.c
parent3c71198a088e71a105e274f176c8ceb503615d46 (diff)
- Don't try to upload 0 byte-per-pixel (PICT_a1) data using
RADEONHostDataBlit. - Disable the shortcut for switching from 3d to 3d in radeon_exa.c. It appears that we do need the cache flush here, thought it's not clear why. Disable the 2d to 2d shortcut while here, since I'm unsure of what we're doing. Exposed by the following bit: - Bug #4485: Add a new routine, exaGlyphs, to handle font drawing. Glyphs were being accumulated in from non-migratable scratch pixmaps, causing the destination pixmap to move towards screen but the migration necessary for source never to happen, leading to abysmal performance. Instead, copy the scratch glyph data into a real pixmap first, then composite from that into the destination, allowing for migration. time ls -lR from programs/Xserver showed 26.9% (+/- 6.3%) decrease in wall time (n=3). - Create exaDrawableUse* wrapping exaPixmapUse*, but which are aware of windows needing backing store. Makes migration code prettier, and ensures that composited windows will be migrated as normal when we turn off cw for EXA. (issue brought up by keithp)
Diffstat (limited to 'src/radeon_exa.c')
-rw-r--r--src/radeon_exa.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index 5b81b273..10949cf2 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -288,8 +288,8 @@ static void RADEONFinishAccess(PixmapPtr pPix, int index)
#define RADEON_SWITCH_TO_2D() \
do { \
- if (info->engineMode == EXA_ENGINEMODE_2D) \
- break; \
+ /*if (info->engineMode == EXA_ENGINEMODE_2D)*/ \
+ /*break;*/ \
BEGIN_ACCEL(2); \
OUT_ACCEL_REG(RADEON_RB2D_DSTCACHE_CTLSTAT, RADEON_RB2D_DC_FLUSH); \
OUT_ACCEL_REG(RADEON_WAIT_UNTIL, \
@@ -301,8 +301,8 @@ do { \
#define RADEON_SWITCH_TO_3D() \
do { \
- if (info->engineMode == EXA_ENGINEMODE_3D) \
- break; \
+ /*if (info->engineMode == EXA_ENGINEMODE_3D)*/ \
+ /*break;*/ \
BEGIN_ACCEL(2); \
OUT_ACCEL_REG(RADEON_RB2D_DSTCACHE_CTLSTAT, RADEON_RB2D_DC_FLUSH); \
OUT_ACCEL_REG(RADEON_WAIT_UNTIL, \