Patches 1 through 5 seem innocuous enough and are

Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>

Do you have a tree somewhere that I could pull to make sure the others
don't break my build? :)

On 02/27/2015 04:47 PM, Brian Paul wrote:
> ---
>  src/mesa/main/compiler.h          | 4 ----
>  src/mesa/program/prog_statevars.c | 3 +++
>  2 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
> index dd65d07..231dee7 100644
> --- a/src/mesa/main/compiler.h
> +++ b/src/mesa/main/compiler.h
> @@ -196,10 +196,6 @@ static inline GLuint CPU_TO_LE32(GLuint x)
>  # define LONGSTRING __extension__
>  #endif
>  
> -#ifndef ONE_DIV_SQRT_LN2
> -#define ONE_DIV_SQRT_LN2 (1.201122408786449815)
> -#endif
> -
>  #ifndef FLT_MAX_EXP
>  #define FLT_MAX_EXP 128
>  #endif
> diff --git a/src/mesa/program/prog_statevars.c 
> b/src/mesa/program/prog_statevars.c
> index 80708f4e..7e55371 100644
> --- a/src/mesa/program/prog_statevars.c
> +++ b/src/mesa/program/prog_statevars.c
> @@ -41,6 +41,9 @@
>  #include "main/samplerobj.h"
>  
>  
> +#define ONE_DIV_SQRT_LN2 (1.201122408786449815)
> +
> +
>  /**
>   * Use the list of tokens in the state[] array to find global GL state
>   * and return it in <value>.  Usually, four values are returned in <value>
> 

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to