Mesa (mesa_7_7_branch): llvmpipe: Silence compiler warnings.

[Vinson Lee]

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

Author: Vinson Lee <vlee at vmware.com>
Date:   Mon Dec 28 18:05:30 2009 -0800

llvmpipe: Silence compiler warnings.

---

 src/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c |    7 ++++++-
 src/gallium/drivers/llvmpipe/lp_tex_cache.h    |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c b/src/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c
index 52554b9..0dea2cd 100644
--- a/src/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c
+++ b/src/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c
@@ -446,7 +446,12 @@ emit_instruction(
 {
    unsigned chan_index;
    LLVMValueRef src0, src1, src2;
-   LLVMValueRef tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
+   LLVMValueRef tmp0, tmp1, tmp2;
+   LLVMValueRef tmp3 = NULL;
+   LLVMValueRef tmp4 = NULL;
+   LLVMValueRef tmp5 = NULL;
+   LLVMValueRef tmp6 = NULL;
+   LLVMValueRef tmp7 = NULL;
    LLVMValueRef res;
    LLVMValueRef dst0[NUM_CHANNELS];
 
diff --git a/src/gallium/drivers/llvmpipe/lp_tex_cache.h b/src/gallium/drivers/llvmpipe/lp_tex_cache.h
index 9fa6c36..05fded7 100644
--- a/src/gallium/drivers/llvmpipe/lp_tex_cache.h
+++ b/src/gallium/drivers/llvmpipe/lp_tex_cache.h
@@ -115,7 +115,7 @@ extern const struct llvmpipe_cached_tex_tile *
 lp_find_cached_tex_tile(struct llvmpipe_tex_tile_cache *tc,
                         union tex_tile_address addr );
 
-static INLINE const union tex_tile_address
+static INLINE union tex_tile_address
 tex_tile_address( unsigned x,
                   unsigned y,
                   unsigned z,