Attachment 37538 Details for Bug 29372 – possible fix

[patch] possible fix

0001-r300g-handle-polygon-offset-correctly.patch (text/plain), 2.15 KB, created by Marek Olšák on 2010-08-03 05:17:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Olšák

Created: 2010-08-03 05:17:01 UTC

Size: 2.15 KB

patch

obsolete

>From 72b8c373dbd17f70c01f664c6b37f624bab577ba Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <maraeo@gmail.com>
>Date: Tue, 3 Aug 2010 14:15:24 +0200
>Subject: [PATCH] r300g: handle polygon offset correctly
>
>Should fix:
>https://bugs.freedesktop.org/show_bug.cgi?id=29372
>---
> src/gallium/drivers/r300/r300_state.c |   12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c
>index bc0c86d..86c9107 100644
>--- a/src/gallium/drivers/r300/r300_state.c
>+++ b/src/gallium/drivers/r300/r300_state.c
>@@ -744,7 +744,7 @@ static void
>     r300_mark_fb_state_dirty(r300, R300_CHANGED_FB_STATE);
> 
>     /* Polygon offset depends on the zbuffer bit depth. */
>-    if (state->zsbuf && r300->polygon_offset_enabled) {
>+    if (state->zsbuf) {
>         switch (util_format_get_blocksize(state->zsbuf->texture->format)) {
>             case 2:
>                 zbuffer_bpp = 16;
>@@ -756,7 +756,9 @@ static void
> 
>         if (r300->zbuffer_bpp != zbuffer_bpp) {
>             r300->zbuffer_bpp = zbuffer_bpp;
>-            r300->rs_state.dirty = TRUE;
>+
>+            if (r300->polygon_offset_enabled)
>+                r300->rs_state.dirty = TRUE;
>         }
>     }
> 
>@@ -1095,9 +1097,7 @@ static void r300_bind_rs_state(struct pipe_context* pipe, void* state)
>     }
> 
>     if (rs) {
>-        r300->polygon_offset_enabled = (rs->rs.offset_point ||
>-                                        rs->rs.offset_line ||
>-                                        rs->rs.offset_tri);
>+        r300->polygon_offset_enabled = rs->polygon_offset_enable;
>         r300->sprite_coord_enable = rs->rs.sprite_coord_enable;
>         r300->two_sided_color = rs->rs.light_twoside;
>     } else {
>@@ -1107,7 +1107,7 @@ static void r300_bind_rs_state(struct pipe_context* pipe, void* state)
>     }
> 
>     UPDATE_STATE(state, r300->rs_state);
>-    r300->rs_state.size = 25 + (r300->polygon_offset_enabled ? 5 : 0);
>+    r300->rs_state.size = 25 + (rs->polygon_offset_enable ? 5 : 0);
> 
>     if (last_sprite_coord_enable != r300->sprite_coord_enable ||
>         last_two_sided_color != r300->two_sided_color) {
>-- 
>1.7.0.4
>

Actions: View | Splinter Review

Attachments on bug 29372: 37538 | 37539

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.