mesa: Remove unused gl_fog_attrib::_Scale.

The patch removes a variable that is only written to.

Signed-off-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/main/fog.c b/src/mesa/main/fog.c
index 76e65080b749afaca986cdc1e71971e1e2bb2654..c051aaddedcea74b1342772f76b933e7467cc58f 100644 (file)
--- a/src/mesa/main/fog.c
+++ b/src/mesa/main/fog.c
@@ -78,19 +78,6 @@ _mesa_Fogiv(GLenum pname, const GLint *params )
 }
 
 
-/**
- * Update the gl_fog_attrib::_Scale field.
- */
-static void
-update_fog_scale(struct gl_context *ctx)
-{
-   if (ctx->Fog.End == ctx->Fog.Start)
-      ctx->Fog._Scale = 1.0f;
-   else
-      ctx->Fog._Scale = 1.0f / (ctx->Fog.End - ctx->Fog.Start);
-}
-
-
 void GLAPIENTRY
 _mesa_Fogfv( GLenum pname, const GLfloat *params )
 {
@@ -136,14 +123,12 @@ _mesa_Fogfv( GLenum pname, const GLfloat *params )
             return;
          FLUSH_VERTICES(ctx, _NEW_FOG);
          ctx->Fog.Start = *params;
-         update_fog_scale(ctx);
          break;
       case GL_FOG_END:
          if (ctx->Fog.End == *params)
             return;
          FLUSH_VERTICES(ctx, _NEW_FOG);
          ctx->Fog.End = *params;
-         update_fog_scale(ctx);
          break;
       case GL_FOG_INDEX:
          if (ctx->API != API_OPENGL_COMPAT)
@@ -227,6 +212,5 @@ void _mesa_init_fog( struct gl_context * ctx )
    ctx->Fog.End = 1.0;
    ctx->Fog.ColorSumEnabled = GL_FALSE;
    ctx->Fog.FogCoordinateSource = GL_FRAGMENT_DEPTH_EXT;
-   ctx->Fog._Scale = 1.0f;
    ctx->Fog.FogDistanceMode = GL_EYE_PLANE_ABSOLUTE_NV;
 }

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index dccc152ad878e205a38fc67c129fb17c8ff852cf..a1285fe4d147f2ee0a57387700bc831a01a087d6 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -651,7 +651,6 @@ struct gl_fog_attrib
    GLfloat Index;              /**< Fog index */
    GLenum16 Mode;              /**< Fog mode */
    GLenum16 FogCoordinateSource;/**< GL_EXT_fog_coord */
-   GLfloat _Scale;             /**< (End == Start) ? 1.0 : 1.0 / (End - Start) */
    GLenum16 FogDistanceMode;     /**< GL_NV_fog_distance */
 };