Update to Mesa 7.0.2. Tested by naddy@ (full ports build), simon@

and oga@ (with dri enabled).

1 files changed, 4 insertions, 9 deletions

diff --git a/dist/Mesa/src/mesa/main/framebuffer.c b/dist/Mesa/src/mesa/main/framebuffer.c
index 1fd31a532..8aeb36950 100644
--- a/dist/Mesa/src/mesa/main/framebuffer.c
+++ b/dist/Mesa/src/mesa/main/framebuffer.c
@@ -38,6 +38,7 @@
 #include "fbobject.h"
 #include "framebuffer.h"
 #include "renderbuffer.h"
+#include "texobj.h"
 
 
 
@@ -190,17 +191,11 @@ _mesa_free_framebuffer_data(struct gl_framebuffer *fb)
          _mesa_reference_renderbuffer(&att->Renderbuffer, NULL);
       }
       if (att->Texture) {
-         /* render to texture */
-         att->Texture->RefCount--;
-         if (att->Texture->RefCount == 0) {
-            GET_CURRENT_CONTEXT(ctx);
-            if (ctx) {
-               ctx->Driver.DeleteTexture(ctx, att->Texture);
-            }
-         }
+         _mesa_reference_texobj(&att->Texture, NULL);
       }
+      ASSERT(!att->Renderbuffer);
+      ASSERT(!att->Texture);
       att->Type = GL_NONE;
-      att->Texture = NULL;
    }
 
    /* unbind _Depth/_StencilBuffer to decr ref counts */