diff options
| author | Aapo Tahkola <aet@rasterburn.org> | 2005-04-24 09:08:31 +0000 |
|---|---|---|
| committer | Aapo Tahkola <aet@rasterburn.org> | 2005-04-24 09:08:31 +0000 |
| commit | 6ffd0a4cf1aae2b5ea0fd683a2d7607e59cd3f68 (patch) | |
| tree | 39fa877aeee98f7e14598c67269c39a7293761a3 /src/mesa/drivers/dri/r300/radeon_screen.c | |
| parent | 5c906924ed6ee664ba61764dd21bee36dce06d02 (diff) | |
Modifying to build against current Mesa. Disabled r200*.c files since they didnt want to build anymore.
Diffstat (limited to 'src/mesa/drivers/dri/r300/radeon_screen.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/radeon_screen.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/r300/radeon_screen.c b/src/mesa/drivers/dri/r300/radeon_screen.c index f7d7a2f04e..436fa76c46 100644 --- a/src/mesa/drivers/dri/r300/radeon_screen.c +++ b/src/mesa/drivers/dri/r300/radeon_screen.c @@ -591,6 +591,7 @@ static radeonScreenPtr radeonCreateScreen(__DRIscreenPrivate * sPriv) (*glx_enable_extension) (psc, "GLX_MESA_swap_frame_usage"); +#if R200_MERGED if (driCompareGLXAPIVersion(20030818) >= 0) { sPriv->psc->allocateMemory = (void *)r200AllocateMemoryMESA; @@ -602,6 +603,7 @@ static radeonScreenPtr radeonCreateScreen(__DRIscreenPrivate * sPriv) (*glx_enable_extension) (psc, "GLX_MESA_allocate_memory"); } +#endif if (driCompareGLXAPIVersion(20030915) >= 0) { (*glx_enable_extension) (psc, @@ -696,8 +698,10 @@ static GLboolean radeonCreateContext(const __GLcontextModes * glVisual, if (chip >= RADEON_CHIP_R300) return r300CreateContext(glVisual, driContextPriv, sharedContextPriv); +#if R200_MERGED else return r200CreateContext(glVisual, driContextPriv, sharedContextPriv); +#endif } @@ -711,8 +715,10 @@ static void radeonDestroyContext(__DRIcontextPrivate * driContextPriv) if (chip >= RADEON_CHIP_R300) return r300DestroyContext(driContextPriv); +#if R200_MERGED else return r200DestroyContext(driContextPriv); +#endif } |