Attachment 44101 Details for Bug 33886 – patch for r300 rebased

[patch] patch for r300 rebased

0001-r300g-Properly-take-the-sampler-view-s-first_level-i.patch (text/plain), 3.82 KB, created by Marek Olšák on 2011-03-03 19:23:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Olšák

Created: 2011-03-03 19:23:28 UTC

Size: 3.82 KB

patch

obsolete

>From d8c8c64b037122f109aa3fe899b76ec6507ff0ef Mon Sep 17 00:00:00 2001
>From: Henri Verbeet <hverbeet@gmail.com>
>Date: Mon, 17 Jan 2011 22:03:30 +0100
>Subject: [PATCH] r300g: Properly take the sampler view's first_level into account when sampling.
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: Brian Paul <brianp@vmware.com>
>Signed-off-by: Marek OlÅ¡Ã¡k <maraeo@gmail.com>
>---
> src/gallium/drivers/r300/r300_state_derived.c |   36 ++++++++++++++----------
> 1 files changed, 21 insertions(+), 15 deletions(-)
>
>diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c
>index a1e116f..83a173c 100644
>--- a/src/gallium/drivers/r300/r300_state_derived.c
>+++ b/src/gallium/drivers/r300/r300_state_derived.c
>@@ -743,7 +743,7 @@ static void r300_merge_textures_and_samplers(struct r300_context* r300)
>     struct r300_sampler_state *sampler;
>     struct r300_sampler_view *view;
>     struct r300_resource *tex;
>-    unsigned min_level, max_level, i, j, size;
>+    unsigned base_level, min_level, level_count, i, j, size;
>     unsigned count = MIN2(state->sampler_view_count,
>                           state->sampler_state_count);
> 
>@@ -775,21 +775,27 @@ static void r300_merge_textures_and_samplers(struct r300_context* r300)
>                                       r300->screen->caps.is_r500);
> 
>             /* determine min/max levels */
>-            max_level = MIN3(sampler->max_lod + view->base.u.tex.first_level,
>-                             tex->b.b.b.last_level, view->base.u.tex.last_level);
>-            min_level = MIN2(sampler->min_lod + view->base.u.tex.first_level,
>-                             max_level);
>-
>-            if (tex->tex.is_npot && min_level > 0) {
>-                /* Even though we do not implement mipmapping for NPOT
>-                 * textures, we should at least honor the minimum level
>-                 * which is allowed to be displayed. We do this by setting up
>-                 * the i-th mipmap level as the zero level. */
>-                unsigned offset = tex->tex_offset +
>-                                  tex->tex.offset_in_bytes[min_level];
>+            base_level = view->base.u.tex.first_level;
>+            min_level = sampler->min_lod;
>+            level_count = MIN3(sampler->max_lod,
>+                               tex->b.b.b.last_level - base_level,
>+                               view->base.u.tex.last_level - base_level);
>+
>+            if (base_level + min_level) {
>+                unsigned offset;
>+
>+                if (tex->tex.is_npot) {
>+                    /* Even though we do not implement mipmapping for NPOT
>+                     * textures, we should at least honor the minimum level
>+                     * which is allowed to be displayed. We do this by setting up
>+                     * an i-th mipmap level as the zero level. */
>+                    base_level += min_level;
>+                }
>+                offset = tex->tex_offset +
>+                         tex->tex.offset_in_bytes[base_level];
> 
>                 r300_texture_setup_format_state(r300->screen, tex,
>-                                                min_level,
>+                                                base_level,
>                                                 &texstate->format);
>                 texstate->format.tile_config |= offset & 0xffffffe0;
>                 assert((offset & 0x1f) == 0);
>@@ -866,7 +872,7 @@ static void r300_merge_textures_and_samplers(struct r300_context* r300)
>                 }
>             } else {
>                 /* the MAX_MIP level is the largest (finest) one */
>-                texstate->format.format0 |= R300_TX_NUM_LEVELS(max_level);
>+                texstate->format.format0 |= R300_TX_NUM_LEVELS(level_count);
>                 texstate->filter0 |= R300_TX_MAX_MIP_LEVEL(min_level);
>             }
> 
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 33886: 42910 | 42911 | 42912 | 42913 | 44101 | 45093

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.