[Mesa-dev] [PATCH] nv{c, 5}0: Remove duplicate logic from nvc0_set_framebuffer_state()

[Samuel Pitoiset]

Your patch doesn't compile because you forgot to include 
"util/u_framebuffer.h"

nv50/nv50_state.c: In function ‘nv50_set_framebuffer_state’:
nv50/nv50_state.c:942:4: error: implicit declaration of function 
‘util_copy_framebuffer_state’ [-Werror=implicit-function-declaration]
     util_copy_framebuffer_state(&nv50->framebuffer, fb);
     ^
nvc0/nvc0_state.c: In function ‘nvc0_set_framebuffer_state’:
nvc0/nvc0_state.c:946:5: error: implicit declaration of function 
‘util_copy_framebuffer_state’ [-Werror=implicit-function-declaration]
      util_copy_framebuffer_state(&nvc0->framebuffer, fb);

I have fixed this locally and I'm going to push it.

On 02/14/2016 10:54 PM, Edward O'Callaghan 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 <eocallaghan at 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;
>   }
>