diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-08-01 16:51:48 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-01 16:57:40 +1000 |
| commit | c79ce215a01b45fc63b483da167ae37ec7aefad6 (patch) | |
| tree | 23016107c9d591494d86739565433a146812a9c3 /src/radeon_exa.c | |
| parent | 82254b59268140c4102ae3cd713743ae2be15c00 (diff) | |
radeon/r600: restructure exa + vbo to provide more sharing
This is a precursor for r300/500 vbo support.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/radeon_exa.c')
| -rw-r--r-- | src/radeon_exa.c | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/src/radeon_exa.c b/src/radeon_exa.c index d7fba656..7dd792e6 100644 --- a/src/radeon_exa.c +++ b/src/radeon_exa.c @@ -42,6 +42,7 @@ #include "radeon_macros.h" #include "radeon_probe.h" #include "radeon_version.h" +#include "radeon_exa_shared.h" #include "xf86.h" @@ -50,26 +51,6 @@ #define RINFO_FROM_SCREEN(pScr) ScrnInfoPtr pScrn = xf86Screens[pScr->myNum]; \ RADEONInfoPtr info = RADEONPTR(pScrn) -#define RADEON_TRACE_FALL 0 -#define RADEON_TRACE_DRAW 0 - -#if RADEON_TRACE_FALL -#define RADEON_FALLBACK(x) \ -do { \ - ErrorF("%s: ", __FUNCTION__); \ - ErrorF x; \ - return FALSE; \ -} while (0) -#else -#define RADEON_FALLBACK(x) return FALSE -#endif - -#if RADEON_TRACE_DRAW -#define TRACE do { ErrorF("TRACE: %s\n", __FUNCTION__); } while(0) -#else -#define TRACE -#endif - static struct { int rop; int pattern; @@ -121,18 +102,6 @@ static __inline__ uint32_t F_TO_DW(float val) } -#ifdef XF86DRM_MODE - -static inline void radeon_add_pixmap(struct radeon_cs *cs, PixmapPtr pPix, int read_domains, int write_domain) -{ - struct radeon_exa_pixmap_priv *driver_priv = exaGetPixmapDriverPrivate(pPix); - - radeon_cs_space_add_persistent_bo(cs, driver_priv->bo, read_domains, write_domain); -} - -#endif /* XF86DRM_MODE */ - - /* Assumes that depth 15 and 16 can be used as depth 16, which is okay since we * require src and dest datatypes to be equal. */ |