diff options
| author | Roland Scheidegger <sroland@tungstengraphics.com> | 2007-05-12 11:20:24 +0200 |
|---|---|---|
| committer | Roland Scheidegger <sroland@tungstengraphics.com> | 2007-05-12 11:20:24 +0200 |
| commit | b78aec576735c663342da8367dccd3de71e70c34 (patch) | |
| tree | b02e1f72f571a88aa97d5c221a9e35205a0196d7 | |
| parent | 6bae7d40f725be24df0be196fbb6bdcfd2aaa581 (diff) | |
| download | external_mesa3d-b78aec576735c663342da8367dccd3de71e70c34.zip external_mesa3d-b78aec576735c663342da8367dccd3de71e70c34.tar.gz external_mesa3d-b78aec576735c663342da8367dccd3de71e70c34.tar.bz2 | |
bring over recent radeonMakeCurrent fixes for r300 to radeon/r200
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_context.c | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_context.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index 0507eb8..786a298 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -679,7 +679,6 @@ r200MakeCurrent( __DRIcontextPrivate *driContextPriv, newCtx->dri.drawable = driDrawPriv; r200SetCliprects(newCtx); - r200UpdateWindow( newCtx->glCtx ); r200UpdateViewportOffset( newCtx->glCtx ); } diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index d7c2d14..9451ec4 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -604,7 +604,6 @@ radeonMakeCurrent( __DRIcontextPrivate *driContextPriv, newCtx->dri.drawable = driDrawPriv; radeonSetCliprects(newCtx); - radeonUpdateWindow( newCtx->glCtx ); radeonUpdateViewportOffset( newCtx->glCtx ); } @@ -612,6 +611,7 @@ radeonMakeCurrent( __DRIcontextPrivate *driContextPriv, (GLframebuffer *) driDrawPriv->driverPrivate, (GLframebuffer *) driReadPriv->driverPrivate ); + _mesa_update_state( newCtx->glCtx ); } else { if (RADEON_DEBUG & DEBUG_DRI) fprintf(stderr, "%s ctx is null\n", __FUNCTION__); |