gallium: Refactor TGSI decalaration tokens.

* Incorporate declaration_interpolation into declaration itself.
* Remove declaration_mask -- always use declaration_range.

diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h
index f05e1a34b321486719dd9a87c8bce892d43278e1..282d32910ebff31fada37114d35685d7b3c57723 100644 (file)
--- a/src/gallium/include/pipe/p_shader_tokens.h
+++ b/src/gallium/include/pipe/p_shader_tokens.h
@@ -55,9 +55,6 @@ enum tgsi_file_type {
 };
 
 
-#define TGSI_DECLARE_RANGE    0
-#define TGSI_DECLARE_MASK     1
-
 #define TGSI_WRITEMASK_NONE     0x00
 #define TGSI_WRITEMASK_X        0x01
 #define TGSI_WRITEMASK_Y        0x02
@@ -75,16 +72,19 @@ enum tgsi_file_type {
 #define TGSI_WRITEMASK_YZW      0x0E
 #define TGSI_WRITEMASK_XYZW     0x0F
 
+#define TGSI_INTERPOLATE_CONSTANT      0
+#define TGSI_INTERPOLATE_LINEAR        1
+#define TGSI_INTERPOLATE_PERSPECTIVE   2
+
 struct tgsi_declaration
 {
    unsigned Type        : 4;  /* TGSI_TOKEN_TYPE_DECLARATION */
    unsigned Size        : 8;  /* UINT */
    unsigned File        : 4;  /* one of TGSI_FILE_x */
-   unsigned Declare     : 4;  /* one of TGSI_DECLARE_x */
    unsigned UsageMask   : 4;  /* bitmask of TGSI_WRITEMASK_x flags */
-   unsigned Interpolate : 1;  /* BOOL, any interpolation info? */
+   unsigned Interpolate : 4;  /* TGSI_INTERPOLATE_ */
    unsigned Semantic    : 1;  /* BOOL, any semantic info? */
-   unsigned Padding     : 5;
+   unsigned Padding     : 6;
    unsigned Extended    : 1;  /* BOOL */
 };
 
@@ -94,21 +94,6 @@ struct tgsi_declaration_range
    unsigned Last    : 16; /* UINT */
 };
 
-struct tgsi_declaration_mask
-{
-   unsigned Mask : 32; /* UINT */
-};
-
-#define TGSI_INTERPOLATE_CONSTANT      0
-#define TGSI_INTERPOLATE_LINEAR        1
-#define TGSI_INTERPOLATE_PERSPECTIVE   2
-
-struct tgsi_declaration_interpolation
-{
-   unsigned Interpolate   : 4;  /* TGSI_INTERPOLATE_ */
-   unsigned Padding       : 28;
-};
-
 #define TGSI_SEMANTIC_POSITION 0
 #define TGSI_SEMANTIC_COLOR    1
 #define TGSI_SEMANTIC_BCOLOR   2 /**< back-face color */