[Mesa-dev] [PATCH 2/4] nv50: move nva0_so_target_save_offset() to its correct location

[Pierre Moreau]

Reviewed-by: Pierre Moreau <pierre.morrow at free.fr>

On 11:30 PM - Oct 18 2015, Samuel Pitoiset wrote:
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> ---
>  src/gallium/drivers/nouveau/nv50/nv50_query.c | 18 ------------------
>  src/gallium/drivers/nouveau/nv50/nv50_query.h |  3 ---
>  src/gallium/drivers/nouveau/nv50/nv50_state.c | 18 ++++++++++++++++++
>  3 files changed, 18 insertions(+), 21 deletions(-)
> 
> diff --git a/src/gallium/drivers/nouveau/nv50/nv50_query.c b/src/gallium/drivers/nouveau/nv50/nv50_query.c
> index 7718d69..1b4abdb 100644
> --- a/src/gallium/drivers/nouveau/nv50/nv50_query.c
> +++ b/src/gallium/drivers/nouveau/nv50/nv50_query.c
> @@ -444,24 +444,6 @@ nv50_query_pushbuf_submit(struct nouveau_pushbuf *push, uint16_t method,
>  }
>  
>  void
> -nva0_so_target_save_offset(struct pipe_context *pipe,
> -                           struct pipe_stream_output_target *ptarg,
> -                           unsigned index, bool serialize)
> -{
> -   struct nv50_so_target *targ = nv50_so_target(ptarg);
> -
> -   if (serialize) {
> -      struct nouveau_pushbuf *push = nv50_context(pipe)->base.pushbuf;
> -      PUSH_SPACE(push, 2);
> -      BEGIN_NV04(push, SUBC_3D(NV50_GRAPH_SERIALIZE), 1);
> -      PUSH_DATA (push, 0);
> -   }
> -
> -   nv50_query(targ->pq)->index = index;
> -   nv50_query_end(pipe, targ->pq);
> -}
> -
> -void
>  nv50_init_query_functions(struct nv50_context *nv50)
>  {
>     struct pipe_context *pipe = &nv50->base.pipe;
> diff --git a/src/gallium/drivers/nouveau/nv50/nv50_query.h b/src/gallium/drivers/nouveau/nv50/nv50_query.h
> index 722af0c..a703013 100644
> --- a/src/gallium/drivers/nouveau/nv50/nv50_query.h
> +++ b/src/gallium/drivers/nouveau/nv50/nv50_query.h
> @@ -33,8 +33,5 @@ void nv50_init_query_functions(struct nv50_context *);
>  void nv50_query_pushbuf_submit(struct nouveau_pushbuf *, uint16_t,
>                                 struct nv50_query *, unsigned result_offset);
>  void nv84_query_fifo_wait(struct nouveau_pushbuf *, struct nv50_query *);
> -void nva0_so_target_save_offset(struct pipe_context *,
> -                                struct pipe_stream_output_target *,
> -                                unsigned, bool);
>  
>  #endif
> diff --git a/src/gallium/drivers/nouveau/nv50/nv50_state.c b/src/gallium/drivers/nouveau/nv50/nv50_state.c
> index 410e631..8af2add 100644
> --- a/src/gallium/drivers/nouveau/nv50/nv50_state.c
> +++ b/src/gallium/drivers/nouveau/nv50/nv50_state.c
> @@ -1057,6 +1057,24 @@ nv50_so_target_create(struct pipe_context *pipe,
>  }
>  
>  static void
> +nva0_so_target_save_offset(struct pipe_context *pipe,
> +                           struct pipe_stream_output_target *ptarg,
> +                           unsigned index, bool serialize)
> +{
> +   struct nv50_so_target *targ = nv50_so_target(ptarg);
> +
> +   if (serialize) {
> +      struct nouveau_pushbuf *push = nv50_context(pipe)->base.pushbuf;
> +      PUSH_SPACE(push, 2);
> +      BEGIN_NV04(push, SUBC_3D(NV50_GRAPH_SERIALIZE), 1);
> +      PUSH_DATA (push, 0);
> +   }
> +
> +   nv50_query(targ->pq)->index = index;
> +   pipe->end_query(pipe, targ->pq);
> +}
> +
> +static void
>  nv50_so_target_destroy(struct pipe_context *pipe,
>                         struct pipe_stream_output_target *ptarg)
>  {
> -- 
> 2.6.1
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev