From d733e5da9c50f0bb93549642304da2f211879bb9 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 9 Aug 2012 10:14:51 -0600 Subject: [PATCH] svga: move result->key expression after result != NULL check --- src/gallium/drivers/svga/svga_state_constants.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/svga/svga_state_constants.c b/src/gallium/drivers/svga/svga_state_constants.c index a871154..77c9349 100644 --- a/src/gallium/drivers/svga/svga_state_constants.c +++ b/src/gallium/drivers/svga/svga_state_constants.c @@ -320,7 +320,7 @@ static enum pipe_error emit_vs_consts(struct svga_context *svga, unsigned dirty) { const struct svga_shader_result *result = svga->state.hw_draw.vs; - const struct svga_vs_compile_key *key = &result->key.vkey; + const struct svga_vs_compile_key *key; enum pipe_error ret = PIPE_OK; unsigned offset; @@ -329,6 +329,8 @@ emit_vs_consts(struct svga_context *svga, unsigned dirty) if (result == NULL) return PIPE_OK; + key = &result->key.vkey; + /* SVGA_NEW_VS_CONST_BUFFER */ ret = emit_consts( svga, PIPE_SHADER_VERTEX ); -- 2.7.4