mesa: Branch 'master'

[Brian Paul]

 src/mesa/shader/slang/slang_codegen.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 5ca8d4ccf24af1c174ff791f15cf9f19defd9b7e (from 6b3027e291baf6a7dc5e63780d05f89753a13d74)
Author: Brian <brian at yutani.localnet.net>
Date:   Wed Apr 18 18:05:33 2007 -0600

    fix an uninitialized variable and a warning

diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index 2f7002c..a928abd 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -1752,7 +1752,7 @@ static slang_ir_node *
 _slang_gen_temporary(GLint size)
 {
    slang_ir_storage *store;
-   slang_ir_node *n;
+   slang_ir_node *n = NULL;
 
    store = _slang_new_ir_storage(PROGRAM_TEMPORARY, -1, size);
    if (store) {
@@ -2905,7 +2905,7 @@ _slang_codegen_global_variable(slang_ass
       if (dbg) printf("ATTRIB ");
    }
    else if (var->type.qualifier == SLANG_QUAL_FIXEDINPUT) {
-      GLuint swizzle;
+      GLuint swizzle = SWIZZLE_XYZW; /* silence compiler warning */
       GLint index = _slang_input_index(varName, GL_FRAGMENT_PROGRAM_ARB,
                                        &swizzle);
       GLint size = 4; /* XXX? */