summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2010-08-25 18:01:51 +0100
committerKeith Whitwell <[email protected]>2010-08-25 18:01:51 +0100
commitd4bfd8a24a4c2b246b55888d4983ddcf665b6976 (patch)
tree2f400afea3cbe8638da2d5013995479179806ab9
parent14ac294e1a67577d3f2b63e77272ec472a93c224 (diff)
llvmpipe: fix bad patch application
-rw-r--r--src/gallium/drivers/llvmpipe/lp_setup.c9
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 0c6d2de193c..9aa6c4bf38e 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);