Attachment 37414 Details for Bug 28341 – Fix frontbuffer rendering, avoid segfault in singlebuffer demo.

[patch] Fix frontbuffer rendering, avoid segfault in singlebuffer demo.

0001-radeon-Fix-frontbuffer-rendering-with-DRI2-flush-ext.patch (text/plain), 3.06 KB, created by Mario Kleiner on 2010-07-27 10:50:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mario Kleiner

Created: 2010-07-27 10:50:26 UTC

Size: 3.06 KB

patch

obsolete

>From d16fd8cb72f5213f3e25a663a244b9aedbcd2976 Mon Sep 17 00:00:00 2001
>From: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
>Date: Tue, 27 Jul 2010 19:39:05 +0200
>Subject: [PATCH] radeon: Fix frontbuffer rendering with DRI2 flush extension.
>
>Need to do it the intel way and clear the
>radeon->front_buffer_dirty flag after flushing
>the dirty frontbuffer, to avoid infinite recursion.
>
>Flag gets set as needed in new radeon_prepare_render().
>
>Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
>---
> src/mesa/drivers/dri/radeon/radeon_common.c        |   15 +++++----------
> .../drivers/dri/radeon/radeon_common_context.c     |    7 +++++++
> 2 files changed, 12 insertions(+), 10 deletions(-)
>
>diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c
>index 13f1f06..c1a660a 100644
>--- a/src/mesa/drivers/dri/radeon/radeon_common.c
>+++ b/src/mesa/drivers/dri/radeon/radeon_common.c
>@@ -708,7 +708,6 @@ void radeon_draw_buffer(GLcontext *ctx, struct gl_framebuffer *fb)
> 		if (fb->_ColorDrawBufferIndexes[0] == BUFFER_FRONT_LEFT) {
> 			rrbColor = radeon_renderbuffer(fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer);
> 			radeon->front_cliprects = GL_TRUE;
>-			radeon->front_buffer_dirty = GL_TRUE;
> 		} else {
> 			rrbColor = radeon_renderbuffer(fb->Attachment[BUFFER_BACK_LEFT].Renderbuffer);
> 			radeon->front_cliprects = GL_FALSE;
>@@ -1132,17 +1131,13 @@ flush_front:
> 		if (screen->dri2.loader && (screen->dri2.loader->base.version >= 2)
> 			&& (screen->dri2.loader->flushFrontBuffer != NULL)) {
> 			__DRIdrawable * drawable = radeon_get_drawable(radeon);
>-			(*screen->dri2.loader->flushFrontBuffer)(drawable, drawable->loaderPrivate);
> 
>-			/* Only clear the dirty bit if front-buffer rendering is no longer
>-			 * enabled.  This is done so that the dirty bit can only be set in
>-			 * glDrawBuffer.  Otherwise the dirty bit would have to be set at
>-			 * each of N places that do rendering.  This has worse performances,
>-			 * but it is much easier to get correct.
>+			/* We set the dirty bit in radeon_prepare_render() if we're
>+			 * front buffer rendering once we get there.
> 			 */
>-			if (!radeon->is_front_buffer_rendering) {
>-				radeon->front_buffer_dirty = GL_FALSE;
>-			}
>+			radeon->front_buffer_dirty = GL_FALSE;
>+
>+			(*screen->dri2.loader->flushFrontBuffer)(drawable, drawable->loaderPrivate);
> 		}
> 	}
> }
>diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c
>index 3665944..f76c49e 100644
>--- a/src/mesa/drivers/dri/radeon/radeon_common_context.c
>+++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c
>@@ -528,6 +528,13 @@ void radeon_prepare_render(radeonContextPtr radeon)
> 	    radeon_update_renderbuffers(driContext, drawable, GL_FALSE);
> 	driContext->dri2.read_stamp = drawable->dri2.stamp;
>     }
>+
>+    /* If we're currently rendering to the front buffer, the rendering
>+     * that will happen next will probably dirty the front buffer.  So
>+     * mark it as dirty here.
>+     */
>+    if (radeon->is_front_buffer_rendering)
>+	radeon->front_buffer_dirty = GL_TRUE;
> }
> 
> void
>-- 
>1.7.0.4
>

Actions: View | Splinter Review

Attachments on bug 28341: 35995 | 35997 | 37035 | 37317 | 37366 | 37368 | 37401 | 37414 | 37513

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.