nv30: update nouveau_class.h

diff --git a/src/gallium/drivers/nouveau/nouveau_class.h b/src/gallium/drivers/nouveau/nouveau_class.h
index 3c29fa0d1be2269a7262c3a8ef61ef389aa8c108..4ec5062709e5b9fdd09fa1fa06a5ee51c5b90e62 100644 (file)
--- a/src/gallium/drivers/nouveau/nouveau_class.h
+++ b/src/gallium/drivers/nouveau/nouveau_class.h
@@ -3759,8 +3759,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV34TCL_COLOR1_PITCH                                                          0x0000021c
 #define  NV34TCL_RT_ENABLE                                                             0x00000220
 #define   NV34TCL_RT_ENABLE_MRT                                                                (1 <<  4)
-#define   NV34TCL_RT_ENABLE_COLOR3                                                     (1 <<  3)
-#define   NV34TCL_RT_ENABLE_COLOR2                                                     (1 <<  2)
 #define   NV34TCL_RT_ENABLE_COLOR1                                                     (1 <<  1)
 #define   NV34TCL_RT_ENABLE_COLOR0                                                     (1 <<  0)
 #define  NV34TCL_LMA_DEPTH_PITCH                                                       0x0000022c
@@ -3876,6 +3874,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define    NV34TCL_BLEND_FUNC_DST_ALPHA_CONSTANT_ALPHA                                 0x80030000
 #define    NV34TCL_BLEND_FUNC_DST_ALPHA_ONE_MINUS_CONSTANT_ALPHA                       0x80040000
 #define  NV34TCL_BLEND_COLOR                                                           0x0000031c
+#define   NV34TCL_BLEND_COLOR_B_SHIFT                                                  0
+#define   NV34TCL_BLEND_COLOR_B_MASK                                                   0x000000ff
+#define   NV34TCL_BLEND_COLOR_G_SHIFT                                                  8
+#define   NV34TCL_BLEND_COLOR_G_MASK                                                   0x0000ff00
+#define   NV34TCL_BLEND_COLOR_R_SHIFT                                                  16
+#define   NV34TCL_BLEND_COLOR_R_MASK                                                   0x00ff0000
+#define   NV34TCL_BLEND_COLOR_A_SHIFT                                                  24
+#define   NV34TCL_BLEND_COLOR_A_MASK                                                   0xff000000
 #define  NV34TCL_BLEND_EQUATION                                                                0x00000320
 #define   NV34TCL_BLEND_EQUATION_FUNC_ADD                                              0x00008006
 #define   NV34TCL_BLEND_EQUATION_MIN                                                   0x00008007
@@ -4338,6 +4344,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV34TCL_FRONT_FACE_CCW                                                       0x00000901
 #define  NV34TCL_POLYGON_SMOOTH_ENABLE                                                 0x00001838
 #define  NV34TCL_CULL_FACE_ENABLE                                                      0x0000183c
+#define  NV34TCL_TX_PALETTE_OFFSET(x)                                                  (0x00001840+((x)*4))
+#define  NV34TCL_TX_PALETTE_OFFSET__SIZE                                               0x00000004
 #define  NV34TCL_VTX_ATTR_2F_X(x)                                                      (0x00001880+((x)*8))
 #define  NV34TCL_VTX_ATTR_2F_X__SIZE                                                   0x00000010
 #define  NV34TCL_VTX_ATTR_2F_Y(x)                                                      (0x00001884+((x)*8))
@@ -4376,7 +4384,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV34TCL_TX_FORMAT__SIZE                                                       0x00000004
 #define   NV34TCL_TX_FORMAT_DMA0                                                       (1 <<  0)
 #define   NV34TCL_TX_FORMAT_DMA1                                                       (1 <<  1)
-#define   NV34TCL_TX_FORMAT_CUBE_MAP                                                   (1 <<  2)
+#define   NV34TCL_TX_FORMAT_CUBIC                                                      (1 <<  2)
+#define   NV34TCL_TX_FORMAT_NO_BORDER                                                  (1 <<  3)
 #define   NV34TCL_TX_FORMAT_DIMS_SHIFT                                                 4
 #define   NV34TCL_TX_FORMAT_DIMS_MASK                                                  0x000000f0
 #define    NV34TCL_TX_FORMAT_DIMS_1D                                                   0x00000010
@@ -4389,6 +4398,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define    NV34TCL_TX_FORMAT_FORMAT_A1R5G5B5                                           0x00000200
 #define    NV34TCL_TX_FORMAT_FORMAT_A8_RECT                                            0x00000300
 #define    NV34TCL_TX_FORMAT_FORMAT_A4R4G4B4                                           0x00000400
+#define    NV34TCL_TX_FORMAT_FORMAT_R5G6B5                                             0x00000500
 #define    NV34TCL_TX_FORMAT_FORMAT_A8R8G8B8                                           0x00000600
 #define    NV34TCL_TX_FORMAT_FORMAT_X8R8G8B8                                           0x00000700
 #define    NV34TCL_TX_FORMAT_FORMAT_INDEX8                                             0x00000b00
@@ -4396,22 +4406,26 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define    NV34TCL_TX_FORMAT_FORMAT_DXT3                                               0x00000e00
 #define    NV34TCL_TX_FORMAT_FORMAT_DXT5                                               0x00000f00
 #define    NV34TCL_TX_FORMAT_FORMAT_A1R5G5B5_RECT                                      0x00001000
+#define    NV34TCL_TX_FORMAT_FORMAT_R5G6B5_RECT                                                0x00001100
 #define    NV34TCL_TX_FORMAT_FORMAT_A8R8G8B8_RECT                                      0x00001200
 #define    NV34TCL_TX_FORMAT_FORMAT_L8_RECT                                            0x00001300
 #define    NV34TCL_TX_FORMAT_FORMAT_A8L8                                               0x00001a00
 #define    NV34TCL_TX_FORMAT_FORMAT_A8_RECT2                                           0x00001b00
-#define    NV34TCL_TX_FORMAT_FORMAT_R8G8B8_RECT                                                0x00001e00
 #define    NV34TCL_TX_FORMAT_FORMAT_A4R4G4B4_RECT                                      0x00001d00
+#define    NV34TCL_TX_FORMAT_FORMAT_R8G8B8_RECT                                                0x00001e00
 #define    NV34TCL_TX_FORMAT_FORMAT_L8A8_RECT                                          0x00002000
 #define    NV34TCL_TX_FORMAT_FORMAT_A16                                                        0x00003200
+#define    NV34TCL_TX_FORMAT_FORMAT_HILO16                                             0x00003300
 #define    NV34TCL_TX_FORMAT_FORMAT_A16_RECT                                           0x00003500
+#define    NV34TCL_TX_FORMAT_FORMAT_HILO16_RECT                                                0x00003600
+#define    NV34TCL_TX_FORMAT_FORMAT_HILO8                                              0x00004400
+#define    NV34TCL_TX_FORMAT_FORMAT_SIGNED_HILO8                                       0x00004500
+#define    NV34TCL_TX_FORMAT_FORMAT_HILO8_RECT                                         0x00004600
+#define    NV34TCL_TX_FORMAT_FORMAT_SIGNED_HILO8_RECT                                  0x00004700
 #define    NV34TCL_TX_FORMAT_FORMAT_FLOAT_RGBA16_NV                                    0x00004a00
 #define    NV34TCL_TX_FORMAT_FORMAT_FLOAT_RGBA32_NV                                    0x00004b00
 #define    NV34TCL_TX_FORMAT_FORMAT_FLOAT_R32_NV                                       0x00004c00
-#define   NV34TCL_TX_FORMAT_NPOT                                                       (1 << 12)
-#define   NV34TCL_TX_FORMAT_RECT                                                       (1 << 14)
-#define   NV34TCL_TX_FORMAT_MIPMAP_LEVELS_SHIFT                                                16
-#define   NV34TCL_TX_FORMAT_MIPMAP_LEVELS_MASK                                         0x000f0000
+#define   NV34TCL_TX_FORMAT_MIPMAP                                                     (1 << 19)
 #define   NV34TCL_TX_FORMAT_BASE_SIZE_U_SHIFT                                          20
 #define   NV34TCL_TX_FORMAT_BASE_SIZE_U_MASK                                           0x00f00000
 #define   NV34TCL_TX_FORMAT_BASE_SIZE_V_SHIFT                                          24
@@ -4428,12 +4442,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define    NV34TCL_TX_WRAP_S_CLAMP_TO_BORDER                                           0x00000004
 #define    NV34TCL_TX_WRAP_S_CLAMP                                                     0x00000005
 #define   NV34TCL_TX_WRAP_T_SHIFT                                                      8
-#define   NV34TCL_TX_WRAP_T_MASK                                                       0x0000ff00
+#define   NV34TCL_TX_WRAP_T_MASK                                                       0x00000f00
 #define    NV34TCL_TX_WRAP_T_REPEAT                                                    0x00000100
 #define    NV34TCL_TX_WRAP_T_MIRRORED_REPEAT                                           0x00000200
 #define    NV34TCL_TX_WRAP_T_CLAMP_TO_EDGE                                             0x00000300
 #define    NV34TCL_TX_WRAP_T_CLAMP_TO_BORDER                                           0x00000400
 #define    NV34TCL_TX_WRAP_T_CLAMP                                                     0x00000500
+#define   NV34TCL_TX_WRAP_EXPAND_NORMAL_SHIFT                                          12
+#define   NV34TCL_TX_WRAP_EXPAND_NORMAL_MASK                                           0x0000f000
 #define   NV34TCL_TX_WRAP_R_SHIFT                                                      16
 #define   NV34TCL_TX_WRAP_R_MASK                                                       0x00ff0000
 #define    NV34TCL_TX_WRAP_R_REPEAT                                                    0x00010000
@@ -4441,8 +4457,28 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define    NV34TCL_TX_WRAP_R_CLAMP_TO_EDGE                                             0x00030000
 #define    NV34TCL_TX_WRAP_R_CLAMP_TO_BORDER                                           0x00040000
 #define    NV34TCL_TX_WRAP_R_CLAMP                                                     0x00050000
+#define   NV34TCL_TX_WRAP_RCOMP_SHIFT                                                  28
+#define   NV34TCL_TX_WRAP_RCOMP_MASK                                                   0xf0000000
+#define    NV34TCL_TX_WRAP_RCOMP_NEVER                                                 0x00000000
+#define    NV34TCL_TX_WRAP_RCOMP_GREATER                                               0x10000000
+#define    NV34TCL_TX_WRAP_RCOMP_EQUAL                                                 0x20000000
+#define    NV34TCL_TX_WRAP_RCOMP_GEQUAL                                                        0x30000000
+#define    NV34TCL_TX_WRAP_RCOMP_LESS                                                  0x40000000
+#define    NV34TCL_TX_WRAP_RCOMP_NOTEQUAL                                              0x50000000
+#define    NV34TCL_TX_WRAP_RCOMP_LEQUAL                                                        0x60000000
+#define    NV34TCL_TX_WRAP_RCOMP_ALWAYS                                                        0x70000000
 #define  NV34TCL_TX_ENABLE(x)                                                          (0x00001a0c+((x)*32))
 #define  NV34TCL_TX_ENABLE__SIZE                                                       0x00000004
+#define   NV34TCL_TX_ENABLE_ANISO_SHIFT                                                        4
+#define   NV34TCL_TX_ENABLE_ANISO_MASK                                                 0x00000030
+#define    NV34TCL_TX_ENABLE_ANISO_NONE                                                        0x00000000
+#define    NV34TCL_TX_ENABLE_ANISO_2X                                                  0x00000010
+#define    NV34TCL_TX_ENABLE_ANISO_4X                                                  0x00000020
+#define    NV34TCL_TX_ENABLE_ANISO_8X                                                  0x00000030
+#define   NV34TCL_TX_ENABLE_MIPMAP_MAX_LOD_SHIFT                                       14
+#define   NV34TCL_TX_ENABLE_MIPMAP_MAX_LOD_MASK                                                0x0003c000
+#define   NV34TCL_TX_ENABLE_MIPMAP_MIN_LOD_SHIFT                                       26
+#define   NV34TCL_TX_ENABLE_MIPMAP_MIN_LOD_MASK                                                0x3c000000
 #define   NV34TCL_TX_ENABLE_ENABLE                                                     (1 << 30)
 #define  NV34TCL_TX_SWIZZLE(x)                                                         (0x00001a10+((x)*32))
 #define  NV34TCL_TX_SWIZZLE__SIZE                                                      0x00000004
@@ -4494,6 +4530,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV34TCL_TX_SWIZZLE_RECT_PITCH_MASK                                           0xffff0000
 #define  NV34TCL_TX_FILTER(x)                                                          (0x00001a14+((x)*32))
 #define  NV34TCL_TX_FILTER__SIZE                                                       0x00000004
+#define   NV34TCL_TX_FILTER_LOD_BIAS_SHIFT                                             8
+#define   NV34TCL_TX_FILTER_LOD_BIAS_MASK                                              0x00000f00
 #define   NV34TCL_TX_FILTER_MINIFY_SHIFT                                               16
 #define   NV34TCL_TX_FILTER_MINIFY_MASK                                                        0x000f0000
 #define    NV34TCL_TX_FILTER_MINIFY_NEAREST                                            0x00010000
@@ -4539,6 +4577,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV34TCL_FP_CONTROL_USED_REGS_MINUS1_DIV2_SHIFT                               0
 #define   NV34TCL_FP_CONTROL_USED_REGS_MINUS1_DIV2_MASK                                        0x0000000f
 #define  NV34TCL_MULTISAMPLE_CONTROL                                                   0x00001d7c
+#define   NV34TCL_MULTISAMPLE_CONTROL_ENABLE                                           (1 <<  0)
+#define   NV34TCL_MULTISAMPLE_CONTROL_SAMPLE_ALPHA_TO_COVERAGE                         (1 <<  4)
+#define   NV34TCL_MULTISAMPLE_CONTROL_SAMPLE_ALPHA_TO_ONE                              (1 <<  8)
+#define   NV34TCL_MULTISAMPLE_CONTROL_SAMPLE_COVERAGE_SHIFT                            16
+#define   NV34TCL_MULTISAMPLE_CONTROL_SAMPLE_COVERAGE_MASK                             0xffff0000
 #define  NV34TCL_CLEAR_DEPTH_VALUE                                                     0x00001d8c
 #define  NV34TCL_CLEAR_COLOR_VALUE                                                     0x00001d90
 #define   NV34TCL_CLEAR_COLOR_VALUE_B_SHIFT                                            0