From e8de5c70e3370e9112a5facc870075eea60c4c46 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Sat, 23 Feb 2008 14:14:54 +0900
Subject: Bring in several forgotten MSVC fixes.

---
 src/gallium/auxiliary/tgsi/exec/tgsi_exec.c | 2 +-
 src/gallium/auxiliary/tgsi/util/tgsi_dump.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/gallium/auxiliary/tgsi')

diff --git a/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c b/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c
index d7b18dc9c5..ac52441400 100644
--- a/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c
+++ b/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c
@@ -2455,7 +2455,7 @@ tgsi_exec_machine_run( struct tgsi_exec_machine *mach )
 
    /* execute instructions, until pc is set to -1 */
    while (pc != -1) {
-      assert(pc < mach->NumInstructions);
+      assert(pc < (int) mach->NumInstructions);
       exec_instruction( mach, mach->Instructions + pc, &pc );
    }
 
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_dump.c b/src/gallium/auxiliary/tgsi/util/tgsi_dump.c
index b5c54847e0..ff74e6117c 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_dump.c
+++ b/src/gallium/auxiliary/tgsi/util/tgsi_dump.c
@@ -299,7 +299,8 @@ static const char *TGSI_SEMANTICS[] =
    "SEMANTIC_BCOLOR",
    "SEMANTIC_FOG",
    "SEMANTIC_PSIZE",
-   "SEMANTIC_GENERIC,"
+   "SEMANTIC_GENERIC",
+   "SEMANTIC_NORMAL"
 };
 
 static const char *TGSI_SEMANTICS_SHORT[] =
@@ -310,6 +311,7 @@ static const char *TGSI_SEMANTICS_SHORT[] =
    "FOG",
    "PSIZE",
    "GENERIC",
+   "NORMAL"
 };
 
 static const char *TGSI_IMMS[] =
-- 
cgit v1.2.3