summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Bachelot <xavier@bachelot.org>2010-12-16 22:26:34 +0000
committerXavier Bachelot <xavier@bachelot.org>2010-12-16 22:26:34 +0000
commit615d478423ec782d51a3a4af79206586de0841e3 (patch)
treeb92203e9445e4f61fa6f5f541627faba076a8498
parentad887ddc9b638b87de474884b2477fdfbc59579e (diff)
fix a typo and add a FIXME following the VX900 merge
-rw-r--r--src/via_accel.c2
-rw-r--r--src/via_cursor.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/via_accel.c b/src/via_accel.c
index 60f307d..c6252c2 100644
--- a/src/via_accel.c
+++ b/src/via_accel.c
@@ -1252,7 +1252,7 @@ viaInitXAA(ScreenPtr pScreen)
HARDWARE_CLIP_COLOR_8x8_FILL |
HARDWARE_CLIP_SCREEN_TO_SCREEN_COLOR_EXPAND | 0);
- if (pVia->Chipset != VIA_VX855 || pVia->Chipset != VIA_VX900)
+ if (pVia->Chipset != VIA_VX855 && pVia->Chipset != VIA_VX900)
xaaptr->ClippingFlags |= (HARDWARE_CLIP_SOLID_FILL |
HARDWARE_CLIP_SOLID_LINE |
HARDWARE_CLIP_DASHED_LINE);
diff --git a/src/via_cursor.c b/src/via_cursor.c
index 8e70cd2..518f6fa 100644
--- a/src/via_cursor.c
+++ b/src/via_cursor.c
@@ -73,6 +73,7 @@ viaHWCursorInit(ScreenPtr pScreen)
pVia->CursorSize = ((pVia->CursorMaxWidth * pVia->CursorMaxHeight) / 8) * 2;
break;
case VIA_VX900:
+ /* FIXME : ARGB cursor should work */
pVia->CursorARGBSupported = FALSE;
pVia->CursorMaxWidth = 64;
pVia->CursorMaxHeight = 64;