[Mesa-dev] [PATCH 7/7] mesa: Drop dependency on mtypes.h for core NIR.

[Connor Abbott]

Given that this commit only changes NIR code, I think it should be
prefixed by "nir: ", e.g. "nir: Drop dependency on mtypes.h in nir.h."
Once that's done, this gets my r-b.

On Wed, Feb 11, 2015 at 7:48 PM, Eric Anholt <eric at anholt.net> wrote:
> One less new directory necessary for gallium code that wants to interact
> with NIR.
> ---
>  src/glsl/nir/nir.h                     | 4 +++-
>  src/glsl/nir/nir_lower_atomics.c       | 1 +
>  src/glsl/nir/nir_lower_system_values.c | 1 +
>  3 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h
> index 3d8619f..ea8cd80 100644
> --- a/src/glsl/nir/nir.h
> +++ b/src/glsl/nir/nir.h
> @@ -32,7 +32,6 @@
>  #include "GL/gl.h" /* GLenum */
>  #include "util/ralloc.h"
>  #include "util/set.h"
> -#include "main/mtypes.h"
>  #include "util/bitset.h"
>  #include "nir_types.h"
>  #include <stdio.h>
> @@ -43,6 +42,9 @@
>  extern "C" {
>  #endif
>
> +struct gl_program;
> +struct gl_shader_program;
> +
>  #define NIR_FALSE 0u
>  #define NIR_TRUE (~0u)
>
> diff --git a/src/glsl/nir/nir_lower_atomics.c b/src/glsl/nir/nir_lower_atomics.c
> index 5e04417..e82df01 100644
> --- a/src/glsl/nir/nir_lower_atomics.c
> +++ b/src/glsl/nir/nir_lower_atomics.c
> @@ -26,6 +26,7 @@
>   */
>
>  #include "nir.h"
> +#include "main/config.h"
>  #include <assert.h>
>
>  /*
> diff --git a/src/glsl/nir/nir_lower_system_values.c b/src/glsl/nir/nir_lower_system_values.c
> index 90346c9..328d4f1 100644
> --- a/src/glsl/nir/nir_lower_system_values.c
> +++ b/src/glsl/nir/nir_lower_system_values.c
> @@ -26,6 +26,7 @@
>   */
>
>  #include "nir.h"
> +#include "main/mtypes.h"
>
>  static void
>  convert_instr(nir_intrinsic_instr *instr)
> --
> 2.1.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev