more stuff towards getting a driver loaded into X.orgdrvlayer

9 files changed, 27 insertions, 22 deletions

diff --git a/drv/Makefile.am b/drv/Makefile.am
index d8a51df73..22debd888 100644
--- a/drv/Makefile.am
+++ b/drv/Makefile.am
@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES = libdrv.la
 
 if XORG
-sdk_HEADERS = drv_mi.h
+sdk_HEADERS = drv_mi.h drv_types.h drv_pixmapstr.h drv_gcstruct.h drv_pixmap.h drv_gc.h drv_picturehooks.h
 endif
 
 AM_CFLAGS = $(DIX_CFLAGS)
diff --git a/drv/drv_damage.h b/drv/drv_damage.h
index 1616ac195..319ca00fd 100644
--- a/drv/drv_damage.h
+++ b/drv/drv_damage.h
@@ -5,7 +5,7 @@
 typedef void (*DrvDamageReportFunc) (DrvDamagePtr pDamage, RegionPtr pRegion, void *closure);
 typedef void (*DrvDamageDestroyFunc) (DrvDamagePtr pDamage, void *closure);
 
-void
+extern _X_EXPORT void
 DrvDamageRegister (PixmapPtr pPixmap,
 		   DrvDamagePtr   pDamage);
 
@@ -18,8 +18,8 @@ DrvDamageCreate (DrvDamageReportFunc  damageReport,
 		 ScreenPtr		pScreen,
 		 void *		closure);
 
-RegionPtr DrvDamagePendingRegion (DrvDamagePtr pDamage);
-RegionPtr DrvDamageRegion (DrvDamagePtr pDamage);
+extern _X_EXPORT RegionPtr DrvDamagePendingRegion (DrvDamagePtr pDamage);
+extern _X_EXPORT RegionPtr DrvDamageRegion (DrvDamagePtr pDamage);
 
 extern _X_EXPORT void DrvDamageSetReportAfterOp (DrvDamagePtr pDamage, Bool reportAfter);
 
@@ -30,6 +30,6 @@ DrvDamageUnregister (PixmapPtr	pDrawable,
 extern _X_EXPORT void
 DrvDamageDestroy (DrvDamagePtr pDamage);
 
-void
+extern _X_EXPORT void
 DrvDamageRegionProcessPending (PixmapPtr pPixmap);
 #endif
diff --git a/drv/drv_gc.h b/drv/drv_gc.h
index 3f9c2b498..75b5a37ba 100644
--- a/drv/drv_gc.h
+++ b/drv/drv_gc.h
@@ -31,5 +31,4 @@ extern _X_EXPORT DrvGCPtr DrvGetScratchGC(
 extern _X_EXPORT void DrvFreeScratchGC(
     DrvGCPtr /*pGC*/);
 
-void drvPolySegment(PixmapPtr pPixmap, DrvGCPtr pGC, int nseg, xSegment *pSegs);
 #endif
diff --git a/drv/drv_mi.h b/drv/drv_mi.h
index 151399d64..7aa2f479a 100644
--- a/drv/drv_mi.h
+++ b/drv/drv_mi.h
@@ -1,11 +1,11 @@
 #ifndef DRV_MI_H
 #define DRV_MI_H
 
-void
+extern _X_EXPORT void
 drvWideDash (PixmapPtr pPixmap, DrvGCPtr pGC,
 	     int mode, int npt, DDXPointPtr pPts);
 
-void
+extern _X_EXPORT void
 drvWideLine (PixmapPtr pPixmap, DrvGCPtr pGC,
 	     int mode, int npt, DDXPointPtr pPts);
 
@@ -144,6 +144,6 @@ extern _X_EXPORT void drvZeroDashLine(
     DDXPointRec * /*pptInit*/
 );
 
-void
+extern _X_EXPORT void
 drvPolyFillArc(PixmapPtr pPixmap, DrvGCPtr pGC, int narcs, xArc *parcs);
 #endif
diff --git a/drv/drv_picture.h b/drv/drv_picture.h
index 97912c6af..f046b030b 100644
--- a/drv/drv_picture.h
+++ b/drv/drv_picture.h
@@ -11,14 +11,14 @@
 
 int DrvFreePicture (pointer value);
 
-DrvPicturePtr
+extern _X_EXPORT DrvPicturePtr
 DrvCreatePicture (PixmapPtr	pDrawable,
 		  PictFormatPtr	pFormat,
 		  Mask vmask,
 		  int *vlist);
 
 
-void
+extern _X_EXPORT void
 DrvCompositePicture (CARD8		op,
 		     DrvPicturePtr	pSrc,
 		     DrvPicturePtr	pMask,
@@ -31,7 +31,7 @@ DrvCompositePicture (CARD8		op,
 		     INT16		yDst,
 		     CARD16	width,
 		     CARD16	height);
-void
+extern _X_EXPORT void
 DrvGlyphs (CARD8		op,
 	   DrvPicturePtr	pSrc,
 	   DrvPicturePtr	pDst,
diff --git a/drv/drv_pixmap.h b/drv/drv_pixmap.h
index 9a01d490d..5a3227e02 100644
--- a/drv/drv_pixmap.h
+++ b/drv/drv_pixmap.h
@@ -63,8 +63,8 @@ extern _X_EXPORT PixmapPtr AllocatePixmap(
 extern _X_EXPORT void FreePixmap(
     PixmapPtr /*pPixmap*/);
 
-extern _X_EXPORT Bool
-drvModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, int depth,
-		      int bitsPerPixel, int devKind, pointer pPixData);
+extern _X_EXPORT Bool drvModifyPixmapHeader(
+    PixmapPtr pPixmap, int width, int height, int depth,
+    int bitsPerPixel, int devKind, pointer pPixData);
 
 #endif
diff --git a/drv/drvpolyseg.c b/drv/drvpolyseg.c
index 1ad354c89..8d12dda94 100644
--- a/drv/drvpolyseg.c
+++ b/drv/drvpolyseg.c
@@ -53,6 +53,7 @@ SOFTWARE.
 #include "regionstr.h"
 #include "drv_types.h"
 #include "drv_gcstruct.h"
+#include "drv_mi.h"
 #include "drv_pixmap.h"
 
 /*****************************************************************
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index cd09b2789..2dd5a43e6 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -570,13 +570,13 @@ ephyrRandRSetConfig (ScreenPtr		pScreen,
   /*
    * Set frame buffer mapping
    */
-  (*pScreen->ModifyPixmapHeader) (fbGetScreenPixmap (pScreen),
-				  pScreen->width,
-				  pScreen->height,
-				  screen->fb.depth,
-				  screen->fb.bitsPerPixel,
-				  screen->fb.byteStride,
-				  screen->fb.frameBuffer);
+  (*pScreen->gpu.ModifyPixmapHeader) (fbGetScreenPixmap (pScreen),
+				      pScreen->width,
+				      pScreen->height,
+				      screen->fb.depth,
+				      screen->fb.bitsPerPixel,
+				      screen->fb.byteStride,
+				      screen->fb.frameBuffer);
   
   /* set the subpixel order */
   
diff --git a/hw/xfree86/loader/sdksyms.sh b/hw/xfree86/loader/sdksyms.sh
index 18bb73523..0b3dfb631 100755
--- a/hw/xfree86/loader/sdksyms.sh
+++ b/hw/xfree86/loader/sdksyms.sh
@@ -211,6 +211,11 @@ cat > sdksyms.c << EOF
 #endif
  */
 
+#include "drv_picturestr.h"
+#include "impedpict.h"
+#include "drv_pixmap.h"
+#include "drv_mi.h"
+#include "drv_damage.h"
 
 /* mi/Makefile.am */
 #include "micmap.h"