util: reference surfaces and sampler views in blitter when saving them

Ooops. This should possibly fix some bugs...

2 files changed, 3 insertions, 23 deletions

diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c
index df2874d5bf..59129bc24d 100644
--- a/src/gallium/drivers/r300/r300_context.c
+++ b/src/gallium/drivers/r300/r300_context.c
@@ -46,10 +46,7 @@ static void r300_release_referenced_objects(struct r300_context *r300)
     unsigned i;
 
     /* Framebuffer state. */
-    for (i = 0; i < fb->nr_cbufs; i++) {
-        pipe_surface_reference(&fb->cbufs[i], NULL);
-    }
-    pipe_surface_reference(&fb->zsbuf, NULL);
+    util_assign_framebuffer_state(fb, NULL);
 
     /* Textures. */
     for (i = 0; i < textures->sampler_view_count; i++)
diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c
index 15de533778..93cc0dbe98 100644
--- a/src/gallium/drivers/r300/r300_state.c
+++ b/src/gallium/drivers/r300/r300_state.c
@@ -23,6 +23,7 @@
 
 #include "draw/draw_context.h"
 
+#include "util/u_blitter.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
 #include "util/u_pack_color.h"
@@ -659,24 +660,6 @@ static void r300_print_fb_surf_info(struct pipe_surface *surf, unsigned index,
             tex->last_level, util_format_short_name(tex->format));
 }
 
-static void copy_framebuffer_state(struct pipe_framebuffer_state *dst,
-                                   const struct pipe_framebuffer_state *src)
-{
-    unsigned i;
-
-    for (i = 0; i < src->nr_cbufs; i++) {
-        pipe_surface_reference(&dst->cbufs[i], src->cbufs[i]);
-    }
-    for (; i < dst->nr_cbufs; i++) {
-        pipe_surface_reference(&dst->cbufs[i], NULL);
-    }
-    pipe_surface_reference(&dst->zsbuf, src->zsbuf);
-
-    dst->nr_cbufs = src->nr_cbufs;
-    dst->width = src->width;
-    dst->height = src->height;
-}
-
 static void
     r300_set_framebuffer_state(struct pipe_context* pipe,
                                const struct pipe_framebuffer_state* state)
@@ -723,7 +706,7 @@ static void
     /* The tiling flags are dependent on the surface miplevel, unfortunately. */
     r300_fb_set_tiling_flags(r300, r300->fb_state.state, state);
 
-    copy_framebuffer_state(r300->fb_state.state, state);
+    util_assign_framebuffer_state(r300->fb_state.state, state);
 
     r300->fb_state.size =
             2 +