diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2008-08-25 08:47:59 -0400 |
---|---|---|
committer | Alex Deucher <alexdeucher@gmail.com> | 2008-08-25 08:47:59 -0400 |
commit | 2145309230e36aee7758bd244deb1e72ada0c065 (patch) | |
tree | adccb4cb378c622d84dadcd16a67b0852d572128 /src/radeon_textured_video.c | |
parent | 01daef0f095fbbaee701d5fe97f3dd7838b5f915 (diff) |
match textured video macro names with other accel code
OUT_VIDEO_REG() -> OUT_ACCEL_REG()
etc.
Diffstat (limited to 'src/radeon_textured_video.c')
-rw-r--r-- | src/radeon_textured_video.c | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c index da1d60f4..9e6b37a8 100644 --- a/src/radeon_textured_video.c +++ b/src/radeon_textured_video.c @@ -81,35 +81,43 @@ static __inline__ uint32_t F_TO_DW(float val) } #define ACCEL_MMIO -#define VIDEO_PREAMBLE() unsigned char *RADEONMMIO = info->MMIO -#define BEGIN_VIDEO(n) RADEONWaitForFifo(pScrn, (n)) -#define OUT_VIDEO_REG(reg, val) OUTREG(reg, val) -#define OUT_VIDEO_REG_F(reg, val) OUTREG(reg, F_TO_DW(val)) -#define FINISH_VIDEO() +#define ACCEL_PREAMBLE() unsigned char *RADEONMMIO = info->MMIO +#define BEGIN_ACCEL(n) RADEONWaitForFifo(pScrn, (n)) +#define OUT_ACCEL_REG(reg, val) OUTREG(reg, val) +#define OUT_ACCEL_REG_F(reg, val) OUTREG(reg, F_TO_DW(val)) +#define FINISH_ACCEL() #include "radeon_textured_videofuncs.c" #undef ACCEL_MMIO -#undef VIDEO_PREAMBLE -#undef BEGIN_VIDEO -#undef OUT_VIDEO_REG -#undef OUT_VIDEO_REG_F -#undef FINISH_VIDEO +#undef ACCEL_PREAMBLE +#undef BEGIN_ACCEL +#undef OUT_ACCEL_REG +#undef OUT_ACCEL_REG_F +#undef FINISH_ACCEL #ifdef XF86DRI #define ACCEL_CP -#define VIDEO_PREAMBLE() \ +#define ACCEL_PREAMBLE() \ RING_LOCALS; \ RADEONCP_REFRESH(pScrn, info) -#define BEGIN_VIDEO(n) BEGIN_RING(2*(n)) -#define OUT_VIDEO_REG(reg, val) OUT_RING_REG(reg, val) -#define OUT_VIDEO_REG_F(reg, val) OUT_VIDEO_REG(reg, F_TO_DW(val)) -#define FINISH_VIDEO() ADVANCE_RING() -#define OUT_VIDEO_RING_F(x) OUT_RING(F_TO_DW(x)) +#define BEGIN_ACCEL(n) BEGIN_RING(2*(n)) +#define OUT_ACCEL_REG(reg, val) OUT_RING_REG(reg, val) +#define OUT_ACCEL_REG_F(reg, val) OUT_ACCEL_REG(reg, F_TO_DW(val)) +#define FINISH_ACCEL() ADVANCE_RING() +#define OUT_RING_F(x) OUT_RING(F_TO_DW(x)) #include "radeon_textured_videofuncs.c" +#undef ACCEL_CP +#undef ACCEL_PREAMBLE +#undef BEGIN_ACCEL +#undef OUT_ACCEL_REG +#undef OUT_ACCEL_REG_F +#undef FINISH_ACCEL +#undef OUT_RING_F + #endif /* XF86DRI */ static int |