diff options
| author | Brian Paul <brianp@vmware.com> | 2009-09-20 10:36:45 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-09-20 10:36:45 -0600 |
| commit | ebf2710b2fd21ae9a6604c015ca7a948589f5a8c (patch) | |
| tree | dd6b9da40b44824a1a4bdcfb4b3b2fc7edef3233 /src/mesa/drivers/common | |
| parent | ed4076b5b8c5d3c024e291f42a8730b4f71226c9 (diff) | |
| parent | 82c2f7756af19f0a19aeda7ea1f627262e4561c0 (diff) | |
Merge branch 'mesa_7_6_branch'
Conflicts:
src/mesa/drivers/dri/intel/intel_clear.c
Diffstat (limited to 'src/mesa/drivers/common')
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index e9b892e33f..532b2c9263 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -772,7 +772,6 @@ _mesa_meta_end(GLcontext *ctx) _mesa_MatrixMode(save->MatrixMode); - save->ClipPlanesEnabled = ctx->Transform.ClipPlanesEnabled; if (save->ClipPlanesEnabled) { GLuint i; for (i = 0; i < ctx->Const.MaxClipPlanes; i++) { @@ -808,9 +807,6 @@ _mesa_meta_end(GLcontext *ctx) if (save->Lighting) { _mesa_set_enable(ctx, GL_LIGHTING, GL_TRUE); } - if (save->Fog) { - _mesa_set_enable(ctx, GL_FOG, GL_TRUE); - } } |