diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2007-09-11 10:56:35 -0600 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2007-09-11 10:59:59 -0600 |
| commit | a614877592e8526d997242ce336fb455dd3f5bdb (patch) | |
| tree | 1bfbf666eb80bec97eef5233998e58732a14f149 /src | |
| parent | 995e01a6bcfe280149a2a076b5ea66ee94d0721c (diff) | |
In _mesa_make_current(), don't unbind FBOs from the old context.
This fixes the X server crash reported by KeithP on Aug 29.
The old context's FBOs will be unreferenced during context destruction so
there's no memleak with this change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/context.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index d988ef2d21..08db12b1b6 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1499,8 +1499,6 @@ void _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer, GLframebuffer *readBuffer ) { - GET_CURRENT_CONTEXT(oldCtx); - if (MESA_VERBOSE & VERBOSE_API) _mesa_debug(newCtx, "_mesa_make_current()\n"); @@ -1525,13 +1523,6 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer, _glapi_set_context((void *) newCtx); ASSERT(_mesa_get_current_context() == newCtx); - if (oldCtx) { - _mesa_unreference_framebuffer(&oldCtx->WinSysDrawBuffer); - _mesa_unreference_framebuffer(&oldCtx->WinSysReadBuffer); - _mesa_unreference_framebuffer(&oldCtx->DrawBuffer); - _mesa_unreference_framebuffer(&oldCtx->ReadBuffer); - } - if (!newCtx) { _glapi_set_dispatch(NULL); /* none current */ } |