st/mesa: remove special-case cyl-wrap code
authorBrian Paul <brianp@vmware.com>
Fri, 5 Feb 2010 17:18:25 +0000 (10:18 -0700)
committerMichal Krol <michal@vmware.com>
Tue, 9 Feb 2010 14:32:56 +0000 (15:32 +0100)
Cylinder wrap mode works with perspective interpolation now.

src/mesa/state_tracker/st_program.c

index e939ab382182ab8d42eab31bcb1262203e71ab28..21ad6fef2b47788f65a73f17ae1b6b273fac5eb8 100644 (file)
@@ -33,7 +33,6 @@
 
 #include "main/imports.h"
 #include "main/mtypes.h"
-#include "shader/prog_parameter.h"
 #include "shader/prog_print.h"
 #include "shader/programopt.h"
 
@@ -368,14 +367,7 @@ st_translate_fragment_program(struct st_context *st,
             assert(attr >= FRAG_ATTRIB_TEX0);
             stfp->input_semantic_index[slot] = (attr - FRAG_ATTRIB_TEX0);
             stfp->input_semantic_name[slot] = TGSI_SEMANTIC_GENERIC;
-
-            /* XXX this test is very temporary */
-            if (stfp->Base.Base.InputFlags[0] & PROG_PARAM_BIT_CYL_WRAP) {
-               interpMode[slot] = TGSI_INTERPOLATE_LINEAR;
-            }
-            else {
-               interpMode[slot] = TGSI_INTERPOLATE_PERSPECTIVE;
-            }
+            interpMode[slot] = TGSI_INTERPOLATE_PERSPECTIVE;
             break;
          }
       }