Attachment 66425 Details for Bug 54295 – Proposed fix

[patch] Proposed fix

0001-meta-Don-t-save-and-restore-fog-state-when-there-is-.patch (text/plain), 1.57 KB, created by Ian Romanick on 2012-08-31 22:30:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Romanick

Created: 2012-08-31 22:30:55 UTC

Size: 1.57 KB

patch

obsolete

>From cb90096eac6d59c8de73ed7507c11b3b576b0078 Mon Sep 17 00:00:00 2001
>From: Ian Romanick <ian.d.romanick@intel.com>
>Date: Fri, 31 Aug 2012 15:26:27 -0700
>Subject: [PATCH] meta: Don't save and restore fog state when there is no fog
> state
>
>I wonder if the better solution is to have _mesa_meta_GenerateMipmap not
>use MESA_META_ALL for the GLSL path.  Even on compatibility profiles
>there is no reason to save and restore fog on this path.
>
>NOTE: This is a candidate for the 9.0 branch.
>
>Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54295
>---
> src/mesa/drivers/common/meta.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
>index 4b448fe..98fa847 100644
>--- a/src/mesa/drivers/common/meta.c
>+++ b/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);
>    }
> 
>-- 
>1.7.11.4
>

Actions: View | Splinter Review

Attachments on bug 54295: 66425

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.