Mesa (master): llvmpipe: fix bad patch application

Keith Whitwell keithw at kemper.freedesktop.org
Wed Aug 25 17:04:01 UTC 2010


Module: Mesa
Branch: master
Commit: d4bfd8a24a4c2b246b55888d4983ddcf665b6976
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d4bfd8a24a4c2b246b55888d4983ddcf665b6976

Author: Keith Whitwell <keithw at vmware.com>
Date:   Wed Aug 25 18:01:51 2010 +0100

llvmpipe: fix bad patch application

---

 src/gallium/drivers/llvmpipe/lp_setup.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_setup.c b/src/gallium/drivers/llvmpipe/lp_setup.c
index 0c6d2de..9aa6c4b 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup.c
@@ -815,6 +815,10 @@ lp_setup_update_state( struct lp_setup_context *setup )
          for (i = 0; i < Elements(setup->fs.current_tex); i++) {
             if (setup->fs.current_tex[i])
                lp_scene_add_resource_reference(scene, setup->fs.current_tex[i]);
+         }
+      }
+   }
+
    if (setup->dirty & LP_SETUP_NEW_SCISSOR) {
       setup->draw_region = setup->framebuffer;
       if (setup->scissor_test) {
@@ -823,11 +827,6 @@ lp_setup_update_state( struct lp_setup_context *setup )
       }
    }
                                       
-
-         }
-      }
-   }
-
    setup->dirty = 0;
 
    assert(setup->fs.stored);




More information about the mesa-commit mailing list