Module Name: xsrc
Committed By: nonaka
Date: Sat Dec 12 07:52:36 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb.h wsfb_driver.c
Log Message:
Enable shadowFB for rotate option.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h:1.2 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h:1.3
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h:1.2 Fri Jun 12 01:53:00 2009
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h Sat Dec 12 07:52:36 2009
@@ -58,7 +58,7 @@
unsigned char* fbstart;
unsigned char* fbmem;
size_t fbmem_len;
- //void * shadow;
+ void * shadow;
Bool shadowFB;
Bool HWCursor;
CloseScreenProcPtr CloseScreen;
Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.5 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.6
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.5 Mon Nov 9 05:24:05 2009
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c Sat Dec 12 07:52:36 2009
@@ -835,7 +835,6 @@
fPtr->fbstart = fPtr->fbmem;
-#if 0
if (fPtr->shadowFB) {
fPtr->shadow = xcalloc(1, pScrn->virtualX * pScrn->virtualY *
pScrn->bitsPerPixel);
@@ -846,7 +845,6 @@
return FALSE;
}
}
-#endif
switch (pScrn->bitsPerPixel) {
case 1:
@@ -870,7 +868,7 @@
case 24:
case 32:
ret = fbScreenInit(pScreen,
- /*fPtr->shadowFB ? fPtr->shadow :*/ fPtr->fbstart,
+ fPtr->shadowFB ? fPtr->shadow : fPtr->fbstart,
pScrn->virtualX, pScrn->virtualY,
pScrn->xDpi, pScrn->yDpi,
pScrn->displayWidth, pScrn->bitsPerPixel);
