nv30: Update nouveau_class.h to get its proper defines instead of using nv40 ones
[mesa.git] / src / gallium / drivers / nouveau / nouveau_class.h
index c80461038b733ed0e6132e059d97f7e0b6ea7914..58c80ddcd24c7116edbf22fc1fadbc3b23241d5a 100644 (file)
@@ -4,7 +4,7 @@
 
 **************************************************************************
 
-   Copyright (C) 2006-2007 :
+   Copyright (C) 2006-2008 :
    Dmitry Baryshkov,
    Laurent Carlier,
    Matthieu Castet,
@@ -1740,6 +1740,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV04_DX6_MULTITEX_TRIANGLE_TLMTVERTEX_DRAWPRIMITIVE_I5_MASK                  0x00f00000
 
 
+#define NV10_DX5_TEXTURED_TRIANGLE                                                     0x00000094
+
+
+
 #define NV10TCL                                                                                0x00000056
 
 #define  NV10TCL_NOP                                                                   0x00000100
@@ -1747,31 +1751,45 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV10TCL_DMA_NOTIFY                                                            0x00000180
 #define  NV10TCL_DMA_IN_MEMORY0                                                                0x00000184
 #define  NV10TCL_DMA_IN_MEMORY1                                                                0x00000188
-#define  NV10TCL_DISPLAY_LIST                                                          0x0000018c
+#define  NV10TCL_DMA_VTXBUF0                                                           0x0000018c
 #define  NV10TCL_DMA_IN_MEMORY2                                                                0x00000194
 #define  NV10TCL_DMA_IN_MEMORY3                                                                0x00000198
-#define  NV10TCL_VIEWPORT_HORIZ                                                                0x00000200
-#define   NV10TCL_VIEWPORT_HORIZ_X_SHIFT                                               0
-#define   NV10TCL_VIEWPORT_HORIZ_X_MASK                                                        0x0000ffff
-#define   NV10TCL_VIEWPORT_HORIZ_W_SHIFT                                               16
-#define   NV10TCL_VIEWPORT_HORIZ_W_MASK                                                        0xffff0000
-#define  NV10TCL_VIEWPORT_VERT                                                         0x00000204
-#define   NV10TCL_VIEWPORT_VERT_Y_SHIFT                                                        0
-#define   NV10TCL_VIEWPORT_VERT_Y_MASK                                                 0x0000ffff
-#define   NV10TCL_VIEWPORT_VERT_H_SHIFT                                                        16
-#define   NV10TCL_VIEWPORT_VERT_H_MASK                                                 0xffff0000
-#define  NV10TCL_BUFFER_FORMAT                                                         0x00000208
-#define  NV10TCL_BUFFER_PITCH                                                          0x0000020c
-#define   NV10TCL_BUFFER_PITCH_COLOR_PITCH_SHIFT                                       0
-#define   NV10TCL_BUFFER_PITCH_COLOR_PITCH_MASK                                                0x0000ffff
-#define   NV10TCL_BUFFER_PITCH_ZETA_PITCH_SHIFT                                                16
-#define   NV10TCL_BUFFER_PITCH_ZETA_PITCH_MASK                                         0xffff0000
+#define  NV10TCL_RT_HORIZ                                                              0x00000200
+#define   NV10TCL_RT_HORIZ_X_SHIFT                                                     0
+#define   NV10TCL_RT_HORIZ_X_MASK                                                      0x0000ffff
+#define   NV10TCL_RT_HORIZ_W_SHIFT                                                     16
+#define   NV10TCL_RT_HORIZ_W_MASK                                                      0xffff0000
+#define  NV10TCL_RT_VERT                                                               0x00000204
+#define   NV10TCL_RT_VERT_Y_SHIFT                                                      0
+#define   NV10TCL_RT_VERT_Y_MASK                                                       0x0000ffff
+#define   NV10TCL_RT_VERT_H_SHIFT                                                      16
+#define   NV10TCL_RT_VERT_H_MASK                                                       0xffff0000
+#define  NV10TCL_RT_FORMAT                                                             0x00000208
+#define   NV10TCL_RT_FORMAT_TYPE_SHIFT                                                 8
+#define   NV10TCL_RT_FORMAT_TYPE_MASK                                                  0x00000f00
+#define    NV10TCL_RT_FORMAT_TYPE_LINEAR                                               0x00000100
+#define    NV10TCL_RT_FORMAT_TYPE_SWIZZLED                                             0x00000200
+#define   NV10TCL_RT_FORMAT_COLOR_SHIFT                                                        0
+#define   NV10TCL_RT_FORMAT_COLOR_MASK                                                 0x0000001f
+#define    NV10TCL_RT_FORMAT_COLOR_R5G6B5                                              0x00000003
+#define    NV10TCL_RT_FORMAT_COLOR_X8R8G8B8                                            0x00000005
+#define    NV10TCL_RT_FORMAT_COLOR_A8R8G8B8                                            0x00000008
+#define    NV10TCL_RT_FORMAT_COLOR_B8                                                  0x00000009
+#define    NV10TCL_RT_FORMAT_COLOR_X8B8G8R8                                            0x0000000f
+#define    NV10TCL_RT_FORMAT_COLOR_A8B8G8R8                                            0x00000010
+#define  NV10TCL_RT_PITCH                                                              0x0000020c
+#define   NV10TCL_RT_PITCH_COLOR_PITCH_SHIFT                                           0
+#define   NV10TCL_RT_PITCH_COLOR_PITCH_MASK                                            0x0000ffff
+#define   NV10TCL_RT_PITCH_ZETA_PITCH_SHIFT                                            16
+#define   NV10TCL_RT_PITCH_ZETA_PITCH_MASK                                             0xffff0000
 #define  NV10TCL_COLOR_OFFSET                                                          0x00000210
 #define  NV10TCL_ZETA_OFFSET                                                           0x00000214
 #define  NV10TCL_TX_OFFSET(x)                                                          (0x00000218+((x)*4))
 #define  NV10TCL_TX_OFFSET__SIZE                                                       0x00000002
 #define  NV10TCL_TX_FORMAT(x)                                                          (0x00000220+((x)*4))
 #define  NV10TCL_TX_FORMAT__SIZE                                                       0x00000002
+#define   NV10TCL_TX_FORMAT_DMA0                                                       (1 <<  0)
+#define   NV10TCL_TX_FORMAT_DMA1                                                       (1 <<  1)
 #define   NV10TCL_TX_FORMAT_CUBE_MAP                                                   (1 <<  2)
 #define   NV10TCL_TX_FORMAT_FORMAT_SHIFT                                               7
 #define   NV10TCL_TX_FORMAT_FORMAT_MASK                                                        0x00000780
@@ -2790,6 +2808,16 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV10TCL_VERTEX_WGH_1F                                                         0x00000ce4
 #define  NV10TCL_EDGEFLAG_ENABLE                                                       0x00000cec
 #define  NV10TCL_VERTEX_ARRAY_VALIDATE                                                 0x00000cf0
+#define  NV10TCL_VERTEX_ARRAY_ATTRIB_OFFSET(x)                                         (0x00000d00+((x)*8))
+#define  NV10TCL_VERTEX_ARRAY_ATTRIB_OFFSET__SIZE                                      0x00000008
+#define  NV10TCL_VERTEX_ARRAY_ATTRIB_FORMAT(x)                                         (0x00000d04+((x)*8))
+#define  NV10TCL_VERTEX_ARRAY_ATTRIB_FORMAT__SIZE                                      0x00000008
+#define   NV10TCL_VERTEX_ARRAY_ATTRIB_FORMAT_TYPE_SHIFT                                        0
+#define   NV10TCL_VERTEX_ARRAY_ATTRIB_FORMAT_TYPE_MASK                                 0x0000000f
+#define   NV10TCL_VERTEX_ARRAY_ATTRIB_FORMAT_FIELDS_SHIFT                              4
+#define   NV10TCL_VERTEX_ARRAY_ATTRIB_FORMAT_FIELDS_MASK                               0x000000f0
+#define   NV10TCL_VERTEX_ARRAY_ATTRIB_FORMAT_STRIDE_SHIFT                              8
+#define   NV10TCL_VERTEX_ARRAY_ATTRIB_FORMAT_STRIDE_MASK                               0x0000ff00
 #define  NV10TCL_VERTEX_ARRAY_OFFSET_POS                                               0x00000d00
 #define  NV10TCL_VERTEX_ARRAY_FORMAT_POS                                               0x00000d04
 #define   NV10TCL_VERTEX_ARRAY_FORMAT_POS_TYPE_SHIFT                                   0
@@ -2866,11 +2894,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV10TCL_VERTEX_BEGIN_END_QUADS                                               0x00000008
 #define   NV10TCL_VERTEX_BEGIN_END_QUAD_STRIP                                          0x00000009
 #define   NV10TCL_VERTEX_BEGIN_END_POLYGON                                             0x0000000a
-#define  NV10TCL_DRAW_INDEX                                                            0x00000e00
-#define   NV10TCL_DRAW_INDEX_I0_SHIFT                                                  0
-#define   NV10TCL_DRAW_INDEX_I0_MASK                                                   0x0000ffff
-#define   NV10TCL_DRAW_INDEX_I1_SHIFT                                                  24
-#define   NV10TCL_DRAW_INDEX_I1_MASK                                                   0xff000000
+#define  NV10TCL_VB_ELEMENT_U16                                                                0x00000e00
+#define   NV10TCL_VB_ELEMENT_U16_I0_SHIFT                                              0
+#define   NV10TCL_VB_ELEMENT_U16_I0_MASK                                               0x0000ffff
+#define   NV10TCL_VB_ELEMENT_U16_I1_SHIFT                                              16
+#define   NV10TCL_VB_ELEMENT_U16_I1_MASK                                               0xffff0000
+#define  NV10TCL_VB_ELEMENT_U32                                                                0x00001100
 #define  NV10TCL_VERTEX_BUFFER_BEGIN_END                                               0x000013fc
 #define   NV10TCL_VERTEX_BUFFER_BEGIN_END_STOP                                         0x00000000
 #define   NV10TCL_VERTEX_BUFFER_BEGIN_END_POINTS                                       0x00000001
@@ -3846,13 +3875,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define    NV34TCL_BLEND_FUNC_DST_ALPHA_ONE_MINUS_CONSTANT_COLOR                       0x80020000
 #define    NV34TCL_BLEND_FUNC_DST_ALPHA_CONSTANT_ALPHA                                 0x80030000
 #define    NV34TCL_BLEND_FUNC_DST_ALPHA_ONE_MINUS_CONSTANT_ALPHA                       0x80040000
-#define  NV34TCL_BLEND_FUNC_COLOR                                                      0x0000031c
-#define  NV34TCL_BLEND_FUNC_EQUATION                                                   0x00000320
-#define   NV34TCL_BLEND_FUNC_EQUATION_FUNC_ADD                                         0x00008006
-#define   NV34TCL_BLEND_FUNC_EQUATION_MIN                                              0x00008007
-#define   NV34TCL_BLEND_FUNC_EQUATION_MAX                                              0x00008008
-#define   NV34TCL_BLEND_FUNC_EQUATION_FUNC_SUBTRACT                                    0x0000800a
-#define   NV34TCL_BLEND_FUNC_EQUATION_FUNC_REVERSE_SUBTRACT                            0x0000800b
+#define  NV34TCL_BLEND_COLOR                                                           0x0000031c
+#define  NV34TCL_BLEND_EQUATION                                                                0x00000320
+#define   NV34TCL_BLEND_EQUATION_FUNC_ADD                                              0x00008006
+#define   NV34TCL_BLEND_EQUATION_MIN                                                   0x00008007
+#define   NV34TCL_BLEND_EQUATION_MAX                                                   0x00008008
+#define   NV34TCL_BLEND_EQUATION_FUNC_SUBTRACT                                         0x0000800a
+#define   NV34TCL_BLEND_EQUATION_FUNC_REVERSE_SUBTRACT                                 0x0000800b
 #define  NV34TCL_COLOR_MASK                                                            0x00000324
 #define   NV34TCL_COLOR_MASK_B_SHIFT                                                   0
 #define   NV34TCL_COLOR_MASK_B_MASK                                                    0x000000ff
@@ -4099,9 +4128,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV34TCL_VIEWPORT_SCALE_Y                                                      0x00000a34
 #define  NV34TCL_VIEWPORT_SCALE_Z                                                      0x00000a38
 #define  NV34TCL_VIEWPORT_SCALE_W                                                      0x00000a3c
-#define  NV34TCL_POLYGON_OFFSET_FILL_ENABLE                                            0x00000a60
+#define  NV34TCL_POLYGON_OFFSET_POINT_ENABLE                                           0x00000a60
 #define  NV34TCL_POLYGON_OFFSET_LINE_ENABLE                                            0x00000a64
-#define  NV34TCL_POLYGON_OFFSET_POINT_ENABLE                                           0x00000a68
+#define  NV34TCL_POLYGON_OFFSET_FILL_ENABLE                                            0x00000a68
 #define  NV34TCL_DEPTH_FUNC                                                            0x00000a6c
 #define   NV34TCL_DEPTH_FUNC_NEVER                                                     0x00000200
 #define   NV34TCL_DEPTH_FUNC_LESS                                                      0x00000201
@@ -4192,6 +4221,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV34TCL_LIGHT_ATTENUATION_QUADRATIC__SIZE                                     0x00000008
 #define  NV34TCL_FRONT_MATERIAL_SHININESS(x)                                           (0x00001400+((x)*4))
 #define  NV34TCL_FRONT_MATERIAL_SHININESS__SIZE                                                0x00000006
+#define  NV34TCL_ENABLED_LIGHTS                                                                0x00001420
 #define  NV34TCL_FP_REG_CONTROL                                                                0x00001450
 #define   NV34TCL_FP_REG_CONTROL_UNK1_SHIFT                                            16
 #define   NV34TCL_FP_REG_CONTROL_UNK1_MASK                                             0xffff0000
@@ -4209,12 +4239,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV34TCL_POLYGON_STIPPLE_ENABLE                                                        0x0000147c
 #define  NV34TCL_POLYGON_STIPPLE_PATTERN(x)                                            (0x00001480+((x)*4))
 #define  NV34TCL_POLYGON_STIPPLE_PATTERN__SIZE                                         0x00000020
-#define  NV34TCL_VERTEX_ATTR_3F_X(x)                                                   (0x00001500+((x)*16))
-#define  NV34TCL_VERTEX_ATTR_3F_X__SIZE                                                        0x00000010
-#define  NV34TCL_VERTEX_ATTR_3F_Y(x)                                                   (0x00001504+((x)*16))
-#define  NV34TCL_VERTEX_ATTR_3F_Y__SIZE                                                        0x00000010
-#define  NV34TCL_VERTEX_ATTR_3F_Z(x)                                                   (0x00001508+((x)*16))
-#define  NV34TCL_VERTEX_ATTR_3F_Z__SIZE                                                        0x00000010
+#define  NV34TCL_VTX_ATTR_3F_X(x)                                                      (0x00001500+((x)*16))
+#define  NV34TCL_VTX_ATTR_3F_X__SIZE                                                   0x00000010
+#define  NV34TCL_VTX_ATTR_3F_Y(x)                                                      (0x00001504+((x)*16))
+#define  NV34TCL_VTX_ATTR_3F_Y__SIZE                                                   0x00000010
+#define  NV34TCL_VTX_ATTR_3F_Z(x)                                                      (0x00001508+((x)*16))
+#define  NV34TCL_VTX_ATTR_3F_Z__SIZE                                                   0x00000010
 #define  NV34TCL_VP_CLIP_PLANE_A(x)                                                    (0x00001600+((x)*16))
 #define  NV34TCL_VP_CLIP_PLANE_A__SIZE                                                 0x00000006
 #define  NV34TCL_VP_CLIP_PLANE_B(x)                                                    (0x00001604+((x)*16))
@@ -4223,21 +4253,22 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV34TCL_VP_CLIP_PLANE_C__SIZE                                                 0x00000006
 #define  NV34TCL_VP_CLIP_PLANE_D(x)                                                    (0x0000160c+((x)*16))
 #define  NV34TCL_VP_CLIP_PLANE_D__SIZE                                                 0x00000006
-#define  NV34TCL_VERTEX_BUFFER_ADDRESS(x)                                              (0x00001680+((x)*4))
-#define  NV34TCL_VERTEX_BUFFER_ADDRESS__SIZE                                           0x00000010
-#define   NV34TCL_VERTEX_BUFFER_ADDRESS_DMA1                                           (1 << 31)
-#define   NV34TCL_VERTEX_BUFFER_ADDRESS_OFFSET_SHIFT                                   0
-#define   NV34TCL_VERTEX_BUFFER_ADDRESS_OFFSET_MASK                                    0x0fffffff
-#define  NV34TCL_VERTEX_ARRAY_FORMAT(x)                                                        (0x00001740+((x)*4))
-#define  NV34TCL_VERTEX_ARRAY_FORMAT__SIZE                                             0x00000010
-#define   NV34TCL_VERTEX_ARRAY_FORMAT_TYPE_SHIFT                                       0
-#define   NV34TCL_VERTEX_ARRAY_FORMAT_TYPE_MASK                                                0x0000000f
-#define    NV34TCL_VERTEX_ARRAY_FORMAT_TYPE_FLOAT                                      0x00000002
-#define    NV34TCL_VERTEX_ARRAY_FORMAT_TYPE_UBYTE                                      0x00000004
-#define   NV34TCL_VERTEX_ARRAY_FORMAT_SIZE_SHIFT                                       4
-#define   NV34TCL_VERTEX_ARRAY_FORMAT_SIZE_MASK                                                0x000000f0
-#define   NV34TCL_VERTEX_ARRAY_FORMAT_STRIDE_SHIFT                                     8
-#define   NV34TCL_VERTEX_ARRAY_FORMAT_STRIDE_MASK                                      0x0000ff00
+#define  NV34TCL_VTXBUF_ADDRESS(x)                                                     (0x00001680+((x)*4))
+#define  NV34TCL_VTXBUF_ADDRESS__SIZE                                                  0x00000010
+#define   NV34TCL_VTXBUF_ADDRESS_DMA1                                                  (1 << 31)
+#define   NV34TCL_VTXBUF_ADDRESS_OFFSET_SHIFT                                          0
+#define   NV34TCL_VTXBUF_ADDRESS_OFFSET_MASK                                           0x0fffffff
+#define  NV34TCL_VTXFMT(x)                                                             (0x00001740+((x)*4))
+#define  NV34TCL_VTXFMT__SIZE                                                          0x00000010
+#define   NV34TCL_VTXFMT_TYPE_SHIFT                                                    0
+#define   NV34TCL_VTXFMT_TYPE_MASK                                                     0x0000000f
+#define    NV34TCL_VTXFMT_TYPE_FLOAT                                                   0x00000002
+#define    NV34TCL_VTXFMT_TYPE_UBYTE                                                   0x00000004
+#define    NV34TCL_VTXFMT_TYPE_USHORT                                                  0x00000005
+#define   NV34TCL_VTXFMT_SIZE_SHIFT                                                    4
+#define   NV34TCL_VTXFMT_SIZE_MASK                                                     0x000000f0
+#define   NV34TCL_VTXFMT_STRIDE_SHIFT                                                  8
+#define   NV34TCL_VTXFMT_STRIDE_MASK                                                   0x0000ff00
 #define  NV34TCL_LIGHT_MODEL_BACK_SIDE_PRODUCT_AMBIENT_PLUS_EMISSION_R                 0x000017a0
 #define  NV34TCL_LIGHT_MODEL_BACK_SIDE_PRODUCT_AMBIENT_PLUS_EMISSION_G                 0x000017a4
 #define  NV34TCL_LIGHT_MODEL_BACK_SIDE_PRODUCT_AMBIENT_PLUS_EMISSION_B                 0x000017a8
@@ -4276,6 +4307,18 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV34TCL_VB_VERTEX_BATCH_COUNT_SHIFT                                          24
 #define   NV34TCL_VB_VERTEX_BATCH_COUNT_MASK                                           0xff000000
 #define  NV34TCL_VERTEX_DATA                                                           0x00001818
+#define  NV34TCL_IDXBUF_ADDRESS                                                                0x0000181c
+#define  NV34TCL_IDXBUF_FORMAT                                                         0x00001820
+#define   NV34TCL_IDXBUF_FORMAT_TYPE_SHIFT                                             4
+#define   NV34TCL_IDXBUF_FORMAT_TYPE_MASK                                              0x000000f0
+#define    NV34TCL_IDXBUF_FORMAT_TYPE_U32                                              0x00000000
+#define    NV34TCL_IDXBUF_FORMAT_TYPE_U16                                              0x00000010
+#define   NV34TCL_IDXBUF_FORMAT_DMA1                                                   (1 <<  0)
+#define  NV34TCL_VB_INDEX_BATCH                                                                0x00001824
+#define   NV34TCL_VB_INDEX_BATCH_COUNT_SHIFT                                           24
+#define   NV34TCL_VB_INDEX_BATCH_COUNT_MASK                                            0xff000000
+#define   NV34TCL_VB_INDEX_BATCH_START_SHIFT                                           0
+#define   NV34TCL_VB_INDEX_BATCH_START_MASK                                            0x00ffffff
 #define  NV34TCL_POLYGON_MODE_FRONT                                                    0x00001828
 #define   NV34TCL_POLYGON_MODE_FRONT_POINT                                             0x00001b00
 #define   NV34TCL_POLYGON_MODE_FRONT_LINE                                              0x00001b01
@@ -4948,12 +4991,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV40TCL_VP_UPLOAD_INST(x)                                                     (0x00000b80+((x)*4))
 #define  NV40TCL_VP_UPLOAD_INST__SIZE                                                  0x00000004
 #define  NV40TCL_CLIP_PLANE_ENABLE                                                     0x00001478
-#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE0                                             (1 <<  2)
-#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE1                                             (1 <<  6)
-#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE2                                             (1 << 10)
-#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE3                                             (1 << 14)
-#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE4                                             (1 << 18)
-#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE5                                             (1 << 22)
+#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE0                                             (1 <<  1)
+#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE1                                             (1 <<  5)
+#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE2                                             (1 <<  9)
+#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE3                                             (1 << 13)
+#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE4                                             (1 << 17)
+#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE5                                             (1 << 21)
 #define  NV40TCL_POLYGON_STIPPLE_ENABLE                                                        0x0000147c
 #define  NV40TCL_POLYGON_STIPPLE_PATTERN(x)                                            (0x00001480+((x)*4))
 #define  NV40TCL_POLYGON_STIPPLE_PATTERN__SIZE                                         0x00000020
@@ -4975,6 +5018,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV40TCL_VTXFMT_TYPE_MASK                                                     0x0000000f
 #define    NV40TCL_VTXFMT_TYPE_FLOAT                                                   0x00000002
 #define    NV40TCL_VTXFMT_TYPE_UBYTE                                                   0x00000004
+#define    NV40TCL_VTXFMT_TYPE_USHORT                                                  0x00000005
 #define   NV40TCL_VTXFMT_SIZE_SHIFT                                                    4
 #define   NV40TCL_VTXFMT_SIZE_MASK                                                     0x000000f0
 #define   NV40TCL_VTXFMT_STRIDE_SHIFT                                                  8
@@ -5347,12 +5391,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV50_2D_RECT_Y1                                                               0x00000604
 #define  NV50_2D_RECT_X2                                                               0x00000608
 #define  NV50_2D_RECT_Y2                                                               0x0000060c
-#define  NV50_2D_BLIT_DST_X                                                            0x000008b0
-#define  NV50_2D_BLIT_DST_Y                                                            0x000008b4
-#define  NV50_2D_BLIT_DST_W                                                            0x000008b8
-#define  NV50_2D_BLIT_DST_H                                                            0x000008bc
-#define  NV50_2D_BLIT_SRC_X                                                            0x000008d4
-#define  NV50_2D_BLIT_SRC_Y                                                            0x000008dc
 #define  NV50_2D_SIFC_UNK0800                                                          0x00000800
 #define  NV50_2D_SIFC_FORMAT                                                           0x00000804
 #define   NV50_2D_SIFC_FORMAT_32BPP                                                    0x000000cf
@@ -5371,6 +5409,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV50_2D_SIFC_UNK0858                                                          0x00000858
 #define  NV50_2D_SIFC_DST_Y                                                            0x0000085c
 #define  NV50_2D_SIFC_DATA                                                             0x00000860
+#define  NV50_2D_BLIT_DST_X                                                            0x000008b0
+#define  NV50_2D_BLIT_DST_Y                                                            0x000008b4
+#define  NV50_2D_BLIT_DST_W                                                            0x000008b8
+#define  NV50_2D_BLIT_DST_H                                                            0x000008bc
+#define  NV50_2D_BLIT_SRC_X                                                            0x000008d4
+#define  NV50_2D_BLIT_SRC_Y                                                            0x000008dc
 
 
 #define NV50_MEMORY_TO_MEMORY_FORMAT                                                   0x00005039