[Mesa-dev] [PATCH] mesa: Remove SWcontext::_FogMode, use gl_context::gl_fog_attrib::Mode everywhere

[Brian Paul]

On 04/25/2011 05:18 PM, Ian Romanick wrote:
> From: Ian Romanick<ian.d.romanick at intel.com>
>
> ---
>   src/mesa/swrast/s_context.c |    1 -
>   src/mesa/swrast/s_context.h |    1 -
>   src/mesa/swrast/s_fog.c     |    2 +-
>   3 files changed, 1 insertions(+), 3 deletions(-)
>
> diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
> index b3e3968..def1531 100644
> --- a/src/mesa/swrast/s_context.c
> +++ b/src/mesa/swrast/s_context.c
> @@ -252,7 +252,6 @@ _swrast_update_fog_state( struct gl_context *ctx )
>
>      /* determine if fog is needed, and if so, which fog mode */
>      swrast->_FogEnabled = (fp == NULL&&  ctx->Fog.Enabled);
> -   swrast->_FogMode = ctx->Fog.Mode;
>   }
>
>
> diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h
> index 5dbdd60..8d7458c 100644
> --- a/src/mesa/swrast/s_context.h
> +++ b/src/mesa/swrast/s_context.h
> @@ -135,7 +135,6 @@ typedef struct
>      GLboolean _TextureCombinePrimary;
>      GLboolean _FogEnabled;
>      GLboolean _DeferredTexture;
> -   GLenum _FogMode;  /* either GL_FOG_MODE or fragment program's fog mode */
>
>      /** List/array of the fragment attributes to interpolate */
>      GLuint _ActiveAttribs[FRAG_ATTRIB_MAX];
> diff --git a/src/mesa/swrast/s_fog.c b/src/mesa/swrast/s_fog.c
> index d808e2b..ea59de1 100644
> --- a/src/mesa/swrast/s_fog.c
> +++ b/src/mesa/swrast/s_fog.c
> @@ -158,7 +158,7 @@ _swrast_fog_rgba_span( const struct gl_context *ctx, SWspan *span )
>         /* The span's fog values are fog coordinates, now compute blend factors
>          * and blend the fragment colors with the fog color.
>          */
> -      switch (swrast->_FogMode) {
> +      switch (ctx->Fog.Mode) {
>         case GL_LINEAR:
>            {
>               const GLfloat fogEnd = ctx->Fog.End;

Reviewed-by: Brian Paul <brianp at vmware.com>