Attachment 105249 Details for Bug 82796 – Fix for the synmark terrain issue

[patch] Fix for the synmark terrain issue

0001-meta-Make-MESA_META_DRAW_BUFFERS-restore-properly.patch (text/plain), 3.19 KB, created by Kristian Høgsberg on 2014-08-25 18:11:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kristian Høgsberg

Created: 2014-08-25 18:11:26 UTC

Size: 3.19 KB

patch

obsolete

>From 0fafc1fdd27c03874ad35d4e77bbe1c2b529595d Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
>Date: Fri, 15 Aug 2014 23:19:52 -0700
>Subject: [PATCH] meta: Make MESA_META_DRAW_BUFFERS restore properly
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>A meta begin/end pair with MESA_META_DRAW_BUFFERS will change visible GL
>state.  We recreate the draw buffer enums from the buffer bitfield, which
>changes GL_BACK to GL_BACK_LEFT (and GL_FRONT to GL_FRONT_LEFT).
>
>This commit modifes the save/restore logic to instead copy the buffer enums
>from the gl_framebuffer and then set them on restore using
>_mesa_drawbuffers().
>
>It's not clear how this breaks the benchmark in 82796, but fixing meta to not
>leak the state change fixes the regression.
>
>No piglit regressions.
>
>Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=82796
>Signed-off-by: Kristian HÃ¸gsberg <krh@bitplanet.net>
>Cc: mesa-stable@lists.freedesktop.org
>---
> src/mesa/drivers/common/meta.c | 38 ++++----------------------------------
> 1 file changed, 4 insertions(+), 34 deletions(-)
>
>diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
>index 90befd4..85f934d 100644
>--- a/src/mesa/drivers/common/meta.c
>+++ b/src/mesa/drivers/common/meta.c
>@@ -396,25 +396,6 @@ _mesa_meta_init(struct gl_context *ctx)
>    ctx->Meta = CALLOC_STRUCT(gl_meta_state);
> }
> 
>-static GLenum
>-gl_buffer_index_to_drawbuffers_enum(gl_buffer_index bufindex)
>-{
>-   assert(bufindex < BUFFER_COUNT);
>-
>-   if (bufindex >= BUFFER_COLOR0)
>-      return GL_COLOR_ATTACHMENT0 + bufindex - BUFFER_COLOR0;
>-   else if (bufindex == BUFFER_FRONT_LEFT)
>-      return GL_FRONT_LEFT;
>-   else if (bufindex == BUFFER_FRONT_RIGHT)
>-      return GL_FRONT_RIGHT;
>-   else if (bufindex == BUFFER_BACK_LEFT)
>-      return GL_BACK_LEFT;
>-   else if (bufindex == BUFFER_BACK_RIGHT)
>-      return GL_BACK_RIGHT;
>-
>-   return GL_NONE;
>-}
>-
> /**
>  * Free context meta-op state.
>  * To be called once during context destruction.
>@@ -806,20 +787,9 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
>    }
> 
>    if (state & MESA_META_DRAW_BUFFERS) {
>-      int buf, real_color_buffers = 0;
>-      memset(save->ColorDrawBuffers, 0, sizeof(save->ColorDrawBuffers));
>-
>-      for (buf = 0; buf < ctx->Const.MaxDrawBuffers; buf++) {
>-         int buf_index = ctx->DrawBuffer->_ColorDrawBufferIndexes[buf];
>-         if (buf_index == -1)
>-            continue;
>-
>-         save->ColorDrawBuffers[buf] =
>-            gl_buffer_index_to_drawbuffers_enum(buf_index);
>-
>-         if (++real_color_buffers >= ctx->DrawBuffer->_NumColorDrawBuffers)
>-            break;
>-      }
>+      struct gl_framebuffer *fb = ctx->DrawBuffer;
>+      memcpy(save->ColorDrawBuffers, fb->ColorDrawBuffer,
>+             sizeof(save->ColorDrawBuffers));
>    }
> 
>    /* misc */
>@@ -1224,7 +1194,7 @@ _mesa_meta_end(struct gl_context *ctx)
>       _mesa_BindRenderbuffer(GL_RENDERBUFFER, save->RenderbufferName);
> 
>    if (state & MESA_META_DRAW_BUFFERS) {
>-      _mesa_DrawBuffers(ctx->Const.MaxDrawBuffers, save->ColorDrawBuffers);
>+      _mesa_drawbuffers(ctx, ctx->Const.MaxDrawBuffers, save->ColorDrawBuffers, NULL);
>    }
> 
>    ctx->Meta->SaveStackDepth--;
>-- 
>2.0.0
>

Actions: View | Splinter Review

Attachments on bug 82796: 104858 | 104859 | 105249

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.