diff options
| author | Dave Airlie <airlied@gmail.com> | 2012-07-16 18:48:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2012-07-16 18:48:32 +1000 |
| commit | e5e3e733d933fc3accdd6c3c7a02df5950530cae (patch) | |
| tree | b681c75b4536050a4165ed4f129db8ec8d21f14e /src/riva_dga.c | |
| parent | 713e9501b87465cf2a62c27605b6fc4a454dad95 (diff) | |
nv: make XAA optional.
This allows nv to build without XAA.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/riva_dga.c')
| -rw-r--r-- | src/riva_dga.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/riva_dga.c b/src/riva_dga.c index 8dc8c72..cbad39f 100644 --- a/src/riva_dga.c +++ b/src/riva_dga.c @@ -6,19 +6,22 @@ #include "riva_include.h" #include "riva_type.h" #include "riva_proto.h" +#ifdef HAVE_XAA_H #include "xaalocal.h" +#endif #include "dgaproc.h" - static Bool Riva_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, int *, int *, int *); static Bool Riva_SetMode(ScrnInfoPtr, DGAModePtr); static int Riva_GetViewport(ScrnInfoPtr); static void Riva_SetViewport(ScrnInfoPtr, int, int, int); +#ifdef HAVE_XAA_H static void Riva_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long); static void Riva_BlitRect(ScrnInfoPtr, int, int, int, int, int, int); static void Riva_BlitTransRect(ScrnInfoPtr, int, int, int, int, int, int, unsigned long); +#endif static DGAFunctionRec Riva_DGAFuncs = { @@ -28,9 +31,13 @@ DGAFunctionRec Riva_DGAFuncs = { Riva_SetViewport, Riva_GetViewport, RivaSync, +#ifdef HAVE_XAA_H Riva_FillRect, Riva_BlitRect, Riva_BlitTransRect +#else + NULL, NULL, NULL +#endif }; @@ -80,8 +87,10 @@ SECOND_PASS: if(pixmap) mode->flags |= DGA_PIXMAP_AVAILABLE; +#ifdef HAVE_XAA_H if(!pRiva->NoAccel) mode->flags |= DGA_FILL_RECT | DGA_BLIT_RECT; +#endif if(pMode->Flags & V_DBLSCAN) mode->flags |= DGA_DOUBLESCAN; if(pMode->Flags & V_INTERLACE) @@ -235,6 +244,7 @@ Riva_SetViewport( pRiva->DGAViewportStatus = 0; } +#ifdef HAVE_XAA_H static void Riva_FillRect ( ScrnInfoPtr pScrn, @@ -284,7 +294,7 @@ Riva_BlitTransRect( ){ /* not implemented... yet */ } - +#endif static Bool Riva_OpenFramebuffer( |