diff options
| author | Thomas Hellstrom <unichrome@shipmail.org> | 2005-06-16 21:32:21 +0000 |
|---|---|---|
| committer | Thomas Hellstrom <unichrome@shipmail.org> | 2005-06-16 21:32:21 +0000 |
| commit | 0662a696706ae52a2f7b2e7256f5d91d163630bb (patch) | |
| tree | 52db00eeea29c81aac967a16e541d03ca3401986 | |
| parent | a9c7245ea5bdd5e77070eeef0ed91de6d3127b2e (diff) | |
Fix and enable Unichrome XvMC for AMD64.XORG-6_8_99_12
| -rw-r--r-- | src/via_xvmc.c | 22 | ||||
| -rw-r--r-- | src/via_xvmc.h | 2 |
2 files changed, 9 insertions, 15 deletions
diff --git a/src/via_xvmc.c b/src/via_xvmc.c index e1e3f20..f46885d 100644 --- a/src/via_xvmc.c +++ b/src/via_xvmc.c @@ -102,13 +102,13 @@ typedef struct{ static int ViaXvMCCreateContext (ScrnInfoPtr pScrn, XvMCContextPtr pContext, - int *num_priv, long **priv ); + int *num_priv, INT32 **priv ); static void ViaXvMCDestroyContext (ScrnInfoPtr pScrn, XvMCContextPtr pContext); static int ViaXvMCCreateSurface (ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf, - int *num_priv, long **priv ); + int *num_priv, INT32 **priv ); static void ViaXvMCDestroySurface (ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf); static int ViaXvMCCreateSubpicture (ScrnInfoPtr pScrn, XvMCSubpicturePtr pSurf, - int *num_priv, long **priv ); + int *num_priv, INT32 **priv ); static void ViaXvMCDestroySubpicture (ScrnInfoPtr pScrn, XvMCSubpicturePtr pSubp); static int viaXvMCInterceptXvAttribute(ScrnInfoPtr pScrn, Atom attribute, INT32 value,pointer data); @@ -335,12 +335,6 @@ ViaInitXVMC(ScreenPtr pScreen) return; } - if (sizeof(unsigned long) == 8) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "[XvMC] XvMC libs are not 64 bit clean. Disabling XvMC.\n"); - return; - } - if (!pVia->directRenderingEnabled) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "[XvMC] Cannot use XvMC without DRI!\n"); @@ -446,7 +440,7 @@ void ViaCleanupXVMC(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr *XvAdaptors, static int ViaXvMCCreateContext (ScrnInfoPtr pScrn, XvMCContextPtr pContext, - int *num_priv, long **priv ) + int *num_priv, INT32 **priv ) { VIAPtr pVia = VIAPTR(pScrn); ViaXvMCPtr vXvMC = &(pVia->xvmc); @@ -545,7 +539,7 @@ ViaXvMCCreateContext (ScrnInfoPtr pScrn, XvMCContextPtr pContext, static int ViaXvMCCreateSurface (ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf, - int *num_priv, long **priv ) + int *num_priv, INT32 **priv ) { VIAPtr pVia = VIAPTR(pScrn); ViaXvMCPtr vXvMC = &(pVia->xvmc); @@ -594,7 +588,7 @@ ViaXvMCCreateSurface (ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf, #endif *num_priv = numBuffers + 2; - *priv = (long *)xcalloc(*num_priv,sizeof(long)); + *priv = (INT32 *)xcalloc(*num_priv,sizeof(INT32)); if(!*priv) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, @@ -642,7 +636,7 @@ ViaXvMCCreateSurface (ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf, static int ViaXvMCCreateSubpicture (ScrnInfoPtr pScrn, XvMCSubpicturePtr pSubp, - int *num_priv, long **priv ) + int *num_priv, INT32 **priv ) { VIAPtr pVia = VIAPTR(pScrn); ViaXvMCPtr vXvMC = &(pVia->xvmc); @@ -666,7 +660,7 @@ ViaXvMCCreateSubpicture (ScrnInfoPtr pScrn, XvMCSubpicturePtr pSubp, return BadAlloc; } - *priv = (long *)xcalloc(3,sizeof(long)); + *priv = (INT32 *)xcalloc(3,sizeof(INT32)); if(!*priv) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, diff --git a/src/via_xvmc.h b/src/via_xvmc.h index 6a475dc..458fa63 100644 --- a/src/via_xvmc.h +++ b/src/via_xvmc.h @@ -53,7 +53,7 @@ typedef drm_via_sarea_t ViaXvMCSAreaPriv; typedef struct{ - Atom attribute; + INT32 attribute; INT32 value; }ViaAttrPair; |