Merge tgsi/exec and tgsi/util directories.

[mesa.git] / src / gallium / drivers / i965simple / brw_wm_decl.c

diff --git a/src/gallium/drivers/i965simple/brw_wm_decl.c b/src/gallium/drivers/i965simple/brw_wm_decl.c
index 74ccfd494a4abc9d10a755b3585fda96494de62f..e6f1a44817db062b9725117ce034be966823672a 100644 (file)
--- a/src/gallium/drivers/i965simple/brw_wm_decl.c
+++ b/src/gallium/drivers/i965simple/brw_wm_decl.c
@@ -4,7 +4,7 @@
 #include "brw_wm.h"
 #include "pipe/p_util.h"
 #include "pipe/p_shader_tokens.h"
-#include "tgsi/util/tgsi_parse.h"
+#include "tgsi/tgsi_parse.h"
 
 static struct brw_reg alloc_tmp(struct brw_wm_compile *c)
 {
@@ -351,18 +351,16 @@ void brw_wm_emit_decls(struct brw_wm_compile *c)
       case TGSI_TOKEN_TYPE_DECLARATION:
       {
         const struct tgsi_full_declaration *decl = &parse.FullToken.FullDeclaration;
-        unsigned first = decl->u.DeclarationRange.First;
-        unsigned last = decl->u.DeclarationRange.Last;
+        unsigned first = decl->DeclarationRange.First;
+        unsigned last = decl->DeclarationRange.Last;
         unsigned mask = decl->Declaration.UsageMask; /* ? */
         unsigned i;
 
         if (decl->Declaration.File != TGSI_FILE_INPUT)
            break;
 
-        assert(decl->Declaration.Interpolate);
-
         for( i = first; i <= last; i++ ) {
-           switch (decl->Interpolation.Interpolate) {
+           switch (decl->Declaration.Interpolate) {
            case TGSI_INTERPOLATE_CONSTANT:
               emit_cinterp(c, i, mask);
               break;