mesa: Branch 'master'

[Sean D'Epagnier]

 src/mesa/drivers/fbdev/glfbdev.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+)

New commits:
diff-tree 47ad443c55cf07b32bac04b97066cfd3c2aa3554 (from 3db3dc58bcc361637d7473ee4b7c4e3b036c283c)
Author: Sean D'Epagnier <sean at depagnier.com>
Date:   Mon Apr 23 21:17:30 2007 -0700

    Added proper cleanup code

diff --git a/src/mesa/drivers/fbdev/glfbdev.c b/src/mesa/drivers/fbdev/glfbdev.c
index 0ece386..6c6511b 100644
--- a/src/mesa/drivers/fbdev/glfbdev.c
+++ b/src/mesa/drivers/fbdev/glfbdev.c
@@ -682,9 +682,16 @@ glFBDevDestroyBuffer( GLFBDevBufferPtr b
       if (buffer == curDraw || buffer == curRead) {
          glFBDevMakeCurrent( NULL, NULL, NULL);
       }
+#if 0
       /* free the software depth, stencil, accum buffers */
       _mesa_free_framebuffer_data(&buffer->glframebuffer);
       _mesa_free(buffer);
+#else
+      {
+         struct gl_framebuffer *fb = &buffer->glframebuffer;
+         _mesa_unreference_framebuffer(&fb);
+      }
+#endif
    }
 }
 
@@ -799,6 +806,13 @@ glFBDevDestroyContext( GLFBDevContextPtr
    GLFBDevContextPtr fbdevctx = glFBDevGetCurrentContext();
 
    if (context) {
+      GLcontext *mesaCtx = &context->glcontext;
+
+      _swsetup_DestroyContext( mesaCtx );
+      _swrast_DestroyContext( mesaCtx );
+      _tnl_DestroyContext( mesaCtx );
+      _vbo_DestroyContext( mesaCtx );
+
       if (fbdevctx == context) {
          /* destroying current context */
          _mesa_make_current(NULL, NULL, NULL);