Attachment 31461 Details for Bug 22851 – fix attempt

[patch] fix attempt

lock-fixes.patch (text/plain), 1.19 KB, created by Dave Airlie on 2009-11-25 02:11:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Airlie

Created: 2009-11-25 02:11:58 UTC

Size: 1.19 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/radeon/radeon_lock.c b/src/mesa/drivers/dri/radeon/radeon_lock.c
>index 02de8e5..7ad781b 100644
>--- a/src/mesa/drivers/dri/radeon/radeon_lock.c
>+++ b/src/mesa/drivers/dri/radeon/radeon_lock.c
>@@ -62,8 +62,6 @@ void radeonGetLock(radeonContextPtr rmesa, GLuint flags)
> 	__DRIdrawablePrivate *const readable = radeon_get_readable(rmesa);
> 	__DRIscreenPrivate *sPriv = rmesa->dri.screen;
> 
>-	assert(drawable != NULL);
>-
> 	drmGetLock(rmesa->dri.fd, rmesa->dri.hwContext, flags);
> 
> 	/* The window might have moved, so we might need to get new clip
>@@ -74,12 +72,13 @@ void radeonGetLock(radeonContextPtr rmesa, GLuint flags)
> 	 * Since the hardware state depends on having the latest drawable
> 	 * clip rects, all state checking must be done _after_ this call.
> 	 */
>-	DRI_VALIDATE_DRAWABLE_INFO(sPriv, drawable);
>-	if (drawable != readable) {
>+	if (drawable)
>+		DRI_VALIDATE_DRAWABLE_INFO(sPriv, drawable);
>+	if (readable && drawable != readable) {
> 		DRI_VALIDATE_DRAWABLE_INFO(sPriv, readable);
> 	}
> 
>-	if (rmesa->lastStamp != drawable->lastStamp) {
>+	if (drawable && (rmesa->lastStamp != drawable->lastStamp)) {
> 		radeon_window_moved(rmesa);
> 		rmesa->lastStamp = drawable->lastStamp;
> 	}

Actions: View | Splinter Review

Attachments on bug 22851: 31461

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.