aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/drivers
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-09-04 15:26:24 +0200
committermarha <marha@users.sourceforge.net>2012-09-04 15:26:24 +0200
commit67c4614f29188e4af86e1d88ee82759c896b70b5 (patch)
treed4f1c1d515dae1ead88d52d9c20369d8141de2f8 /mesalib/src/mesa/drivers
parentb86e8562b1ddca2a8bc29f22a79451a041bf5293 (diff)
downloadvcxsrv-67c4614f29188e4af86e1d88ee82759c896b70b5.tar.gz
vcxsrv-67c4614f29188e4af86e1d88ee82759c896b70b5.tar.bz2
vcxsrv-67c4614f29188e4af86e1d88ee82759c896b70b5.zip
mesa git update 4 sep 2012
Diffstat (limited to 'mesalib/src/mesa/drivers')
-rw-r--r--mesalib/src/mesa/drivers/common/meta.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c
index 4b448fed5..36672a71d 100644
--- a/mesalib/src/mesa/drivers/common/meta.c
+++ b/mesalib/src/mesa/drivers/common/meta.c
@@ -538,7 +538,9 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
_mesa_set_enable(ctx, GL_DEPTH_TEST, GL_FALSE);
}
- if (state & MESA_META_FOG) {
+ if ((state & MESA_META_FOG)
+ && ctx->API != API_OPENGL_CORE
+ && ctx->API != API_OPENGLES2) {
save->Fog = ctx->Fog.Enabled;
if (ctx->Fog.Enabled)
_mesa_set_enable(ctx, GL_FOG, GL_FALSE);
@@ -856,7 +858,9 @@ _mesa_meta_end(struct gl_context *ctx)
_mesa_DepthMask(save->Depth.Mask);
}
- if (state & MESA_META_FOG) {
+ if ((state & MESA_META_FOG)
+ && ctx->API != API_OPENGL_CORE
+ && ctx->API != API_OPENGLES2) {
_mesa_set_enable(ctx, GL_FOG, save->Fog);
}