summaryrefslogtreecommitdiff
path: root/hw/xfree86
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-08-04 12:21:48 +0000
committerEgbert Eich <eich@suse.de>2004-08-04 12:21:48 +0000
commitd240c41a3ab9cde9921cc96cf86e630ca5c9005a (patch)
tree1c4822c1d1e489cbf23405f31d0623ffec9dbfd5 /hw/xfree86
parent751fd11a9ad1a473d7311362246b0869a008001b (diff)
Optimization of CJK rendering when using versions of freetype prior to
2.1.8 (Chisato Yamauchi). A small backward compatibility fix to make the freetype module build with freetype version < 2.1.7. Fixed/added some debugging code.
Diffstat (limited to 'hw/xfree86')
-rw-r--r--hw/xfree86/fbdevhw/fbdevhw.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index 6d578d5fb..0ca3c93ef 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -731,7 +731,7 @@ fbdevHWLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
unsigned short red,green,blue;
int i;
- TRACE_ENTER("ModeInit");
+ TRACE_ENTER("LoadPalette");
cmap.len = 1;
cmap.red = &red;
cmap.green = &green;
@@ -796,7 +796,6 @@ fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags)
fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
TRACE_ENTER("AdjustFrame");
-
if ( x < 0 || x + fPtr->var.xres > fPtr->var.xres_virtual ||
y < 0 || y + fPtr->var.yres > fPtr->var.yres_virtual )
return;
@@ -835,6 +834,7 @@ fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags)
fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
unsigned long fbmode;
+ TRACE_ENTER("DPMSSet");
if (!pScrn->vtSema)
return;
@@ -867,6 +867,7 @@ fbdevHWSaveScreen(ScreenPtr pScreen, int mode)
fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
unsigned long unblank;
+ TRACE_ENTER("HWSaveScreen");
if (!pScrn->vtSema)
return TRUE;