xf86-video-intel: src/xvmc/I810XvMC.c src/xvmc/intel_xvmc.c
Paulo Cesar Pereira de Andrade
pcpa at kemper.freedesktop.org
Fri Nov 28 20:39:10 PST 2008
src/xvmc/I810XvMC.c | 54 +++++++++++++++++++++++++-------------------------
src/xvmc/intel_xvmc.c | 54 +++++++++++++++++++++++++-------------------------
2 files changed, 54 insertions(+), 54 deletions(-)
New commits:
commit 5f347020a52b583e19d333361ea7bf2591255899
Author: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
Date: Sat Nov 29 02:35:59 2008 -0200
Export libIntelXvMC and libI80XvMC symbols.
This is a side effect of adding the visibility flags to XORG_CFLAGS.
diff --git a/src/xvmc/I810XvMC.c b/src/xvmc/I810XvMC.c
index ce5395a..10606de 100644
--- a/src/xvmc/I810XvMC.c
+++ b/src/xvmc/I810XvMC.c
@@ -126,7 +126,7 @@ void i810_free_privContext(i810XvMCContext *pI810XvMC) {
// returned by XvMCListSurfaceTypes.
// Returns: Status
***************************************************************************/
-Status XvMCCreateContext(Display *display, XvPortID port,
+_X_EXPORT Status XvMCCreateContext(Display *display, XvPortID port,
int surface_type_id, int width, int height, int flags,
XvMCContext *context) {
i810XvMCContext *pI810XvMC;
@@ -373,7 +373,7 @@ Status XvMCCreateContext(Display *display, XvPortID port,
//
// Returns: Status
***************************************************************************/
-Status XvMCDestroyContext(Display *display, XvMCContext *context) {
+_X_EXPORT Status XvMCDestroyContext(Display *display, XvMCContext *context) {
i810XvMCContext *pI810XvMC;
if(context == NULL) {
@@ -422,7 +422,7 @@ Status XvMCDestroyContext(Display *display, XvMCContext *context) {
/***************************************************************************
// Function: XvMCCreateSurface
***************************************************************************/
-Status XvMCCreateSurface( Display *display, XvMCContext *context,
+_X_EXPORT Status XvMCCreateSurface( Display *display, XvMCContext *context,
XvMCSurface *surface) {
i810XvMCContext *pI810XvMC;
i810XvMCSurface *pI810Surface;
@@ -589,7 +589,7 @@ Status XvMCCreateSurface( Display *display, XvMCContext *context,
/***************************************************************************
// Function: XvMCDestroySurface
***************************************************************************/
-Status XvMCDestroySurface(Display *display, XvMCSurface *surface) {
+_X_EXPORT Status XvMCDestroySurface(Display *display, XvMCSurface *surface) {
i810XvMCSurface *pI810Surface;
i810XvMCContext *pI810XvMC;
@@ -618,7 +618,7 @@ Status XvMCDestroySurface(Display *display, XvMCSurface *surface) {
/***************************************************************************
// Function: XvMCCreateBlocks
***************************************************************************/
-Status XvMCCreateBlocks(Display *display, XvMCContext *context,
+_X_EXPORT Status XvMCCreateBlocks(Display *display, XvMCContext *context,
unsigned int num_blocks,
XvMCBlockArray *block) {
@@ -642,7 +642,7 @@ Status XvMCCreateBlocks(Display *display, XvMCContext *context,
/***************************************************************************
// Function: XvMCDestroyBlocks
***************************************************************************/
-Status XvMCDestroyBlocks(Display *display, XvMCBlockArray *block) {
+_X_EXPORT Status XvMCDestroyBlocks(Display *display, XvMCBlockArray *block) {
if(display == NULL) {
return BadValue;
}
@@ -657,7 +657,7 @@ Status XvMCDestroyBlocks(Display *display, XvMCBlockArray *block) {
/***************************************************************************
// Function: XvMCCreateMacroBlocks
***************************************************************************/
-Status XvMCCreateMacroBlocks(Display *display, XvMCContext *context,
+_X_EXPORT Status XvMCCreateMacroBlocks(Display *display, XvMCContext *context,
unsigned int num_blocks,
XvMCMacroBlockArray *blocks) {
@@ -682,7 +682,7 @@ Status XvMCCreateMacroBlocks(Display *display, XvMCContext *context,
/***************************************************************************
// Function: XvMCDestroyMacroBlocks
***************************************************************************/
-Status XvMCDestroyMacroBlocks(Display *display, XvMCMacroBlockArray *block) {
+_X_EXPORT Status XvMCDestroyMacroBlocks(Display *display, XvMCMacroBlockArray *block) {
if((display == NULL) || (block == NULL)) {
return BadValue;
}
@@ -2409,7 +2409,7 @@ static __inline__ void renderDualPrimeinFrameDCT0(uint **datay,uint **datau,
// U and V surfaces.
***************************************************************************/
#define UV_QUEUE 14
-Status XvMCRenderSurface(Display *display, XvMCContext *context,
+_X_EXPORT Status XvMCRenderSurface(Display *display, XvMCContext *context,
unsigned int picture_structure,
XvMCSurface *target_surface,
XvMCSurface *past_surface,
@@ -2818,7 +2818,7 @@ Status XvMCRenderSurface(Display *display, XvMCContext *context,
// possible to catch up before we have to check on its progress. This
// makes it unlikely that we have to wait on the last flip.
***************************************************************************/
-Status XvMCPutSurface(Display *display,XvMCSurface *surface,
+_X_EXPORT Status XvMCPutSurface(Display *display,XvMCSurface *surface,
Drawable draw, short srcx, short srcy,
unsigned short srcw, unsigned short srch,
short destx, short desty,
@@ -3258,7 +3258,7 @@ Status XvMCPutSurface(Display *display,XvMCSurface *surface,
// Info:
// Returns: Status
***************************************************************************/
-Status XvMCSyncSurface(Display *display,XvMCSurface *surface) {
+_X_EXPORT Status XvMCSyncSurface(Display *display,XvMCSurface *surface) {
Status ret;
int stat=0;
/*
@@ -3284,7 +3284,7 @@ Status XvMCSyncSurface(Display *display,XvMCSurface *surface) {
// render. There is little gain to be had with 4k buffers.
// Returns: Status
***************************************************************************/
-Status XvMCFlushSurface(Display * display, XvMCSurface *surface) {
+_X_EXPORT Status XvMCFlushSurface(Display * display, XvMCSurface *surface) {
return Success;
}
@@ -3300,7 +3300,7 @@ Status XvMCFlushSurface(Display * display, XvMCSurface *surface) {
// XVMC_DISPLAYING - The surface is currently being displayed or a
// display is pending.
***************************************************************************/
-Status XvMCGetSurfaceStatus(Display *display, XvMCSurface *surface,
+_X_EXPORT Status XvMCGetSurfaceStatus(Display *display, XvMCSurface *surface,
int *stat) {
i810XvMCSurface *privSurface;
i810XvMCContext *pI810XvMC;
@@ -3376,7 +3376,7 @@ Status XvMCGetSurfaceStatus(Display *display, XvMCSurface *surface,
//
// Returns: Status
***************************************************************************/
-Status XvMCHideSurface(Display *display, XvMCSurface *surface) {
+_X_EXPORT Status XvMCHideSurface(Display *display, XvMCSurface *surface) {
i810XvMCSurface *pI810Surface;
i810XvMCContext *pI810XvMC;
int ss, xx;
@@ -3473,7 +3473,7 @@ Status XvMCHideSurface(Display *display, XvMCSurface *surface) {
//
// Returns: Status
***************************************************************************/
-Status XvMCCreateSubpicture(Display *display, XvMCContext *context,
+_X_EXPORT Status XvMCCreateSubpicture(Display *display, XvMCContext *context,
XvMCSubpicture *subpicture,
unsigned short width, unsigned short height,
int xvimage_id) {
@@ -3603,7 +3603,7 @@ Status XvMCCreateSubpicture(Display *display, XvMCContext *context,
//
// Returns: Status
***************************************************************************/
-Status XvMCClearSubpicture(Display *display, XvMCSubpicture *subpicture,
+_X_EXPORT Status XvMCClearSubpicture(Display *display, XvMCSubpicture *subpicture,
short x, short y,
unsigned short width, unsigned short height,
unsigned int color) {
@@ -3658,7 +3658,7 @@ Status XvMCClearSubpicture(Display *display, XvMCSubpicture *subpicture,
//
// Returns: Status
***************************************************************************/
-Status XvMCCompositeSubpicture(Display *display, XvMCSubpicture *subpicture,
+_X_EXPORT Status XvMCCompositeSubpicture(Display *display, XvMCSubpicture *subpicture,
XvImage *image,
short srcx, short srcy,
unsigned short width, unsigned short height,
@@ -3722,7 +3722,7 @@ Status XvMCCompositeSubpicture(Display *display, XvMCSubpicture *subpicture,
//
// Returns: Status
***************************************************************************/
-Status XvMCDestroySubpicture(Display *display, XvMCSubpicture *subpicture) {
+_X_EXPORT Status XvMCDestroySubpicture(Display *display, XvMCSubpicture *subpicture) {
i810XvMCSubpicture *pI810Subpicture;
i810XvMCContext *pI810XvMC;
@@ -3766,7 +3766,7 @@ Status XvMCDestroySubpicture(Display *display, XvMCSubpicture *subpicture) {
// Returns: Status
***************************************************************************/
-Status XvMCSetSubpicturePalette(Display *display, XvMCSubpicture *subpicture,
+_X_EXPORT Status XvMCSetSubpicturePalette(Display *display, XvMCSubpicture *subpicture,
unsigned char *palette) {
i810XvMCSubpicture *privSubpicture;
int i,j;
@@ -3811,7 +3811,7 @@ Status XvMCSetSubpicturePalette(Display *display, XvMCSubpicture *subpicture,
//
// Returns: Status
***************************************************************************/
-Status XvMCBlendSubpicture(Display *display, XvMCSurface *target_surface,
+_X_EXPORT Status XvMCBlendSubpicture(Display *display, XvMCSurface *target_surface,
XvMCSubpicture *subpicture,
short subx, short suby,
unsigned short subw, unsigned short subh,
@@ -3849,7 +3849,7 @@ Status XvMCBlendSubpicture(Display *display, XvMCSurface *target_surface,
//
// Returns: Status
***************************************************************************/
-Status XvMCBlendSubpicture2(Display *display,
+_X_EXPORT Status XvMCBlendSubpicture2(Display *display,
XvMCSurface *source_surface,
XvMCSurface *target_surface,
XvMCSubpicture *subpicture,
@@ -4227,7 +4227,7 @@ Status XvMCBlendSubpicture2(Display *display,
//
// Returns: Status
***************************************************************************/
-Status XvMCSyncSubpicture(Display *display, XvMCSubpicture *subpicture) {
+_X_EXPORT Status XvMCSyncSubpicture(Display *display, XvMCSubpicture *subpicture) {
Status ret;
int stat=0;
do {
@@ -4250,7 +4250,7 @@ Status XvMCSyncSubpicture(Display *display, XvMCSubpicture *subpicture) {
// Returns: Status
// NOTES: i810 always dispatches commands so flush is a no-op
***************************************************************************/
-Status XvMCFlushSubpicture(Display *display, XvMCSubpicture *subpicture) {
+_X_EXPORT Status XvMCFlushSubpicture(Display *display, XvMCSubpicture *subpicture) {
if(display == NULL) {
return BadValue;
}
@@ -4280,7 +4280,7 @@ Status XvMCFlushSubpicture(Display *display, XvMCSubpicture *subpicture) {
// never actually displaying, only a copy of it is displaying. We only
// have to worry about the rendering case.
***************************************************************************/
-Status XvMCGetSubpictureStatus(Display *display, XvMCSubpicture *subpicture,
+_X_EXPORT Status XvMCGetSubpictureStatus(Display *display, XvMCSubpicture *subpicture,
int *stat) {
i810XvMCSubpicture *privSubpicture;
@@ -4341,7 +4341,7 @@ static XvAttribute I810_XVMC_ATTRIBUTES[] = {
// XV_CONTRAST
// XV_SATURATION
***************************************************************************/
-XvAttribute *XvMCQueryAttributes(Display *display, XvMCContext *context,
+_X_EXPORT XvAttribute *XvMCQueryAttributes(Display *display, XvMCContext *context,
int *number) {
i810XvMCContext *pI810XvMC;
XvAttribute *attributes;
@@ -4397,7 +4397,7 @@ XvAttribute *XvMCQueryAttributes(Display *display, XvMCContext *context,
// XV_CONTRAST
// XV_SATURATION
***************************************************************************/
-Status XvMCSetAttribute(Display *display, XvMCContext *context,
+_X_EXPORT Status XvMCSetAttribute(Display *display, XvMCContext *context,
Atom attribute, int value) {
i810XvMCContext *pI810XvMC;
@@ -4468,7 +4468,7 @@ Status XvMCSetAttribute(Display *display, XvMCContext *context,
// XV_CONTRAST
// XV_SATURATION
***************************************************************************/
-Status XvMCGetAttribute(Display *display, XvMCContext *context,
+_X_EXPORT Status XvMCGetAttribute(Display *display, XvMCContext *context,
Atom attribute, int *value) {
i810XvMCContext *pI810XvMC;
diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c
index 9ca6f6c..d18c722 100644
--- a/src/xvmc/intel_xvmc.c
+++ b/src/xvmc/intel_xvmc.c
@@ -264,7 +264,7 @@ intel_xvmc_surface_ptr intel_xvmc_find_surface(XID id)
* returned by XvMCListSurfaceTypes.
* Returns: Status
*/
-Status XvMCCreateContext(Display *display, XvPortID port,
+_X_EXPORT Status XvMCCreateContext(Display *display, XvPortID port,
int surface_type_id, int width, int height,
int flags, XvMCContext *context)
{
@@ -457,7 +457,7 @@ Status XvMCCreateContext(Display *display, XvPortID port,
* context - The context to be destroyed.
*
*/
-Status XvMCDestroyContext(Display *display, XvMCContext *context)
+_X_EXPORT Status XvMCDestroyContext(Display *display, XvMCContext *context)
{
Status ret;
int screen;
@@ -501,7 +501,7 @@ Status XvMCDestroyContext(Display *display, XvMCContext *context)
/*
* Function: XvMCCreateSurface
*/
-Status XvMCCreateSurface(Display *display, XvMCContext *context, XvMCSurface *surface)
+_X_EXPORT Status XvMCCreateSurface(Display *display, XvMCContext *context, XvMCSurface *surface)
{
Status ret;
int priv_count;
@@ -550,7 +550,7 @@ Status XvMCCreateSurface(Display *display, XvMCContext *context, XvMCSurface *su
/*
* Function: XvMCDestroySurface
*/
-Status XvMCDestroySurface(Display *display, XvMCSurface *surface)
+_X_EXPORT Status XvMCDestroySurface(Display *display, XvMCSurface *surface)
{
intel_xvmc_surface_ptr intel_surf;
@@ -576,7 +576,7 @@ Status XvMCDestroySurface(Display *display, XvMCSurface *surface)
/*
* Function: XvMCCreateBlocks
*/
-Status XvMCCreateBlocks(Display *display, XvMCContext *context,
+_X_EXPORT Status XvMCCreateBlocks(Display *display, XvMCContext *context,
unsigned int num_blocks,
XvMCBlockArray *block)
{
@@ -599,7 +599,7 @@ Status XvMCCreateBlocks(Display *display, XvMCContext *context,
/*
* Function: XvMCDestroyBlocks
*/
-Status XvMCDestroyBlocks(Display *display, XvMCBlockArray *block)
+_X_EXPORT Status XvMCDestroyBlocks(Display *display, XvMCBlockArray *block)
{
Status ret;
if (!display || !block)
@@ -619,7 +619,7 @@ Status XvMCDestroyBlocks(Display *display, XvMCBlockArray *block)
/*
* Function: XvMCCreateMacroBlocks
*/
-Status XvMCCreateMacroBlocks(Display *display, XvMCContext *context,
+_X_EXPORT Status XvMCCreateMacroBlocks(Display *display, XvMCContext *context,
unsigned int num_blocks,
XvMCMacroBlockArray *blocks)
{
@@ -642,7 +642,7 @@ Status XvMCCreateMacroBlocks(Display *display, XvMCContext *context,
/*
* Function: XvMCDestroyMacroBlocks
*/
-Status XvMCDestroyMacroBlocks(Display *display, XvMCMacroBlockArray *block)
+_X_EXPORT Status XvMCDestroyMacroBlocks(Display *display, XvMCMacroBlockArray *block)
{
if (!display || !block)
return BadValue;
@@ -664,7 +664,7 @@ Status XvMCDestroyMacroBlocks(Display *display, XvMCMacroBlockArray *block)
* macroblock structures it dispatched the hardware commands to execute
* them.
*/
-Status XvMCRenderSurface(Display *display, XvMCContext *context,
+_X_EXPORT Status XvMCRenderSurface(Display *display, XvMCContext *context,
unsigned int picture_structure,
XvMCSurface *target_surface,
XvMCSurface *past_surface,
@@ -725,7 +725,7 @@ Status XvMCRenderSurface(Display *display, XvMCContext *context,
* XVMC_BOTTOM_FIELD - Display only the Bottom Field of the surface.
* XVMC_FRAME_PICTURE - Display both fields or frame.
*/
-Status XvMCPutSurface(Display *display,XvMCSurface *surface,
+_X_EXPORT Status XvMCPutSurface(Display *display,XvMCSurface *surface,
Drawable draw, short srcx, short srcy,
unsigned short srcw, unsigned short srch,
short destx, short desty,
@@ -780,7 +780,7 @@ Status XvMCPutSurface(Display *display,XvMCSurface *surface,
* display - Connection to the X server
* surface - The surface to synchronize
*/
-Status XvMCSyncSurface(Display *display, XvMCSurface *surface)
+_X_EXPORT Status XvMCSyncSurface(Display *display, XvMCSurface *surface)
{
Status ret;
int stat = 0;
@@ -805,7 +805,7 @@ Status XvMCSyncSurface(Display *display, XvMCSurface *surface)
* surface - Surface to flush
* Returns: Status
*/
-Status XvMCFlushSurface(Display * display, XvMCSurface *surface)
+_X_EXPORT Status XvMCFlushSurface(Display * display, XvMCSurface *surface)
{
if (!display || !surface)
return XvMCBadSurface;
@@ -824,7 +824,7 @@ Status XvMCFlushSurface(Display * display, XvMCSurface *surface)
* XVMC_DISPLAYING - The surface is currently being displayed or a
* display is pending.
*/
-Status XvMCGetSurfaceStatus(Display *display, XvMCSurface *surface, int *stat)
+_X_EXPORT Status XvMCGetSurfaceStatus(Display *display, XvMCSurface *surface, int *stat)
{
Status ret;
@@ -849,7 +849,7 @@ Status XvMCGetSurfaceStatus(Display *display, XvMCSurface *surface, int *stat)
*
* Returns: Status
*/
-Status XvMCHideSurface(Display *display, XvMCSurface *surface)
+_X_EXPORT Status XvMCHideSurface(Display *display, XvMCSurface *surface)
{
int stat = 0;
Status ret;
@@ -888,7 +888,7 @@ Status XvMCHideSurface(Display *display, XvMCSurface *surface)
*
* Returns: Status
*/
-Status XvMCCreateSubpicture(Display *display, XvMCContext *context,
+_X_EXPORT Status XvMCCreateSubpicture(Display *display, XvMCContext *context,
XvMCSubpicture *subpicture,
unsigned short width, unsigned short height,
int xvimage_id)
@@ -909,7 +909,7 @@ Status XvMCCreateSubpicture(Display *display, XvMCContext *context,
*
* Returns: Status
*/
-Status XvMCClearSubpicture(Display *display, XvMCSubpicture *subpicture,
+_X_EXPORT Status XvMCClearSubpicture(Display *display, XvMCSubpicture *subpicture,
short x, short y,
unsigned short width, unsigned short height,
unsigned int color)
@@ -933,7 +933,7 @@ Status XvMCClearSubpicture(Display *display, XvMCSubpicture *subpicture,
*
* Returns: Status
*/
-Status XvMCCompositeSubpicture(Display *display, XvMCSubpicture *subpicture,
+_X_EXPORT Status XvMCCompositeSubpicture(Display *display, XvMCSubpicture *subpicture,
XvImage *image,
short srcx, short srcy,
unsigned short width, unsigned short height,
@@ -953,7 +953,7 @@ Status XvMCCompositeSubpicture(Display *display, XvMCSubpicture *subpicture,
*
* Returns: Status
*/
-Status XvMCDestroySubpicture(Display *display, XvMCSubpicture *subpicture)
+_X_EXPORT Status XvMCDestroySubpicture(Display *display, XvMCSubpicture *subpicture)
{
XVMC_ERR("XvMCDestroySubpicture not implemented!");
return BadValue;
@@ -970,7 +970,7 @@ Status XvMCDestroySubpicture(Display *display, XvMCSubpicture *subpicture)
* is num_palette_entries * entry_bytes in size.
* Returns: Status
*/
-Status XvMCSetSubpicturePalette(Display *display, XvMCSubpicture *subpicture,
+_X_EXPORT Status XvMCSetSubpicturePalette(Display *display, XvMCSubpicture *subpicture,
unsigned char *palette)
{
XVMC_ERR("XvMCSetSubpicturePalette not implemented!");
@@ -1000,7 +1000,7 @@ Status XvMCSetSubpicturePalette(Display *display, XvMCSubpicture *subpicture,
*
* Returns: Status
*/
-Status XvMCBlendSubpicture(Display *display, XvMCSurface *target_surface,
+_X_EXPORT Status XvMCBlendSubpicture(Display *display, XvMCSurface *target_surface,
XvMCSubpicture *subpicture,
short subx, short suby,
unsigned short subw, unsigned short subh,
@@ -1037,7 +1037,7 @@ Status XvMCBlendSubpicture(Display *display, XvMCSurface *target_surface,
*
* Returns: Status
*/
-Status XvMCBlendSubpicture2(Display *display,
+_X_EXPORT Status XvMCBlendSubpicture2(Display *display,
XvMCSurface *source_surface,
XvMCSurface *target_surface,
XvMCSubpicture *subpicture,
@@ -1060,7 +1060,7 @@ Status XvMCBlendSubpicture2(Display *display,
*
* Returns: Status
*/
-Status XvMCSyncSubpicture(Display *display, XvMCSubpicture *subpicture)
+_X_EXPORT Status XvMCSyncSubpicture(Display *display, XvMCSubpicture *subpicture)
{
XVMC_ERR("XvMCSyncSubpicture not implemented!");
return BadValue;
@@ -1077,7 +1077,7 @@ Status XvMCSyncSubpicture(Display *display, XvMCSubpicture *subpicture)
*
* Returns: Status
*/
-Status XvMCFlushSubpicture(Display *display, XvMCSubpicture *subpicture)
+_X_EXPORT Status XvMCFlushSubpicture(Display *display, XvMCSubpicture *subpicture)
{
XVMC_ERR("XvMCFlushSubpicture not implemented!");
return BadValue;
@@ -1097,7 +1097,7 @@ Status XvMCFlushSubpicture(Display *display, XvMCSubpicture *subpicture)
*
* Returns: Status
*/
-Status XvMCGetSubpictureStatus(Display *display, XvMCSubpicture *subpicture,
+_X_EXPORT Status XvMCGetSubpictureStatus(Display *display, XvMCSubpicture *subpicture,
int *stat)
{
XVMC_ERR("XvMCGetSubpictureStatus not implemented!");
@@ -1118,7 +1118,7 @@ Status XvMCGetSubpictureStatus(Display *display, XvMCSubpicture *subpicture,
* Returns:
* An array of XvAttributes.
*/
-XvAttribute *XvMCQueryAttributes(Display *display, XvMCContext *context,
+_X_EXPORT XvAttribute *XvMCQueryAttributes(Display *display, XvMCContext *context,
int *number)
{
/* now XvMC has no extra attribs than Xv */
@@ -1139,7 +1139,7 @@ XvAttribute *XvMCQueryAttributes(Display *display, XvMCContext *context,
* Returns:
* Status
*/
-Status XvMCSetAttribute(Display *display, XvMCContext *context,
+_X_EXPORT Status XvMCSetAttribute(Display *display, XvMCContext *context,
Atom attribute, int value)
{
return Success;
@@ -1159,7 +1159,7 @@ Status XvMCSetAttribute(Display *display, XvMCContext *context,
* Returns:
* Status
*/
-Status XvMCGetAttribute(Display *display, XvMCContext *context,
+_X_EXPORT Status XvMCGetAttribute(Display *display, XvMCContext *context,
Atom attribute, int *value)
{
return Success;
More information about the xorg-commit
mailing list