diff options
| author | Christian König <[email protected]> | 2011-05-07 14:11:40 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-05-07 14:11:40 +0200 |
| commit | 213b9004a6ee033a16af3dcd187aa68b56c39858 (patch) | |
| tree | f577f4dc276f70dad63f102f69f87f4d566186ef /src/mesa/swrast/s_context.c | |
| parent | 6ad846ee78d9d8ba93dcecdefbf89f2b981333ef (diff) | |
| parent | 03615c02d81437cf546609fc6a39c6c73be39360 (diff) | |
Merge remote-tracking branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_state.c
Diffstat (limited to 'src/mesa/swrast/s_context.c')
| -rw-r--r-- | src/mesa/swrast/s_context.c | 1 |
1 files changed, 0 insertions, 1 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; } |