Attachment 44333 Details for Bug 32945 – Possible fix

[patch] Possible fix

0001-r300g-fix-alignement-for-NPOT-values-in-hyperz-setup.patch (text/plain), 2.04 KB, created by Nicolas Peninguy on 2011-03-10 13:13:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolas Peninguy

Created: 2011-03-10 13:13:28 UTC

Size: 2.04 KB

patch

obsolete

>From 6143534244c6fafb64c71e4700bc2b27e25590fa Mon Sep 17 00:00:00 2001
>From: Nicolas Peninguy <nico@lostgeeks.org>
>Date: Thu, 10 Mar 2011 21:48:44 +0000
>Subject: [PATCH] r300g: fix alignement for NPOT values in hyperz setup
>
>With 3 pipes cards we need to align with NPOT values. This fixes:
>https://bugs.freedesktop.org/show_bug.cgi?id=32945
>
>Signed-off-by: Nicolas Peninguy <nico@lostgeeks.org>
>---
> src/gallium/drivers/r300/r300_texture_desc.c |    6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/src/gallium/drivers/r300/r300_texture_desc.c b/src/gallium/drivers/r300/r300_texture_desc.c
>index 3846fb8..2910666 100644
>--- a/src/gallium/drivers/r300/r300_texture_desc.c
>+++ b/src/gallium/drivers/r300/r300_texture_desc.c
>@@ -315,7 +315,7 @@ static unsigned r300_pixels_to_dwords(unsigned stride,
>                                       unsigned height,
>                                       unsigned xblock, unsigned yblock)
> {
>-    return (align(stride, xblock) * align(height, yblock)) / (xblock * yblock);
>+    return (util_align_npot(stride, xblock) * align(height, yblock)) / (xblock * yblock);
> }
> 
> static void r300_setup_hyperz_properties(struct r300_screen *screen,
>@@ -390,7 +390,7 @@ static void r300_setup_hyperz_properties(struct r300_screen *screen,
>                 tex->tex.zcomp8x8[i] = zcompsize == 8;
> 
>                 tex->tex.zmask_stride_in_pixels[i] =
>-                    align(stride, zmask_blocks_x_per_dw[pipes-1] * zcompsize);
>+                    util_align_npot(stride, zmask_blocks_x_per_dw[pipes-1] * zcompsize);
>             } else {
>                 tex->tex.zmask_dwords[i] = 0;
>                 tex->tex.zcomp8x8[i] = FALSE;
>@@ -398,7 +398,7 @@ static void r300_setup_hyperz_properties(struct r300_screen *screen,
>             }
> 
>             /* Now setup HIZ. */
>-            stride = align(stride, hiz_align_x[pipes-1]);
>+            stride = util_align_npot(stride, hiz_align_x[pipes-1]);
>             height = align(height, hiz_align_y[pipes-1]);
> 
>             /* Get the HIZ buffer size in dwords. */
>-- 
>1.7.4.1
>

Actions: View | Splinter Review

Attachments on bug 32945: 41815 | 42458 | 42459 | 42469 | 42495 | 42497 | 42527 | 43961 | 43962 | 44333

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.