From: Brian Paul <brianp@vmware.com>
Date: Thu, 9 Aug 2012 16:14:51 +0000 (-0600)
Subject: svga: move result->key expression after result != NULL check
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d733e5da9c50f0bb93549642304da2f211879bb9;p=mesa.git

svga: move result->key expression after result != NULL check
---

diff --git a/src/gallium/drivers/svga/svga_state_constants.c b/src/gallium/drivers/svga/svga_state_constants.c
index a8711541776..77c93493a8d 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 );