fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 21:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nv50,nvc0: hold references to the framebuffer surfaces

Browse source
This commit is contained in:
Christoph Bumiller 2012-03-07 19:44:10 +01:00
parent 687c05661f
commit 2d06ee8bf7
4 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/drivers/nv50/nv50_context.c
View file

@ -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);

14
src/gallium/drivers/nv50/nv50_state.c
View file

@ -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;
}

3
src/gallium/drivers/nvc0/nvc0_context.c
View file

@ -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);

14
src/gallium/drivers/nvc0/nvc0_state.c
View file

@ -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;
}