[Mesa-dev] [PATCH 09/11] swrast: move two global defines to the only place where they are used

[Ian Romanick]

This patch is

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

Assuming there are no objections, I'll push this in 24 hours.

On 12/15/2015 03:05 PM, Miklós Máté wrote:
> ---
>  src/mesa/main/mtypes.h            | 2 --
>  src/mesa/swrast/s_atifragshader.c | 2 ++
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
> index 5c71ac4..99e7912 100644
> --- a/src/mesa/main/mtypes.h
> +++ b/src/mesa/main/mtypes.h
> @@ -2278,8 +2278,6 @@ struct gl_compute_program_state
>  /**
>   * ATI_fragment_shader runtime state
>   */
> -#define ATI_FS_INPUT_PRIMARY 0
> -#define ATI_FS_INPUT_SECONDARY 1
>  
>  struct atifs_instruction;
>  struct atifs_setupinst;
> diff --git a/src/mesa/swrast/s_atifragshader.c b/src/mesa/swrast/s_atifragshader.c
> index 2974dee..414a414 100644
> --- a/src/mesa/swrast/s_atifragshader.c
> +++ b/src/mesa/swrast/s_atifragshader.c
> @@ -26,6 +26,8 @@
>  #include "swrast/s_atifragshader.h"
>  #include "swrast/s_context.h"
>  
> +#define ATI_FS_INPUT_PRIMARY 0
> +#define ATI_FS_INPUT_SECONDARY 1
>  
>  /**
>   * State for executing ATI fragment shader.
>