[Mesa-dev] [PATCH 2/6] r600g: cleanup #include recursion between r600_pipe.h and evergreen_compute.h

[Tom Stellard]

On Fri, Mar 01, 2013 at 05:55:31PM +0100, Marek Olšák wrote:

Patches 2-4 are:

Reviewed-by: Tom Stellard <thomas.stellard at amd.com>

Thanks for working on this, it is a nice improvement.

-Tom

> ---
>  src/gallium/drivers/r600/compute_memory_pool.c        |    1 +
>  src/gallium/drivers/r600/evergreen_compute.h          |    2 +-
>  src/gallium/drivers/r600/evergreen_compute_internal.c |    1 +
>  src/gallium/drivers/r600/r600_pipe.c                  |    1 +
>  src/gallium/drivers/r600/r600_pipe.h                  |    1 -
>  src/gallium/drivers/r600/r600_resource.c              |    1 +
>  src/gallium/drivers/r600/r600_texture.c               |    1 +
>  7 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/src/gallium/drivers/r600/compute_memory_pool.c b/src/gallium/drivers/r600/compute_memory_pool.c
> index 5b1cb1b..8896909 100644
> --- a/src/gallium/drivers/r600/compute_memory_pool.c
> +++ b/src/gallium/drivers/r600/compute_memory_pool.c
> @@ -39,6 +39,7 @@
>  #include "r600_pipe.h"
>  #include "r600_formats.h"
>  #include "compute_memory_pool.h"
> +#include "evergreen_compute.h"
>  #include "evergreen_compute_internal.h"
>  #include <inttypes.h>
>  
> diff --git a/src/gallium/drivers/r600/evergreen_compute.h b/src/gallium/drivers/r600/evergreen_compute.h
> index e68ebd8..db57520 100644
> --- a/src/gallium/drivers/r600/evergreen_compute.h
> +++ b/src/gallium/drivers/r600/evergreen_compute.h
> @@ -32,7 +32,7 @@
>  struct r600_atom;
>  struct evergreen_compute_resource;
>  
> -void *evergreen_create_compute_state(struct pipe_context *ctx, const const struct pipe_compute_state *cso);
> +void *evergreen_create_compute_state(struct pipe_context *ctx, const struct pipe_compute_state *cso);
>  void evergreen_delete_compute_state(struct pipe_context *ctx, void *state);
>  void evergreen_compute_upload_input(struct pipe_context *context, const uint *block_layout, const uint *grid_layout, const void *input);
>  void evergreen_init_atom_start_compute_cs(struct r600_context *rctx);
> diff --git a/src/gallium/drivers/r600/evergreen_compute_internal.c b/src/gallium/drivers/r600/evergreen_compute_internal.c
> index 2e8e9da..60bb3bf 100644
> --- a/src/gallium/drivers/r600/evergreen_compute_internal.c
> +++ b/src/gallium/drivers/r600/evergreen_compute_internal.c
> @@ -42,6 +42,7 @@
>  #include "r600_pipe.h"
>  #include "r600_formats.h"
>  #include "evergreend.h"
> +#include "evergreen_compute.h"
>  #include "evergreen_compute_internal.h"
>  #include "r600_hw_context_priv.h"
>  
> diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
> index e81856c..05bb755 100644
> --- a/src/gallium/drivers/r600/r600_pipe.c
> +++ b/src/gallium/drivers/r600/r600_pipe.c
> @@ -23,6 +23,7 @@
>  #include "r600_pipe.h"
>  #include "r600_public.h"
>  #include "r600_isa.h"
> +#include "evergreen_compute.h"
>  #include "r600d.h"
>  
>  #include <errno.h>
> diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
> index cb52083..c178285 100644
> --- a/src/gallium/drivers/r600/r600_pipe.h
> +++ b/src/gallium/drivers/r600/r600_pipe.h
> @@ -33,7 +33,6 @@
>  #include "r600_llvm.h"
>  #include "r600_public.h"
>  #include "r600_resource.h"
> -#include "evergreen_compute.h"
>  
>  #define R600_NUM_ATOMS 38
>  
> diff --git a/src/gallium/drivers/r600/r600_resource.c b/src/gallium/drivers/r600/r600_resource.c
> index 5e637f6..5962f8a 100644
> --- a/src/gallium/drivers/r600/r600_resource.c
> +++ b/src/gallium/drivers/r600/r600_resource.c
> @@ -22,6 +22,7 @@
>   */
>  
>  #include "r600_pipe.h"
> +#include "evergreen_compute.h"
>  
>  static struct pipe_resource *r600_resource_create(struct pipe_screen *screen,
>  						const struct pipe_resource *templ)
> diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
> index aefc40f..1c071cb 100644
> --- a/src/gallium/drivers/r600/r600_texture.c
> +++ b/src/gallium/drivers/r600/r600_texture.c
> @@ -25,6 +25,7 @@
>   *      Corbin Simpson
>   */
>  #include "r600_formats.h"
> +#include "evergreen_compute.h"
>  #include "r600d.h"
>  
>  #include <errno.h>
> -- 
> 1.7.10.4
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev