Add dependency tracking to sdksyms.c and export composite wrapper.
Thanks to David Miller for noticing a make problem with sdksyms.c not being regenerated when sdksyms.sh is updated. This is not yet the best solution; automake generates dependency for sdksyms.o, but the build really should also regenerate sdksyms.c when sdksyms.o needs to be regenerated. Export the symbols in miext/cw/cw.h. These symbols are in libxaa, and at least the nvidia driver uses them. Maybe cw.h should be installed in the sdk.
This commit is contained in:
parent
090f631239
commit
aa71ac1dd4
|
@ -23,5 +23,5 @@ libloader_la_SOURCES = \
|
||||||
|
|
||||||
CLEANFILES = sdksyms.c
|
CLEANFILES = sdksyms.c
|
||||||
|
|
||||||
sdksyms.c:
|
sdksyms.c: sdksyms.sh
|
||||||
$(srcdir)/sdksyms.sh $(AM_CFLAGS) $(CFLAGS) $(INCLUDES)
|
$(srcdir)/sdksyms.sh $(AM_CFLAGS) $(CFLAGS) $(INCLUDES)
|
||||||
|
|
|
@ -44,7 +44,7 @@ typedef struct {
|
||||||
GCFuncs *wrapFuncs; /* wrapped funcs */
|
GCFuncs *wrapFuncs; /* wrapped funcs */
|
||||||
} cwGCRec, *cwGCPtr;
|
} cwGCRec, *cwGCPtr;
|
||||||
|
|
||||||
extern DevPrivateKey cwGCKey;
|
extern _X_EXPORT DevPrivateKey cwGCKey;
|
||||||
|
|
||||||
#define getCwGC(pGC) ((cwGCPtr)dixLookupPrivate(&(pGC)->devPrivates, cwGCKey))
|
#define getCwGC(pGC) ((cwGCPtr)dixLookupPrivate(&(pGC)->devPrivates, cwGCKey))
|
||||||
#define setCwGC(pGC,p) dixSetPrivate(&(pGC)->devPrivates, cwGCKey, p)
|
#define setCwGC(pGC,p) dixSetPrivate(&(pGC)->devPrivates, cwGCKey, p)
|
||||||
|
@ -64,8 +64,8 @@ typedef struct {
|
||||||
(cwPicturePtr)dixLookupPrivate(&(pPicture)->devPrivates, cwPictureKey) : 0)
|
(cwPicturePtr)dixLookupPrivate(&(pPicture)->devPrivates, cwPictureKey) : 0)
|
||||||
#define setCwPicture(pPicture,p) dixSetPrivate(&(pPicture)->devPrivates, cwPictureKey, p)
|
#define setCwPicture(pPicture,p) dixSetPrivate(&(pPicture)->devPrivates, cwPictureKey, p)
|
||||||
|
|
||||||
extern DevPrivateKey cwPictureKey;
|
extern _X_EXPORT DevPrivateKey cwPictureKey;
|
||||||
extern DevPrivateKey cwWindowKey;
|
extern _X_EXPORT DevPrivateKey cwWindowKey;
|
||||||
|
|
||||||
#define cwWindowPrivate(pWin) dixLookupPrivate(&(pWin)->devPrivates, cwWindowKey)
|
#define cwWindowPrivate(pWin) dixLookupPrivate(&(pWin)->devPrivates, cwWindowKey)
|
||||||
#define getCwPixmap(pWindow) ((PixmapPtr) cwWindowPrivate(pWindow))
|
#define getCwPixmap(pWindow) ((PixmapPtr) cwWindowPrivate(pWindow))
|
||||||
|
@ -110,7 +110,7 @@ typedef struct {
|
||||||
#endif
|
#endif
|
||||||
} cwScreenRec, *cwScreenPtr;
|
} cwScreenRec, *cwScreenPtr;
|
||||||
|
|
||||||
extern DevPrivateKey cwScreenKey;
|
extern _X_EXPORT DevPrivateKey cwScreenKey;
|
||||||
|
|
||||||
#define getCwScreen(pScreen) ((cwScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, cwScreenKey))
|
#define getCwScreen(pScreen) ((cwScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, cwScreenKey))
|
||||||
#define setCwScreen(pScreen,p) dixSetPrivate(&(pScreen)->devPrivates, cwScreenKey, p)
|
#define setCwScreen(pScreen,p) dixSetPrivate(&(pScreen)->devPrivates, cwScreenKey, p)
|
||||||
|
@ -151,18 +151,18 @@ extern DevPrivateKey cwScreenKey;
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
/* cw.c */
|
/* cw.c */
|
||||||
DrawablePtr
|
extern _X_EXPORT DrawablePtr
|
||||||
cwGetBackingDrawable(DrawablePtr pDrawable, int *x_off, int *y_off);
|
cwGetBackingDrawable(DrawablePtr pDrawable, int *x_off, int *y_off);
|
||||||
|
|
||||||
/* cw_render.c */
|
/* cw_render.c */
|
||||||
|
|
||||||
void
|
extern _X_EXPORT void
|
||||||
cwInitializeRender (ScreenPtr pScreen);
|
cwInitializeRender (ScreenPtr pScreen);
|
||||||
|
|
||||||
void
|
extern _X_EXPORT void
|
||||||
cwFiniRender (ScreenPtr pScreen);
|
cwFiniRender (ScreenPtr pScreen);
|
||||||
|
|
||||||
/* cw.c */
|
/* cw.c */
|
||||||
|
|
||||||
void
|
extern _X_EXPORT void
|
||||||
miInitializeCompositeWrapper(ScreenPtr pScreen);
|
miInitializeCompositeWrapper(ScreenPtr pScreen);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user