diff options
| author | Ian Romanick <[email protected]> | 2011-04-21 17:36:17 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2011-04-25 18:27:17 -0700 |
| commit | cd354b4eb84839837a9349bd91e89b55d06e5837 (patch) | |
| tree | ad5953a4e52a658c6fb184dc67fc45a8fd749d24 | |
| parent | f274dfaca4b53bae92dfe6a72c1890c381d84746 (diff) | |
mesa: Remove SWcontext::_FogMode, use gl_context::gl_fog_attrib::Mode everywhere
Reviewed-by: Brian Paul <[email protected]>
| -rw-r--r-- | src/mesa/swrast/s_context.c | 1 | ||||
| -rw-r--r-- | src/mesa/swrast/s_context.h | 1 | ||||
| -rw-r--r-- | 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 b3e39689cfa..def1531d7ff 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 5dbdd609adb..8d7458c2dd9 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 d808e2b2a2b..ea59de16020 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; |