diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-03-16 18:05:25 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-03-16 18:05:25 +0000 |
| commit | c6c0f947142c0cc82626c238804a68b4e8f53945 (patch) | |
| tree | d81219dacaad6ce3e3d80f298662288c79c6a7e2 /src/mesa/drivers/osmesa/osmesa.c | |
| parent | ef8653a83800bc4b8e116e03ad52604097224378 (diff) | |
Moved _glapi_check_multithread() call into drivers, instead of in
_mesa_make_current().
This removes an ugly #if !defined(IN_DRI_DRIVER) from core Mesa.
Diffstat (limited to 'src/mesa/drivers/osmesa/osmesa.c')
| -rw-r--r-- | src/mesa/drivers/osmesa/osmesa.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c index f4ab09c51a..c628d53391 100644 --- a/src/mesa/drivers/osmesa/osmesa.c +++ b/src/mesa/drivers/osmesa/osmesa.c @@ -2,7 +2,7 @@ * Mesa 3-D graphics library * Version: 6.5 * - * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -1051,6 +1051,12 @@ OSMesaMakeCurrent( OSMesaContext ctx, void *buffer, GLenum type, ctx->height = height; osmesa_update_state( &ctx->mesa, 0 ); + + /* Call this periodically to detect when the user has begun using + * GL rendering from multiple threads. + */ + _glapi_check_multithread(); + _mesa_make_current( &ctx->mesa, ctx->gl_buffer, ctx->gl_buffer ); if (ctx->userRowLength) |