[Mesa-dev] [PATCH 23/23] mesa: move more swrast-related #defines out of core Mesa

[Jose Fonseca]

BTW, besides the remarks I made, the series looks great. Quite a nice cleanup.

Jose

----- Original Message -----
> From: Brian Paul <brianp at vmware.com>
> 
> ---
>  src/mesa/main/config.h   |   40
>  ----------------------------------------
>  src/mesa/swrast/s_chan.h |    8 ++++++++
>  src/mesa/swrast/swrast.h |   20 ++++++++++++++++++++
>  3 files changed, 28 insertions(+), 40 deletions(-)
> 
> diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
> index c70cc18..8bf741f 100644
> --- a/src/mesa/main/config.h
> +++ b/src/mesa/main/config.h
> @@ -262,46 +262,6 @@
>  /*@}*/
>  
>  
> -/**
> - * \name Mesa-specific parameters
> - */
> -/*@{*/
> -
> -
> -/**
> - * If non-zero use GLdouble for walking triangle edges, for better
> accuracy.
> - */
> -#define TRIANGLE_WALK_DOUBLE 0
> -
> -
> -/**
> - * Bits per depth buffer value (max is 32).
> - */
> -#ifndef DEFAULT_SOFTWARE_DEPTH_BITS
> -#define DEFAULT_SOFTWARE_DEPTH_BITS 16
> -#endif
> -/** Depth buffer data type */
> -#if DEFAULT_SOFTWARE_DEPTH_BITS <= 16
> -#define DEFAULT_SOFTWARE_DEPTH_TYPE GLushort
> -#else
> -#define DEFAULT_SOFTWARE_DEPTH_TYPE GLuint
> -#endif
> -
> -
> -/**
> - * Bits per stencil value: 8
> - */
> -#define STENCIL_BITS 8
> -
> -
> -/**
> - * For swrast, bits per color channel:  8, 16 or 32
> - */
> -#ifndef CHAN_BITS
> -#define CHAN_BITS 8
> -#endif
> -
> -
>  /*
>   * Color channel component order
>   *
> diff --git a/src/mesa/swrast/s_chan.h b/src/mesa/swrast/s_chan.h
> index 94ac8b6..1db7fae 100644
> --- a/src/mesa/swrast/s_chan.h
> +++ b/src/mesa/swrast/s_chan.h
> @@ -36,6 +36,14 @@
>  
>  
>  /**
> + * Default bits per color channel:  8, 16 or 32
> + */
> +#ifndef CHAN_BITS
> +#define CHAN_BITS 8
> +#endif
> +
> +
> +/**
>   * Color channel data type.
>   */
>  #if CHAN_BITS == 8
> diff --git a/src/mesa/swrast/swrast.h b/src/mesa/swrast/swrast.h
> index f6ccf56..f3029d8 100644
> --- a/src/mesa/swrast/swrast.h
> +++ b/src/mesa/swrast/swrast.h
> @@ -37,6 +37,26 @@
>  
>  
>  /**
> + * If non-zero use GLdouble for walking triangle edges, for better
> accuracy.
> + */
> +#define TRIANGLE_WALK_DOUBLE 0
> +
> +
> +/**
> + * Bits per depth buffer value (max is 32).
> + */
> +#ifndef DEFAULT_SOFTWARE_DEPTH_BITS
> +#define DEFAULT_SOFTWARE_DEPTH_BITS 16
> +#endif
> +/** Depth buffer data type */
> +#if DEFAULT_SOFTWARE_DEPTH_BITS <= 16
> +#define DEFAULT_SOFTWARE_DEPTH_TYPE GLushort
> +#else
> +#define DEFAULT_SOFTWARE_DEPTH_TYPE GLuint
> +#endif
> +
> +
> +/**
>   * Max image/surface/texture size.
>   */
>  #define SWRAST_MAX_WIDTH 16384
> --
> 1.7.3.4
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>