diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_common_context.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c index bb0168e6cd9..ceaefdad91c 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c @@ -38,6 +38,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "drivers/common/meta.h" #include "main/context.h" #include "main/framebuffer.h" +#include "main/fbobject.h" #include "main/renderbuffer.h" #include "main/state.h" #include "main/simple_list.h" @@ -564,8 +565,22 @@ GLboolean radeonMakeCurrent(__DRIcontext * driContextPriv, __DRIdrawable * driReadPriv) { radeonContextPtr radeon; + GET_CURRENT_CONTEXT(curCtx); struct gl_framebuffer *drfb, *readfb; + if (driContextPriv) + radeon = (radeonContextPtr)driContextPriv->driverPrivate; + else + radeon = NULL; + /* According to the glXMakeCurrent() man page: "Pending commands to + * the previous context, if any, are flushed before it is released." + * But only flush if we're actually changing contexts. + */ + + if ((radeonContextPtr)curCtx && (radeonContextPtr)curCtx != radeon) { + _mesa_flush(curCtx); + } + if (!driContextPriv) { if (RADEON_DEBUG & RADEON_DRI) fprintf(stderr, "%s ctx is null\n", __FUNCTION__); @@ -573,8 +588,6 @@ GLboolean radeonMakeCurrent(__DRIcontext * driContextPriv, return GL_TRUE; } - radeon = (radeonContextPtr) driContextPriv->driverPrivate; - if(driDrawPriv == NULL && driReadPriv == NULL) { drfb = _mesa_create_framebuffer(&radeon->glCtx->Visual); readfb = drfb; |