Mesa (master): nv50, nvc0: hold references to the framebuffer surfaces
Christoph Bumiller
chrisbmr at kemper.freedesktop.org
Fri Apr 13 22:16:05 UTC 2012
Module: Mesa
Branch: master
Commit: 2d06ee8bf784d98a822617db5366f56b9bb5d3a2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2d06ee8bf784d98a822617db5366f56b9bb5d3a2
Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date: Wed Mar 7 19:44:10 2012 +0100
nv50,nvc0: hold references to the framebuffer surfaces
---
src/gallium/drivers/nv50/nv50_context.c | 3 +++
src/gallium/drivers/nv50/nv50_state.c | 14 +++++++++++++-
src/gallium/drivers/nvc0/nvc0_context.c | 3 +++
src/gallium/drivers/nvc0/nvc0_state.c | 14 +++++++++++++-
4 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c
index 98f8c4d..96ada55 100644
--- a/src/gallium/drivers/nv50/nv50_context.c
+++ b/src/gallium/drivers/nv50/nv50_context.c
@@ -22,6 +22,7 @@
#include "draw/draw_context.h"
#include "pipe/p_defines.h"
+#include "util/u_framebuffer.h"
#include "nv50_context.h"
#include "nv50_screen.h"
@@ -71,6 +72,8 @@ nv50_context_unreference_resources(struct nv50_context *nv50)
nouveau_bufctx_del(&nv50->bufctx_3d);
nouveau_bufctx_del(&nv50->bufctx);
+ util_unreference_framebuffer_state(&nv50->framebuffer);
+
for (i = 0; i < nv50->num_vtxbufs; ++i)
pipe_resource_reference(&nv50->vtxbuf[i].buffer, NULL);
diff --git a/src/gallium/drivers/nv50/nv50_state.c b/src/gallium/drivers/nv50/nv50_state.c
index e1e1af0..bf55442 100644
--- a/src/gallium/drivers/nv50/nv50_state.c
+++ b/src/gallium/drivers/nv50/nv50_state.c
@@ -803,10 +803,22 @@ nv50_set_framebuffer_state(struct pipe_context *pipe,
const struct pipe_framebuffer_state *fb)
{
struct nv50_context *nv50 = nv50_context(pipe);
+ unsigned i;
nouveau_bufctx_reset(nv50->bufctx_3d, NV50_BIND_FB);
- nv50->framebuffer = *fb;
+ for (i = 0; i < fb->nr_cbufs; ++i)
+ pipe_surface_reference(&nv50->framebuffer.cbufs[i], fb->cbufs[i]);
+ for (; i < nv50->framebuffer.nr_cbufs; ++i)
+ pipe_surface_reference(&nv50->framebuffer.cbufs[i], NULL);
+
+ nv50->framebuffer.nr_cbufs = fb->nr_cbufs;
+
+ nv50->framebuffer.width = fb->width;
+ nv50->framebuffer.height = fb->height;
+
+ pipe_surface_reference(&nv50->framebuffer.zsbuf, fb->zsbuf);
+
nv50->dirty |= NV50_NEW_FRAMEBUFFER;
}
diff --git a/src/gallium/drivers/nvc0/nvc0_context.c b/src/gallium/drivers/nvc0/nvc0_context.c
index dcdc830..471c7be 100644
--- a/src/gallium/drivers/nvc0/nvc0_context.c
+++ b/src/gallium/drivers/nvc0/nvc0_context.c
@@ -22,6 +22,7 @@
#include "draw/draw_context.h"
#include "pipe/p_defines.h"
+#include "util/u_framebuffer.h"
#include "nvc0_context.h"
#include "nvc0_screen.h"
@@ -57,6 +58,8 @@ nvc0_context_unreference_resources(struct nvc0_context *nvc0)
nouveau_bufctx_del(&nvc0->bufctx_3d);
nouveau_bufctx_del(&nvc0->bufctx);
+ util_unreference_framebuffer_state(&nvc0->framebuffer);
+
for (i = 0; i < nvc0->num_vtxbufs; ++i)
pipe_resource_reference(&nvc0->vtxbuf[i].buffer, NULL);
diff --git a/src/gallium/drivers/nvc0/nvc0_state.c b/src/gallium/drivers/nvc0/nvc0_state.c
index e349491..b2cd54a 100644
--- a/src/gallium/drivers/nvc0/nvc0_state.c
+++ b/src/gallium/drivers/nvc0/nvc0_state.c
@@ -679,10 +679,22 @@ nvc0_set_framebuffer_state(struct pipe_context *pipe,
const struct pipe_framebuffer_state *fb)
{
struct nvc0_context *nvc0 = nvc0_context(pipe);
+ unsigned i;
nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_FB);
- nvc0->framebuffer = *fb;
+ for (i = 0; i < fb->nr_cbufs; ++i)
+ pipe_surface_reference(&nvc0->framebuffer.cbufs[i], fb->cbufs[i]);
+ for (; i < nvc0->framebuffer.nr_cbufs; ++i)
+ pipe_surface_reference(&nvc0->framebuffer.cbufs[i], NULL);
+
+ nvc0->framebuffer.nr_cbufs = fb->nr_cbufs;
+
+ nvc0->framebuffer.width = fb->width;
+ nvc0->framebuffer.height = fb->height;
+
+ pipe_surface_reference(&nvc0->framebuffer.zsbuf, fb->zsbuf);
+
nvc0->dirty |= NVC0_NEW_FRAMEBUFFER;
}
More information about the mesa-commit
mailing list