On Die, 2003-02-18 at 20:10, Alan Hourihane wrote:
> On Tue, Feb 18, 2003 at 10:49:58 -0800, Nolan Leake wrote:
> > On Sun, 2003-02-16 at 16:36, Mark Vojkovich wrote:
> > > I don't really know what the point of fbIsVirtual was.
> > > Apps that use ShadowFBInit need to repaint when entering
> > > the VT. We didn't have the EnableDisableFBAccess stuff
> > > when I wrote shadowfb and the refresh at EnterVT was to
> > > catch the copy from the old root window backing pixmap.
> > > With EnableDisableFBAccess handling exposures, it shouldn't
> > > be needed anymore but we definitely don't want to
> > > block EnableDisableFBAccess like the code is doing.
> > >
> > > It seems like having ShadowFBInit call ShadowFBInit2 with
> > > FALSE is the correct behavior. Experimentation shows
> > > this to remove the corruption.
> >
> > The previous shadowfb code blocked EnableDisableFBAccess and updated on
> > VT switching. Since the code looked stale (I couldn't find where the
> > screen got stored in the backing pixmap anywhere), I disabled it for the
> > vmware driver, but since I didn't have a way to test the other clients
> > of shadowfb, I preserved the old behavior for them.
> >
> > If having ShadowFBInit call ShadowFBInit2 with FALSE works for all
> > clients, then the fbIsVirtual flag can be removed entirely; the only
> > caller of ShadowFBInit2 is vmware.c, and it passes in FALSE.
>
> O.k. Thanks Nolan.
>
> I've just removed that code from the CVS.
You missed this.
--
Earthling Michel D�nzer (MrCooper)/ Debian GNU/Linux (powerpc) developer
XFree86 and DRI project member / CS student, Free Software enthusiast
Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c,v
retrieving revision 1.30
diff -p -u -r1.30 radeon_dri.c
--- programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c 2003/02/08 23:27:36 1.30
+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c 2003/02/19 00:41:42
@@ -1549,7 +1549,7 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr
/* Have shadowfb run only while there is 3d active. */
if (info->allowPageFlip /* && info->drmMinor >= 3 */) {
- ShadowFBInit2( pScreen, NULL, RADEONDRIRefreshArea, FALSE );
+ ShadowFBInit( pScreen, RADEONDRIRefreshArea );
} else {
info->allowPageFlip = 0;
}
Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v
retrieving revision 1.87
diff -p -u -r1.87 radeon_driver.c
--- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2003/02/13 03:12:25 1.87
+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2003/02/19 00:44:41
@@ -324,7 +328,7 @@ static const char *driSymbols[] = {
};
static const char *driShadowFBSymbols[] = {
- "ShadowFBInit2",
+ "ShadowFBInit",
NULL
};
#endif
