Index: xc/ChangeLog =================================================================== RCS file: /cvs/xorg/xc/ChangeLog,v retrieving revision 1.836 diff -u -2 -0 -r1.836 ChangeLog --- xc/ChangeLog 24 Mar 2005 06:45:51 -0000 1.836 +++ xc/ChangeLog 25 Mar 2005 23:07:38 -0000 @@ -1,20 +1,29 @@ +2005-03-24 Roland Mainz + * xc/programs/Xserver/Xprint/ps/Imakefile + * xc/programs/Xserver/Xprint/ps/PsInit.c + bugzilla #2821 (https://bugs.freedesktop.org/show_bug.cgi?id=2821) + attachment #xxx (https://bugs.freedesktop.org/attachment.cgi?id=xxx) + Remove the cfb dependicy from the PostScript DDX as this is not needed + in a vector DDX (mfb is still needed to fill the |BitmapToRegion()| + callback with |mfbPixmapToRegion()|). + 2005-03-24 Alex Deucher * programs/Xserver/hw/xfree86/drivers/ati/radeon.h: * programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c: (RADEONEngineReset): * programs/Xserver/hw/xfree86/drivers/ati/radeon_bios.c: * programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c: * programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c: * programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c: (RADEONINPLL), (RADEONOUTPLL), (RADEONProbePLLParameters), (RADEONGetPanelInfoFromReg), (RADEONPreInitConfig), (RADEONRestoreFPRegisters), (RADEONRestorePLLRegisters), (RADEONRestorePLL2Registers), (RADEONSave), (RADEONRestore), (RADEONDisplayPowerManagementSet), (RADEONSetDynamicClock): * programs/Xserver/hw/xfree86/drivers/ati/radeon_macros.h: * programs/Xserver/hw/xfree86/drivers/ati/radeon_mergedfb.c: * programs/Xserver/hw/xfree86/drivers/ati/radeon_mm_i2c.c: * programs/Xserver/hw/xfree86/drivers/ati/radeon_video.c: (RADEONAllocAdaptor), (RADEONDisplayVideo): * programs/Xserver/hw/xfree86/drivers/ati/radeon_vip.c: Index: xc/programs/Xserver/Xprint/ps/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/ps/Imakefile,v retrieving revision 1.7 diff -u -2 -0 -r1.7 Imakefile --- xc/programs/Xserver/Xprint/ps/Imakefile 30 Aug 2004 12:49:50 -0000 1.7 +++ xc/programs/Xserver/Xprint/ps/Imakefile 25 Mar 2005 23:07:55 -0000 @@ -51,36 +51,35 @@ #ifdef XVendorString VENDORSTRING = XVendorString VENDOR_STRING = -DVENDOR_STRING=\"$(VENDORSTRING)\" #endif #ifdef XVendorRelease VENDORRELEASE = XVendorRelease VENDOR_RELEASE = -DVENDOR_RELEASE="$(VENDORRELEASE)" #endif VENDOR_DEFINES = $(VENDOR_STRING) $(VENDOR_RELEASE) XCOMM DEFINES = -DPIXPRIV XCOMM BM_CACHE disabled because it causes PostScript errors XCOMM (see http://xprint.mozdev.org/bugs/show_bug.cgi?id=1489) XCOMM DEFINES = -DXP_PSTEXT -DBM_CACHE $(VENDOR_DEFINES) $(TTF2PT1_DEFINES) $(FT_DEFINES) DEFINES = -UXFree86LOADER -DXP_PSTEXT -D_XP_PRINT_SERVER_ $(VENDOR_DEFINES) $(TTF2PT1_DEFINES) $(FT_DEFINES) $(EXT_DEFINES) - INCLUDES = -I. -I../../cfb -I../../mi -I../../mfb -I$(LIBSRC) \ + INCLUDES = -I. -I../../mi -I../../mfb -I$(LIBSRC) \ -I$(XINCLUDESRC) -I../../include -I.. -I$(TOP)/include \ -I$(EXTINCSRC) -I$(FONTINCSRC) -I$(FONTLIBSRC)/include \ $(FT2INCS) -I../../../../lib/font/FreeType LINTLIBS = $(TOP)/server/dix/llib-ldix.ln $(TOP)/server/os/llib-los.ln \ $(TOP)/server/ddx/mfb/llib-lmfb.ln \ - $(TOP)/server/ddx/mi/llib-lmi.ln \ - $(TOP)/server/ddx/cfb/llib-lcfb.ln + $(TOP)/server/ddx/mi/llib-lmi.ln NormalLibraryObjectRule() NormalLibraryTarget(ps,$(OBJS)) NormalLintTarget($(SRCS1) $(SRCS2)) DependTarget() Index: xc/programs/Xserver/Xprint/ps/PsInit.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/ps/PsInit.c,v retrieving revision 1.7 diff -u -2 -0 -r1.7 PsInit.c --- xc/programs/Xserver/Xprint/ps/PsInit.c 5 Dec 2004 04:39:34 -0000 1.7 +++ xc/programs/Xserver/Xprint/ps/PsInit.c 25 Mar 2005 23:07:56 -0000 @@ -68,51 +68,49 @@ ** * ** * Created By: Roger Helmendach (Liberty Systems) ** * ** * Copyright: Copyright 1996 The Open Group, Inc. ** * ** ********************************************************* ** ********************************************************************/ #include #include #include #include #include #include #include "Ps.h" #include "mi.h" #include "micmap.h" #include "AttrValid.h" -#include "../../mfb/mfb.h" +#include "mfb.h" #include "windowstr.h" #include "DiPrint.h" static void AllocatePsPrivates(ScreenPtr pScreen); static int PsInitContext(XpContextPtr pCon); static int PsDestroyContext(XpContextPtr pCon); -extern Bool cfbCreateDefColormap(ScreenPtr pScreen); - int PsScreenPrivateIndex; int PsContextPrivateIndex; int PsPixmapPrivateIndex; int PsWindowPrivateIndex; #ifdef GLXEXT extern void GlxWrapInitVisuals(miInitVisualsProcPtr *); #endif /* GLXEXT */ Bool InitializePsDriver(ndx, pScreen, argc, argv) int ndx; ScreenPtr pScreen; int argc; char **argv; { #if 0 int maxXres, maxYres, maxWidth, maxHeight; int maxRes, maxDim, numBytes; PsScreenPrivPtr pPriv; @@ -369,41 +367,41 @@ rootDepth = visuals[1].nplanes; #ifdef GLXEXT { miInitVisualsProcPtr proc = NULL; GlxWrapInitVisuals(&proc); /* GlxInitVisuals ignores the last three arguments. */ proc(&visuals, &depths, &nv, &nd, &rootDepth, &defaultVisual, 0, 0, 0); } #endif /* GLXEXT */ miScreenInit(pScreen, (pointer)0, pScreen->width, pScreen->height, (int) (pScreen->width / (pScreen->mmWidth / 25.40)), (int) (pScreen->height / (pScreen->mmHeight / 25.40)), 0, rootDepth, nd, depths, defaultVisual, nv, visuals); - if( cfbCreateDefColormap(pScreen)==FALSE ) return FALSE; + if( miCreateDefColormap(pScreen)==FALSE ) return FALSE; /*scalingScreenInit(pScreen);*/ return TRUE; } static void AllocatePsPrivates(ScreenPtr pScreen) { static unsigned long PsGeneration = 0; if((unsigned long)PsGeneration != serverGeneration) { PsScreenPrivateIndex = AllocateScreenPrivateIndex(); PsWindowPrivateIndex = AllocateWindowPrivateIndex(); AllocateWindowPrivate(pScreen, PsWindowPrivateIndex, sizeof(PsWindowPrivRec)); PsContextPrivateIndex = XpAllocateContextPrivateIndex();