diff options
author | Matthias Hopf <mhopf@suse.de> | 2009-12-08 16:59:07 +0100 |
---|---|---|
committer | Matthias Hopf <mhopf@suse.de> | 2009-12-08 16:59:07 +0100 |
commit | edeb1e7a9c53beb06a0acb3481a77adda1ed68e8 (patch) | |
tree | 7ded6b0dcd069bd3b13c822a9fb944f18eea345d | |
parent | 98d1d5f68f5be3f9dc3cd4b483ca4bea708e1eb8 (diff) |
Fix build for w/o USE_DRI.
-rw-r--r-- | src/radeon_3d.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/radeon_3d.c b/src/radeon_3d.c index b3052e7..9602c99 100644 --- a/src/radeon_3d.c +++ b/src/radeon_3d.c @@ -128,20 +128,20 @@ R5xxPVSFPUCount(ScrnInfoPtr pScrn) /* * Map the macros. */ +#ifdef USE_DRI #define ACCEL_PREAMBLE() struct RhdCS *CS = rhdPtr->CS; \ if (pScrn->pScreen) \ RHDDRIContextClaim(pScrn) +#else +#define ACCEL_PREAMBLE() struct RhdCS *CS = rhdPtr->CS +#endif #define BEGIN_ACCEL(Count) RHDCSGrab(CS, 2 * (Count)) #define OUT_ACCEL_REG(Reg, Value) RHDCSRegWrite(CS, (Reg), (Value)) #define FINISH_ACCEL() -#ifdef USE_DRI -#define END_ACCEL() RHDCSAdvance(CS); -#else #define END_ACCEL() RHDCSAdvance(CS) -#endif #define uint32_t CARD32 @@ -213,8 +213,9 @@ R5xx3DSetup(int scrnIndex) accel_state->texW[1] = 1; accel_state->texH[1] = 1; +#ifdef USE_DRI RHDDRIContextClaim(pScrn); - +#endif #ifdef IS_RADEON_DRIVER if (IS_R300_3D || IS_R500_3D) { |