Mesa (7.9): st/mesa: initialize key in st_vp_varient

Marek Olšák mareko at kemper.freedesktop.org
Mon Dec 6 21:46:26 UTC 2010


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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Dec  5 06:43:18 2010 +0100

st/mesa: initialize key in st_vp_varient

This fixes endless vertex shader recompilations in find_translated_vp
if the shader contains an edge flag output.

NOTE: This is a candidate for the 7.9 branch.

Signed-off-by Brian Paul <brianp at vmware.com>
(cherry picked from commit c0c929cdac75a9a0077d74c87b525b65f0a3b6c8)

---

 src/mesa/state_tracker/st_program.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 8c2d8b6..63faa4a 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -216,6 +216,8 @@ st_translate_vertex_program(struct st_context *st,
       return NULL;
    }
 
+   vpv->key = *key;
+
    vpv->num_inputs = stvp->num_inputs;
    num_outputs = stvp->num_outputs;
    if (key->passthrough_edgeflags) {




More information about the mesa-commit mailing list