Mesa (master): llvmpipe: Update for TGSI_INTERPOLATE_COLOR.

[Jose Fonseca]

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

Author: José Fonseca <jfonseca at vmware.com>
Date:   Wed Jan 11 17:14:26 2012 +0000

llvmpipe: Update for TGSI_INTERPOLATE_COLOR.

Not thoroughly tested nor reviewed. But should at least prevent the
assertion failure.

---

 src/gallium/drivers/llvmpipe/lp_state_fs.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index 53e35ef..c7bab82 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -1025,19 +1025,15 @@ llvmpipe_create_fs_state(struct pipe_context *pipe,
       case TGSI_INTERPOLATE_PERSPECTIVE:
 	 shader->inputs[i].interp = LP_INTERP_PERSPECTIVE;
 	 break;
+      case TGSI_INTERPOLATE_COLOR:
+	 shader->inputs[i].interp = LP_INTERP_COLOR;
+	 break;
       default:
 	 assert(0);
 	 break;
       }
 
       switch (shader->info.base.input_semantic_name[i]) {
-      case TGSI_SEMANTIC_COLOR:
-         /* Colors may be either linearly or constant interpolated in
-	  * the fragment shader, but that information isn't available
-	  * here.  Mark color inputs and fix them up later.
-          */
-	 shader->inputs[i].interp = LP_INTERP_COLOR;
-         break;
       case TGSI_SEMANTIC_FACE:
 	 shader->inputs[i].interp = LP_INTERP_FACING;
 	 break;