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_context.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_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/radeon_context.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/radeon_context.c b/src/mesa/drivers/dri/r300/radeon_context.c index b2cb9cfb5f..a82070c561 100644 --- a/src/mesa/drivers/dri/r300/radeon_context.c +++ b/src/mesa/drivers/dri/r300/radeon_context.c @@ -270,11 +270,13 @@ GLboolean radeonMakeCurrent(__DRIcontextPrivate * driContextPriv, driDrawableInitVBlank(driDrawPriv, radeon->vblank_flags); radeon->dri.drawable = driDrawPriv; - + +#if R200_MERGED if (IS_FAMILY_R200(radeon)) { r200UpdateWindow(radeon->glCtx); r200UpdateViewportOffset(radeon->glCtx); } +#endif } _mesa_make_current2(radeon->glCtx, @@ -290,9 +292,11 @@ GLboolean radeonMakeCurrent(__DRIcontextPrivate * driContextPriv, _mesa_update_state(radeon->glCtx); +#if R200_MERGED if (IS_FAMILY_R200(radeon)) r200ValidateState(radeon->glCtx); - +#endif + } else { if (RADEON_DEBUG & DEBUG_DRI) fprintf(stderr, "%s ctx is null\n", __FUNCTION__); |