b1dac41fb3
All .a libraries were converted to .la, and instead of linking the Xorg binary with a mix of .a and .la, and adding some libraries more then once in the command line, etc, now it generates a single libxorg.la from all the required convenience libraries, and links with a dummy xorg.c (that should usually be the file with the main function...). This removes the requirement of some things like libosandcommon and libinit, that existed to circumvent problems when linking multiple .a and .la in the final Xorg binary. The "symbol table" is now generated dynamically, by a shell script, with an embedded gawk parser that parses cpp output. The new file sdksyms.sh is generated by hand by analyzing all Makefile.am's and making it create a sdksyms.c file, that includes all sdk headers that will add symbols for the Xorg binary. Module headers aren't read, and a in 2 files it was required to add a "<hash>ifndef XorgLoader" around declarations shared between the Xorg binary and libextmod. A few other changes were added to other sdk headers, like preventing multiple inclusion, or including other headers to satisfy dependencies. This should be a lot more portable, and better (hopefully properly) using libtool to generate convenience libraries.
119 lines
2.6 KiB
C
119 lines
2.6 KiB
C
|
|
#ifndef _XVMC_H
|
|
#define _XVMC_H
|
|
#include <X11/extensions/Xv.h>
|
|
#include "xvdix.h"
|
|
|
|
typedef struct {
|
|
int num_xvimages;
|
|
int *xvimage_ids;
|
|
} XvMCImageIDList;
|
|
|
|
typedef struct {
|
|
int surface_type_id;
|
|
int chroma_format;
|
|
int color_description;
|
|
unsigned short max_width;
|
|
unsigned short max_height;
|
|
unsigned short subpicture_max_width;
|
|
unsigned short subpicture_max_height;
|
|
int mc_type;
|
|
int flags;
|
|
XvMCImageIDList *compatible_subpictures;
|
|
} XvMCSurfaceInfoRec, *XvMCSurfaceInfoPtr;
|
|
|
|
typedef struct {
|
|
XID context_id;
|
|
ScreenPtr pScreen;
|
|
int adapt_num;
|
|
int surface_type_id;
|
|
unsigned short width;
|
|
unsigned short height;
|
|
CARD32 flags;
|
|
int refcnt;
|
|
pointer port_priv;
|
|
pointer driver_priv;
|
|
} XvMCContextRec, *XvMCContextPtr;
|
|
|
|
typedef struct {
|
|
XID surface_id;
|
|
int surface_type_id;
|
|
XvMCContextPtr context;
|
|
pointer driver_priv;
|
|
} XvMCSurfaceRec, *XvMCSurfacePtr;
|
|
|
|
|
|
typedef struct {
|
|
XID subpicture_id;
|
|
int xvimage_id;
|
|
unsigned short width;
|
|
unsigned short height;
|
|
int num_palette_entries;
|
|
int entry_bytes;
|
|
char component_order[4];
|
|
XvMCContextPtr context;
|
|
pointer driver_priv;
|
|
} XvMCSubpictureRec, *XvMCSubpicturePtr;
|
|
|
|
typedef int (*XvMCCreateContextProcPtr) (
|
|
XvPortPtr port,
|
|
XvMCContextPtr context,
|
|
int *num_priv,
|
|
CARD32 **priv
|
|
);
|
|
|
|
typedef void (*XvMCDestroyContextProcPtr) (
|
|
XvMCContextPtr context
|
|
);
|
|
|
|
typedef int (*XvMCCreateSurfaceProcPtr) (
|
|
XvMCSurfacePtr surface,
|
|
int *num_priv,
|
|
CARD32 **priv
|
|
);
|
|
|
|
typedef void (*XvMCDestroySurfaceProcPtr) (
|
|
XvMCSurfacePtr surface
|
|
);
|
|
|
|
typedef int (*XvMCCreateSubpictureProcPtr) (
|
|
XvMCSubpicturePtr subpicture,
|
|
int *num_priv,
|
|
CARD32 **priv
|
|
);
|
|
|
|
typedef void (*XvMCDestroySubpictureProcPtr) (
|
|
XvMCSubpicturePtr subpicture
|
|
);
|
|
|
|
|
|
typedef struct {
|
|
XvAdaptorPtr xv_adaptor;
|
|
int num_surfaces;
|
|
XvMCSurfaceInfoPtr *surfaces;
|
|
int num_subpictures;
|
|
XvImagePtr *subpictures;
|
|
XvMCCreateContextProcPtr CreateContext;
|
|
XvMCDestroyContextProcPtr DestroyContext;
|
|
XvMCCreateSurfaceProcPtr CreateSurface;
|
|
XvMCDestroySurfaceProcPtr DestroySurface;
|
|
XvMCCreateSubpictureProcPtr CreateSubpicture;
|
|
XvMCDestroySubpictureProcPtr DestroySubpicture;
|
|
} XvMCAdaptorRec, *XvMCAdaptorPtr;
|
|
|
|
#ifndef XorgLoader
|
|
extern _X_EXPORT void XvMCExtensionInit(void);
|
|
|
|
extern _X_EXPORT int XvMCScreenInit(ScreenPtr pScreen,
|
|
int num,
|
|
XvMCAdaptorPtr adapt);
|
|
|
|
extern _X_EXPORT XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id);
|
|
|
|
extern _X_EXPORT int xf86XvMCRegisterDRInfo(ScreenPtr pScreen, char *name,
|
|
char *busID, int major, int minor,
|
|
int patchLevel);
|
|
#endif
|
|
|
|
#endif /* _XVMC_H */
|