summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-04-23 18:09:20 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-04-23 18:09:20 -0600
commitbb4f8ae1f93d17c57fd8f62bea24b48131e02037 (patch)
tree3393cef0cb1dc48b99da3ab17a04c0f4f87fc588 /src/gallium
parent14d1ca8d867d6e44c756cb759f92421107118b2e (diff)
gallium: reorder code to fix a recursive flush
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/auxiliary/draw/draw_pipe_pstipple.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/draw/draw_pipe_pstipple.c b/src/gallium/auxiliary/draw/draw_pipe_pstipple.c
index f8156fe731..da303a13ad 100644
--- a/src/gallium/auxiliary/draw/draw_pipe_pstipple.c
+++ b/src/gallium/auxiliary/draw/draw_pipe_pstipple.c
@@ -537,11 +537,9 @@ pstip_flush(struct draw_stage *stage, unsigned flags)
stage->tri = pstip_first_tri;
stage->next->flush( stage->next, flags );
- /* restore original frag shader */
- pstip->driver_bind_fs_state(pipe, pstip->fs->driver_fs);
-
- /* restore original texture, sampler state */
+ /* restore original frag shader, texture, sampler state */
draw->suspend_flushing = TRUE;
+ pstip->driver_bind_fs_state(pipe, pstip->fs->driver_fs);
pstip->driver_bind_sampler_states(pipe, pstip->num_samplers,
pstip->state.samplers);
pstip->driver_set_sampler_textures(pipe, pstip->num_textures,