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_ioctl.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_ioctl.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/radeon_ioctl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r300/radeon_ioctl.c b/src/mesa/drivers/dri/r300/radeon_ioctl.c index f75b755184..f79f32d4a6 100644 --- a/src/mesa/drivers/dri/r300/radeon_ioctl.c +++ b/src/mesa/drivers/dri/r300/radeon_ioctl.c @@ -40,7 +40,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "macros.h" #include "context.h" #include "swrast/swrast.h" - #include "r200_context.h" #include "r300_context.h" #include "r200_state.h" @@ -329,8 +328,10 @@ void radeonFlush(GLcontext * ctx) if (IS_FAMILY_R300(radeon)) r300Flush(ctx); +#if R200_MERGED else r200Flush(ctx); +#endif } |