New ATTRIB interpolation type for vertex program inputs/declarations.

diff --git a/src/mesa/pipe/tgsi/exec/tgsi_build.c b/src/mesa/pipe/tgsi/exec/tgsi_build.c
index 78f648aae256ab492985e89d622d49bf9acfa667..56827726f5ceafe31424d863ab70f5ad48b18570 100755 (executable)
--- a/src/mesa/pipe/tgsi/exec/tgsi_build.c
+++ b/src/mesa/pipe/tgsi/exec/tgsi_build.c
@@ -294,7 +294,7 @@ tgsi_build_declaration_interpolation(
 {
    struct tgsi_declaration_interpolation di;
 
-   assert( interpolate <= TGSI_INTERPOLATE_PERSPECTIVE );
+   assert( interpolate <= TGSI_INTERPOLATE_ATTRIB );
 
    di = tgsi_default_declaration_interpolation();
    di.Interpolate = interpolate;

diff --git a/src/mesa/pipe/tgsi/exec/tgsi_dump.c b/src/mesa/pipe/tgsi/exec/tgsi_dump.c
index c179659aee8b06d6135736e990b8b0fcfdbd5bef..463f841dde01899f1d113480ff0359d7c8107174 100755 (executable)
--- a/src/mesa/pipe/tgsi/exec/tgsi_dump.c
+++ b/src/mesa/pipe/tgsi/exec/tgsi_dump.c
@@ -189,14 +189,16 @@ static const char *TGSI_INTERPOLATES[] =
 {
    "INTERPOLATE_CONSTANT",
    "INTERPOLATE_LINEAR",
-   "INTERPOLATE_PERSPECTIVE"
+   "INTERPOLATE_PERSPECTIVE",
+   "INTERPOLATE_ATTRIB"
 };
 
 static const char *TGSI_INTERPOLATES_SHORT[] =
 {
    "CONSTANT",
    "LINEAR",
-   "PERSPECTIVE"
+   "PERSPECTIVE",
+   "ATTRIB"
 };
 
 static const char *TGSI_SEMANTICS[] =

diff --git a/src/mesa/pipe/tgsi/exec/tgsi_token.h b/src/mesa/pipe/tgsi/exec/tgsi_token.h
index 8d5992facbfb7b6f026aa245da58b9ad2f083818..80c3fcd43423372cfe2b7e2707b3d9e35544cdd7 100644 (file)
--- a/src/mesa/pipe/tgsi/exec/tgsi_token.h
+++ b/src/mesa/pipe/tgsi/exec/tgsi_token.h
@@ -96,6 +96,7 @@ struct tgsi_declaration_mask
 #define TGSI_INTERPOLATE_CONSTANT      0
 #define TGSI_INTERPOLATE_LINEAR        1
 #define TGSI_INTERPOLATE_PERSPECTIVE   2
+#define TGSI_INTERPOLATE_ATTRIB        3  /**< Vertex shader input attrib */
 
 struct tgsi_declaration_interpolation
 {

diff --git a/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c b/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
index e4a93cb60d7ef16db9e271d4497b6c75e3d42628..88de85994a932dbd95569f0edec2b1e5eda4b461 100644 (file)
--- a/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
+++ b/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
@@ -714,7 +714,7 @@ tgsi_mesa_compile_vp_program(
    for (i = 0; i < numInputs; i++) {\r
       struct tgsi_full_declaration fulldecl;\r
       fulldecl = make_input_decl(i,\r
-                                 TGSI_INTERPOLATE_CONSTANT, /* no interp */\r
+                                 TGSI_INTERPOLATE_ATTRIB,\r
                                  TGSI_WRITEMASK_XYZW,\r
                                  GL_FALSE, inputSemanticName[i],\r
                                  inputSemanticIndex[i]);\r