mesa: Remove SWcontext::_FogMode, use gl_context::gl_fog_attrib::Mode everywhere

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

diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index b3e39689cfa6621c8d0f0cf7e8f9f7bc6f76ed1b..def1531d7ffe7e0306635c25ff7a4b0cf9259c1f 100644 (file)
--- 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 5dbdd609adbfb120358257392ec04da2414938b1..8d7458c2dd948a0f0c626b477ca7b7a4a96bdd30 100644 (file)
--- 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 d808e2b2a2b9079738aad843ab4a78d9a1f00724..ea59de1602007515d1c46da98df88967e3308b6e 100644 (file)
--- 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;