diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-14 13:17:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-14 13:17:20 +0000 |
| commit | 3815190d52f8ae453c2458335394eb5b18ab9bf5 (patch) | |
| tree | f1d30ef6d20654c2b6e201dec66426f99465bea2 /xorg-server/hw/xfree86/common/xf86VGAarbiter.c | |
| parent | 9e19f3933a9c37ea36ce295b6434bbd326fe44ad (diff) | |
| download | vcxsrv-3815190d52f8ae453c2458335394eb5b18ab9bf5.tar.gz vcxsrv-3815190d52f8ae453c2458335394eb5b18ab9bf5.tar.bz2 vcxsrv-3815190d52f8ae453c2458335394eb5b18ab9bf5.zip | |
xserver libX11 pixman git update 14/9/2010
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86VGAarbiter.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86VGAarbiter.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c index 1af525e49..50ea6ca9e 100644 --- a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c +++ b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c @@ -53,7 +53,6 @@ static GCOps VGAarbiterGCOps = { VGAarbiterPolyFillArc, VGAarbiterPolyText8, VGAarbiterPolyText16,
VGAarbiterImageText8, VGAarbiterImageText16, VGAarbiterImageGlyphBlt,
VGAarbiterPolyGlyphBlt, VGAarbiterPushPixels,
- {NULL} /* devPrivate */
};
static miPointerSpriteFuncRec VGAarbiterSpriteFuncs = {
@@ -574,9 +573,7 @@ VGAarbiterCreateGC(GCPtr pGC) Bool ret;
SCREEN_PROLOG(CreateGC);
- VGAGet(pScreen);
ret = (*pScreen->CreateGC)(pGC);
- VGAPut();
GC_WRAP(pGC);
SCREEN_EPILOG(CreateGC,VGAarbiterCreateGC);
@@ -1123,7 +1120,7 @@ void xf86VGAarbiterLock(ScrnInfoPtr pScrn) {} void xf86VGAarbiterUnlock(ScrnInfoPtr pScrn) {}
Bool xf86VGAarbiterAllowDRI(ScreenPtr pScreen) { return TRUE; }
void xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn) {}
-void xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn) {}
+void xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn, int rsrc) {}
Bool xf86VGAarbiterWrapFunctions(void) { return FALSE; }
#endif
|