Attachment 41199 Details for Bug 28800 – possible fix

[patch] possible fix

0001-r300g-always-re-bind-already-bound-textures.patch (text/plain), 2.35 KB, created by Marek Olšák on 2010-12-17 00:11:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Olšák

Created: 2010-12-17 00:11:49 UTC

Size: 2.35 KB

patch

obsolete

>From 517a6767206c9346ea3d08b75975b424368f569c Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <maraeo@gmail.com>
>Date: Fri, 17 Dec 2010 08:59:32 +0100
>Subject: [PATCH] r300g: always re-bind already bound textures
>
>Even though a currently-bound texture stays bound, its cache region must be
>re-assigned depending on the occupancy of other texture units.
>
>NOTE: This is a candidate for both the 7.9 and 7.10 branches.
>---
> src/gallium/drivers/r300/r300_state.c |   32 +++++++++++++++-----------------
> 1 files changed, 15 insertions(+), 17 deletions(-)
>
>diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c
>index 0ad8a1f..f902db5 100644
>--- a/src/gallium/drivers/r300/r300_state.c
>+++ b/src/gallium/drivers/r300/r300_state.c
>@@ -1298,29 +1298,27 @@ static void r300_set_fragment_sampler_views(struct pipe_context* pipe,
>     }
> 
>     for (i = 0; i < count; i++) {
>-        if (&state->sampler_views[i]->base != views[i]) {
>-            pipe_sampler_view_reference(
>-                    (struct pipe_sampler_view**)&state->sampler_views[i],
>-                    views[i]);
>+        pipe_sampler_view_reference(
>+                (struct pipe_sampler_view**)&state->sampler_views[i],
>+                views[i]);
> 
>-            if (!views[i]) {
>-                continue;
>-            }
>+        if (!views[i]) {
>+            continue;
>+        }
> 
>-            /* A new sampler view (= texture)... */
>-            dirty_tex = TRUE;
>+        /* A new sampler view (= texture)... */
>+        dirty_tex = TRUE;
> 
>-            /* Set the texrect factor in the fragment shader.
>+        /* Set the texrect factor in the fragment shader.
>              * Needed for RECT and NPOT fallback. */
>-            texture = r300_texture(views[i]->texture);
>-            if (texture->desc.is_npot) {
>-                r300_mark_atom_dirty(r300, &r300->fs_rc_constant_state);
>-            }
>+        texture = r300_texture(views[i]->texture);
>+        if (texture->desc.is_npot) {
>+            r300_mark_atom_dirty(r300, &r300->fs_rc_constant_state);
>+        }
> 
>-            state->sampler_views[i]->texcache_region =
>+        state->sampler_views[i]->texcache_region =
>                 r300_assign_texture_cache_region(view_index, real_num_views);
>-            view_index++;
>-        }
>+        view_index++;
>     }
> 
>     for (i = count; i < tex_units; i++) {
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 28800: 36583 | 36647 | 36972 | 36973 | 36974 | 37512 | 41170 | 41192 | 41199

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.