Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu>
On Sun, Feb 14, 2016 at 4:54 PM, Edward O'Callaghan <eocallag...@alterapraxis.com> wrote: > We already have this logic in the gallium/util functions so > lets reduce some entropy while here. > > V.2: > Apply change to nv50 also as suggested by Samuel Pitoiset. > > Signed-off-by: Edward O'Callaghan <eocallag...@alterapraxis.com> > --- > src/gallium/drivers/nouveau/nv50/nv50_state.c | 13 +------------ > src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 13 +------------ > 2 files changed, 2 insertions(+), 24 deletions(-) > > diff --git a/src/gallium/drivers/nouveau/nv50/nv50_state.c > b/src/gallium/drivers/nouveau/nv50/nv50_state.c > index cb04043..1cabca4 100644 > --- a/src/gallium/drivers/nouveau/nv50/nv50_state.c > +++ b/src/gallium/drivers/nouveau/nv50/nv50_state.c > @@ -936,21 +936,10 @@ 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); > > - 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); > + util_copy_framebuffer_state(&nv50->framebuffer, fb); > > nv50->dirty |= NV50_NEW_FRAMEBUFFER; > } > diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c > b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c > index cf3d349..fd5aecd 100644 > --- a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c > +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c > @@ -940,21 +940,10 @@ 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); > > - 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); > + util_copy_framebuffer_state(&nvc0->framebuffer, fb); > > nvc0->dirty |= NVC0_NEW_FRAMEBUFFER; > } > -- > 2.5.0 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev