Mesa (master): osmesa: remove old renderbuffer before adding new

[Brian Paul]

Module: Mesa
Branch: master
Commit: 91c37599f621a0ec498c0f0add14f16470ca852b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=91c37599f621a0ec498c0f0add14f16470ca852b

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Jul  2 18:18:15 2010 -0600

osmesa: remove old renderbuffer before adding new

Fixes fd.o bug 10966 when OSMesaMakeCurrent() was called twice.

NOTE: This is a candidate for the 7.8 branch.

---

 src/mesa/drivers/osmesa/osmesa.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index ead4050..93d0e85 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -1328,6 +1328,7 @@ OSMesaMakeCurrent( OSMesaContext osmesa, void *buffer, GLenum type,
     * size.
     */
    osmesa->rb = new_osmesa_renderbuffer(&osmesa->mesa, osmesa->format, type);
+   _mesa_remove_renderbuffer(osmesa->gl_buffer, BUFFER_FRONT_LEFT);
    _mesa_add_renderbuffer(osmesa->gl_buffer, BUFFER_FRONT_LEFT, osmesa->rb);
    assert(osmesa->rb->RefCount == 2);