Attachment 48019 Details for Bug 35434 – patch

[patch] patch

0001-r600g-fix-source-box-in-r600_resource_copy_region.patch (text/plain), 1.97 KB, created by Vadim Girlin on 2011-06-15 20:13:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vadim Girlin

Created: 2011-06-15 20:13:00 UTC

Size: 1.97 KB

patch

obsolete

>From c7bb3226d96da61c10f129a0126f6d619ff016aa Mon Sep 17 00:00:00 2001
>From: Vadim Girlin <vadimgirlin@gmail.com>
>Date: Thu, 16 Jun 2011 06:09:59 +0400
>Subject: [PATCH] r600g: fix source box in r600_resource_copy_region
>
>should fix broken ground textures in ETQW, fdo bug 35434
>
>Signed-off-by: Vadim Girlin <vadimgirlin@gmail.com>
>---
> src/gallium/drivers/r600/r600_blit.c |   13 +++++++++++--
> 1 files changed, 11 insertions(+), 2 deletions(-)
>
>diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c
>index 043c875..e858ea2 100644
>--- a/src/gallium/drivers/r600/r600_blit.c
>+++ b/src/gallium/drivers/r600/r600_blit.c
>@@ -294,6 +294,7 @@ static void r600_resource_copy_region(struct pipe_context *ctx,
> {
> 	struct r600_resource_texture *rsrc = (struct r600_resource_texture*)src;
> 	struct texture_orig_info orig_info[2];
>+	struct pipe_box sbox, *psbox;
> 	boolean restore_orig[2];
> 
> 	/* Fallback for buffers. */
>@@ -311,7 +312,15 @@ static void r600_resource_copy_region(struct pipe_context *ctx,
> 	if (util_format_is_compressed(src->format)) {
> 		r600_compressed_to_blittable(src, src_level, &orig_info[0]);
> 		restore_orig[0] = TRUE;
>-	}
>+		sbox.x = util_format_get_nblocksx(orig_info[0].format, src_box->x);
>+		sbox.y = util_format_get_nblocksy(orig_info[0].format, src_box->y);
>+		sbox.z = src_box->z;
>+		sbox.width = util_format_get_nblocksx(orig_info[0].format, src_box->width);
>+		sbox.height = util_format_get_nblocksy(orig_info[0].format, src_box->height);
>+		sbox.depth = src_box->depth;
>+		psbox=&sbox;
>+	} else
>+		psbox=src_box;
> 
> 	if (util_format_is_compressed(dst->format)) {
> 		r600_compressed_to_blittable(dst, dst_level, &orig_info[1]);
>@@ -322,7 +331,7 @@ static void r600_resource_copy_region(struct pipe_context *ctx,
> 	}
> 
> 	r600_hw_copy_region(ctx, dst, dst_level, dstx, dsty, dstz,
>-			    src, src_level, src_box);
>+			    src, src_level, psbox);
> 
> 	if (restore_orig[0])
> 		r600_reset_blittable_to_compressed(src, src_level, &orig_info[0]);
>-- 
>1.7.5.4
>

Actions: View | Splinter Review

Attachments on bug 35434: 48019

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.