diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/evergreen_accel.c | 3 | ||||
| -rw-r--r-- | src/evergreen_exa.c | 3 | ||||
| -rw-r--r-- | src/evergreen_shader.c | 4 | ||||
| -rw-r--r-- | src/evergreen_textured_videofuncs.c | 4 | ||||
| -rw-r--r-- | src/radeon.h | 2 | ||||
| -rw-r--r-- | src/radeon_accel.c | 5 | ||||
| -rw-r--r-- | src/radeon_textured_video.c | 7 | ||||
| -rw-r--r-- | src/radeon_vbo.h | 2 |
9 files changed, 28 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e05722cc..855d99ca 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -132,7 +132,6 @@ EXTRA_DIST = \ r600_state.h \ evergreen_reg.h \ evergreen_reg_auto.h \ - evergreen_reg_r7xx.h \ evergreen_shader.h \ evergreen_state.h \ ati.h \ diff --git a/src/evergreen_accel.c b/src/evergreen_accel.c index 38666eef..92d7fa10 100644 --- a/src/evergreen_accel.c +++ b/src/evergreen_accel.c @@ -27,6 +27,8 @@ #include "config.h" #endif +#ifdef XF86DRM_MODE + #include "xf86.h" #include <errno.h> @@ -1110,3 +1112,4 @@ void evergreen_finish_op(ScrnInfoPtr pScrn, int vtx_size) } +#endif diff --git a/src/evergreen_exa.c b/src/evergreen_exa.c index f9d3b48a..19cc5bd6 100644 --- a/src/evergreen_exa.c +++ b/src/evergreen_exa.c @@ -28,6 +28,8 @@ #include "config.h" #endif +#ifdef XF86DRM_MODE + #include "xf86.h" #include "exa.h" @@ -1945,3 +1947,4 @@ EVERGREENDrawInit(ScreenPtr pScreen) } +#endif diff --git a/src/evergreen_shader.c b/src/evergreen_shader.c index 64e96d89..42cea7ab 100644 --- a/src/evergreen_shader.c +++ b/src/evergreen_shader.c @@ -28,6 +28,8 @@ #include "config.h" #endif +#ifdef XF86DRM_MODE + #include "xf86.h" #include "evergreen_shader.h" @@ -2788,3 +2790,5 @@ int evergreen_comp_ps(RADEONChipFamily ChipSet, uint32_t* shader) return i; } + +#endif diff --git a/src/evergreen_textured_videofuncs.c b/src/evergreen_textured_videofuncs.c index a6746806..428876fc 100644 --- a/src/evergreen_textured_videofuncs.c +++ b/src/evergreen_textured_videofuncs.c @@ -28,6 +28,8 @@ #include "config.h" #endif +#ifdef XF86DRM_MODE + #include "xf86.h" #include "exa.h" @@ -554,3 +556,5 @@ EVERGREENDisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv) DamageDamageRegion(pPriv->pDraw, &pPriv->clip); } + +#endif diff --git a/src/radeon.h b/src/radeon.h index 6d5a282c..21c6d1c5 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -1293,9 +1293,11 @@ extern void RADEONDoPrepareCopyMMIO(ScrnInfoPtr pScrn, Pixel planemask); extern Bool R600DrawInit(ScreenPtr pScreen); extern Bool R600LoadShaders(ScrnInfoPtr pScrn); +#ifdef XF86DRM_MODE extern Bool EVERGREENDrawInit(ScreenPtr pScreen); extern Bool EVERGREENLoadShaders(ScrnInfoPtr pScrn); #endif +#endif #if defined(XF86DRI) && defined(USE_EXA) /* radeon_exa.c */ diff --git a/src/radeon_accel.c b/src/radeon_accel.c index 8fc515d1..1e20e560 100644 --- a/src/radeon_accel.c +++ b/src/radeon_accel.c @@ -1072,10 +1072,13 @@ Bool RADEONAccelInit(ScreenPtr pScreen) if (info->useEXA) { # ifdef XF86DRI if (info->directRenderingEnabled) { +#ifdef XF86DRM_MODE if (info->ChipFamily >= CHIP_FAMILY_CEDAR) { if (!EVERGREENDrawInit(pScreen)) return FALSE; - } else if (info->ChipFamily >= CHIP_FAMILY_R600) { + } else +#endif + if (info->ChipFamily >= CHIP_FAMILY_R600) { if (!R600DrawInit(pScreen)) return FALSE; } else { diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c index f6828111..0d8d2aae 100644 --- a/src/radeon_textured_video.c +++ b/src/radeon_textured_video.c @@ -46,8 +46,10 @@ extern void R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv); +#ifdef XF86DRM_MODE extern void EVERGREENDisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv); +#endif extern Bool R600CopyToVRAM(ScrnInfoPtr pScrn, @@ -475,9 +477,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, #endif #ifdef XF86DRI if (info->directRenderingEnabled) { +#ifdef XF86DRM_MODE if (IS_EVERGREEN_3D) EVERGREENDisplayTexturedVideo(pScrn, pPriv); - else if (IS_R600_3D) + else +#endif + if (IS_R600_3D) R600DisplayTexturedVideo(pScrn, pPriv); else if (IS_R500_3D) R500DisplayTexturedVideoCP(pScrn, pPriv); diff --git a/src/radeon_vbo.h b/src/radeon_vbo.h index 21533c2e..f64930e2 100644 --- a/src/radeon_vbo.h +++ b/src/radeon_vbo.h @@ -24,7 +24,9 @@ radeon_vbo_space(ScrnInfoPtr pScrn, struct radeon_vbo_object *vbo, int vert_size) { +#if defined(XF86DRM_MODE) RADEONInfoPtr info = RADEONPTR(pScrn); +#endif void *vb; /* we've ran out of space in the vertex buffer - need to get a |