From: Brian Paul Date: Thu, 24 Apr 2008 00:09:20 +0000 (-0600) Subject: gallium: reorder code to fix a recursive flush X-Git-Tag: mesa-7.8~4139^2~390^2~1709 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bb4f8ae1f93d17c57fd8f62bea24b48131e02037;p=platform%2Fupstream%2Fmesa.git gallium: reorder code to fix a recursive flush --- diff --git a/src/gallium/auxiliary/draw/draw_pipe_pstipple.c b/src/gallium/auxiliary/draw/draw_pipe_pstipple.c index f8156fe..da303a1 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,