From: Brian Paul <brianp@vmware.com>
Date: Tue, 2 Nov 2010 17:49:10 +0000 (-0600)
Subject: llvmpipe: assign context's frag shader pointer before using it
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9fbf744389cc13e96324086a1a94afbac933e6ea;p=mesa.git

llvmpipe: assign context's frag shader pointer before using it

The call to draw_bind_fragment_shader() was using the old fragment
shader.  This bug would have really only effected the draw module's
use of the fragment shader in the wide point stage.
---

diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index e4495e33d09..1b3c32f040f 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -1062,11 +1062,11 @@ llvmpipe_bind_fs_state(struct pipe_context *pipe, void *fs)
 
    draw_flush(llvmpipe->draw);
 
+   llvmpipe->fs = fs;
+
    draw_bind_fragment_shader(llvmpipe->draw,
                              (llvmpipe->fs ? llvmpipe->fs->draw_data : NULL));
 
-   llvmpipe->fs = fs;
-
    llvmpipe->dirty |= LP_NEW_FS;
 }