OSDN Git Service

nouveau: Update nouveau_class.h.
authorFrancisco Jerez <currojerez@riseup.net>
Sat, 6 Mar 2010 20:07:31 +0000 (21:07 +0100)
committerFrancisco Jerez <currojerez@riseup.net>
Sat, 6 Mar 2010 20:08:06 +0000 (21:08 +0100)
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
nouveau/nouveau_class.h

index e098368..7a09546 100644 (file)
@@ -1549,8 +1549,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define    NV04_TEXTURED_TRIANGLE_BLEND_SHADE_MODE_GOURAUD                             0x00000080
 #define    NV04_TEXTURED_TRIANGLE_BLEND_SHADE_MODE_PHONG                               0x000000c0
 #define   NV04_TEXTURED_TRIANGLE_BLEND_TEXTURE_PERSPECTIVE_ENABLE                      (1 <<  8)
-#define   NV04_TEXTURED_TRIANGLE_BLEND_SPECULAR_ENABLE_SHIFT                           12
-#define   NV04_TEXTURED_TRIANGLE_BLEND_SPECULAR_ENABLE_MASK                            0x0000f000
+#define   NV04_TEXTURED_TRIANGLE_BLEND_SPECULAR_ENABLE                                 (1 << 12)
 #define   NV04_TEXTURED_TRIANGLE_BLEND_FOG_ENABLE                                      (1 << 16)
 #define   NV04_TEXTURED_TRIANGLE_BLEND_BLEND_ENABLE                                    (1 << 20)
 #define   NV04_TEXTURED_TRIANGLE_BLEND_SRC_SHIFT                                       24
@@ -1798,8 +1797,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define    NV04_MULTITEX_TRIANGLE_BLEND_SHADE_MODE_GOURAUD                             0x00000080
 #define    NV04_MULTITEX_TRIANGLE_BLEND_SHADE_MODE_PHONG                               0x000000c0
 #define   NV04_MULTITEX_TRIANGLE_BLEND_TEXTURE_PERSPECTIVE_ENABLE                      (1 <<  8)
-#define   NV04_MULTITEX_TRIANGLE_BLEND_SPECULAR_ENABLE_SHIFT                           12
-#define   NV04_MULTITEX_TRIANGLE_BLEND_SPECULAR_ENABLE_MASK                            0x0000f000
+#define   NV04_MULTITEX_TRIANGLE_BLEND_SPECULAR_ENABLE                                 (1 << 12)
 #define   NV04_MULTITEX_TRIANGLE_BLEND_FOG_ENABLE                                      (1 << 16)
 #define   NV04_MULTITEX_TRIANGLE_BLEND_BLEND_ENABLE                                    (1 << 20)
 #define   NV04_MULTITEX_TRIANGLE_BLEND_SRC_SHIFT                                       24
@@ -3103,70 +3101,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV10TCL_VTXFMT_STRIDE_SHIFT                                                  8
 #define   NV10TCL_VTXFMT_STRIDE_MASK                                                   0x0000ff00
 #define   NV10TCL_VTXFMT_POS_HOMOGENEOUS                                               (1 << 24)
-#define  NV10TCL_VERTEX_ARRAY_OFFSET_POS                                               0x00000d00
-#define  NV10TCL_VERTEX_ARRAY_FORMAT_POS                                               0x00000d04
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_POS_TYPE_SHIFT                                   0
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_POS_TYPE_MASK                                    0x0000000f
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_POS_FIELDS_SHIFT                                 4
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_POS_FIELDS_MASK                                  0x000000f0
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_POS_STRIDE_SHIFT                                 8
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_POS_STRIDE_MASK                                  0x0000ff00
-#define  NV10TCL_VERTEX_ARRAY_OFFSET_COL                                               0x00000d08
-#define  NV10TCL_VERTEX_ARRAY_FORMAT_COL                                               0x00000d0c
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_COL_TYPE_SHIFT                                   0
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_COL_TYPE_MASK                                    0x0000000f
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_COL_FIELDS_SHIFT                                 4
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_COL_FIELDS_MASK                                  0x000000f0
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_COL_STRIDE_SHIFT                                 8
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_COL_STRIDE_MASK                                  0x0000ff00
-#define  NV10TCL_VERTEX_ARRAY_OFFSET_COL2                                              0x00000d10
-#define  NV10TCL_VERTEX_ARRAY_FORMAT_COL2                                              0x00000d14
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_COL2_TYPE_SHIFT                                  0
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_COL2_TYPE_MASK                                   0x0000000f
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_COL2_FIELDS_SHIFT                                        4
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_COL2_FIELDS_MASK                                 0x000000f0
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_COL2_STRIDE_SHIFT                                        8
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_COL2_STRIDE_MASK                                 0x0000ff00
-#define  NV10TCL_VERTEX_ARRAY_OFFSET_TX0                                               0x00000d18
-#define  NV10TCL_VERTEX_ARRAY_FORMAT_TX0                                               0x00000d1c
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_TX0_TYPE_SHIFT                                   0
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_TX0_TYPE_MASK                                    0x0000000f
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_TX0_FIELDS_SHIFT                                 4
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_TX0_FIELDS_MASK                                  0x000000f0
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_TX0_STRIDE_SHIFT                                 8
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_TX0_STRIDE_MASK                                  0x0000ff00
-#define  NV10TCL_VERTEX_ARRAY_OFFSET_TX1                                               0x00000d20
-#define  NV10TCL_VERTEX_ARRAY_FORMAT_TX1                                               0x00000d24
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_TX1_TYPE_SHIFT                                   0
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_TX1_TYPE_MASK                                    0x0000000f
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_TX1_FIELDS_SHIFT                                 4
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_TX1_FIELDS_MASK                                  0x000000f0
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_TX1_STRIDE_SHIFT                                 8
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_TX1_STRIDE_MASK                                  0x0000ff00
-#define  NV10TCL_VERTEX_ARRAY_OFFSET_NOR                                               0x00000d28
-#define  NV10TCL_VERTEX_ARRAY_FORMAT_NOR                                               0x00000d2c
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_NOR_TYPE_SHIFT                                   0
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_NOR_TYPE_MASK                                    0x0000000f
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_NOR_FIELDS_SHIFT                                 4
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_NOR_FIELDS_MASK                                  0x000000f0
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_NOR_STRIDE_SHIFT                                 8
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_NOR_STRIDE_MASK                                  0x0000ff00
-#define  NV10TCL_VERTEX_ARRAY_OFFSET_WGH                                               0x00000d30
-#define  NV10TCL_VERTEX_ARRAY_FORMAT_WGH                                               0x00000d34
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_WGH_TYPE_SHIFT                                   0
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_WGH_TYPE_MASK                                    0x0000000f
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_WGH_FIELDS_SHIFT                                 4
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_WGH_FIELDS_MASK                                  0x000000f0
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_WGH_STRIDE_SHIFT                                 8
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_WGH_STRIDE_MASK                                  0x0000ff00
-#define  NV10TCL_VERTEX_ARRAY_OFFSET_FOG                                               0x00000d38
-#define  NV10TCL_VERTEX_ARRAY_FORMAT_FOG                                               0x00000d3c
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_FOG_TYPE_SHIFT                                   0
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_FOG_TYPE_MASK                                    0x0000000f
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_FOG_FIELDS_SHIFT                                 4
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_FOG_FIELDS_MASK                                  0x000000f0
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_FOG_STRIDE_SHIFT                                 8
-#define   NV10TCL_VERTEX_ARRAY_FORMAT_FOG_STRIDE_MASK                                  0x0000ff00
 #define  NV10TCL_VERTEX_BEGIN_END                                                      0x00000dfc
 #define   NV10TCL_VERTEX_BEGIN_END_STOP                                                        0x00000000
 #define   NV10TCL_VERTEX_BEGIN_END_POINTS                                              0x00000001
@@ -6197,8 +6131,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV34TCL_VP_CLIP_PLANES_ENABLE_PLANE3                                         (1 << 13)
 #define   NV34TCL_VP_CLIP_PLANES_ENABLE_PLANE4                                         (1 << 17)
 #define   NV34TCL_VP_CLIP_PLANES_ENABLE_PLANE5                                         (1 << 21)
-#define   NV34TCL_VP_CLIP_PLANES_ENABLE_PLANE6                                         (1 << 25)
-#define   NV34TCL_VP_CLIP_PLANES_ENABLE_PLANE7                                         (1 << 29)
 #define  NV34TCL_POLYGON_STIPPLE_ENABLE                                                        0x0000147c
 #define  NV34TCL_POLYGON_STIPPLE_PATTERN(x)                                            (0x00001480+((x)*4))
 #define  NV34TCL_POLYGON_STIPPLE_PATTERN__SIZE                                         0x00000020
@@ -6588,7 +6520,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define    NV34TCL_POINT_SPRITE_R_MODE_ZERO                                            0x00000000
 #define    NV34TCL_POINT_SPRITE_R_MODE_R                                               0x00000002
 #define    NV34TCL_POINT_SPRITE_R_MODE_S                                               0x00000004
-#define   NV34TCL_POINT_SPRITE_COORD_REPLACE                                           (1 << 11)
+#define   NV34TCL_POINT_SPRITE_COORD_REPLACE_0                                         (1 <<  8)
+#define   NV34TCL_POINT_SPRITE_COORD_REPLACE_1                                         (1 <<  9)
+#define   NV34TCL_POINT_SPRITE_COORD_REPLACE_2                                         (1 << 10)
+#define   NV34TCL_POINT_SPRITE_COORD_REPLACE_3                                         (1 << 11)
+#define   NV34TCL_POINT_SPRITE_COORD_REPLACE_4                                         (1 << 12)
+#define   NV34TCL_POINT_SPRITE_COORD_REPLACE_5                                         (1 << 13)
+#define   NV34TCL_POINT_SPRITE_COORD_REPLACE_6                                         (1 << 14)
+#define   NV34TCL_POINT_SPRITE_COORD_REPLACE_7                                         (1 << 15)
 #define  NV34TCL_VP_UPLOAD_CONST_ID                                                    0x00001efc
 #define  NV34TCL_VP_UPLOAD_CONST_X(x)                                                  (0x00001f00+((x)*16))
 #define  NV34TCL_VP_UPLOAD_CONST_X__SIZE                                               0x00000004
@@ -7335,6 +7274,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV40TCL_MULTISAMPLE_CONTROL                                                   0x00001d7c
 #define  NV40TCL_CLEAR_VALUE_DEPTH                                                     0x00001d8c
 #define  NV40TCL_CLEAR_VALUE_COLOR                                                     0x00001d90
+#define   NV40TCL_CLEAR_VALUE_COLOR_B_SHIFT                                            0
+#define   NV40TCL_CLEAR_VALUE_COLOR_B_MASK                                             0x000000ff
+#define   NV40TCL_CLEAR_VALUE_COLOR_G_SHIFT                                            8
+#define   NV40TCL_CLEAR_VALUE_COLOR_G_MASK                                             0x0000ff00
+#define   NV40TCL_CLEAR_VALUE_COLOR_R_SHIFT                                            16
+#define   NV40TCL_CLEAR_VALUE_COLOR_R_MASK                                             0x00ff0000
+#define   NV40TCL_CLEAR_VALUE_COLOR_A_SHIFT                                            24
+#define   NV40TCL_CLEAR_VALUE_COLOR_A_MASK                                             0xff000000
 #define  NV40TCL_CLEAR_BUFFERS                                                         0x00001d94
 #define   NV40TCL_CLEAR_BUFFERS_COLOR_A                                                        (1 <<  7)
 #define   NV40TCL_CLEAR_BUFFERS_COLOR_B                                                        (1 <<  6)
@@ -7354,6 +7301,20 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV40TCL_VP_START_FROM_ID                                                      0x00001ea0
 #define  NV40TCL_POINT_SIZE                                                            0x00001ee0
 #define  NV40TCL_POINT_SPRITE                                                          0x00001ee8
+#define   NV40TCL_POINT_SPRITE_ENABLE                                                  (1 <<  0)
+#define   NV40TCL_POINT_SPRITE_R_MODE_SHIFT                                            1
+#define   NV40TCL_POINT_SPRITE_R_MODE_MASK                                             0x00000006
+#define    NV40TCL_POINT_SPRITE_R_MODE_ZERO                                            0x00000000
+#define    NV40TCL_POINT_SPRITE_R_MODE_R                                               0x00000002
+#define    NV40TCL_POINT_SPRITE_R_MODE_S                                               0x00000004
+#define   NV40TCL_POINT_SPRITE_COORD_REPLACE_0                                         (1 <<  8)
+#define   NV40TCL_POINT_SPRITE_COORD_REPLACE_1                                         (1 <<  9)
+#define   NV40TCL_POINT_SPRITE_COORD_REPLACE_2                                         (1 << 10)
+#define   NV40TCL_POINT_SPRITE_COORD_REPLACE_3                                         (1 << 11)
+#define   NV40TCL_POINT_SPRITE_COORD_REPLACE_4                                         (1 << 12)
+#define   NV40TCL_POINT_SPRITE_COORD_REPLACE_5                                         (1 << 13)
+#define   NV40TCL_POINT_SPRITE_COORD_REPLACE_6                                         (1 << 14)
+#define   NV40TCL_POINT_SPRITE_COORD_REPLACE_7                                         (1 << 15)
 #define  NV40TCL_VP_UPLOAD_CONST_ID                                                    0x00001efc
 #define  NV40TCL_VP_UPLOAD_CONST_X(x)                                                  (0x00001f00+((x)*16))
 #define  NV40TCL_VP_UPLOAD_CONST_X__SIZE                                               0x00000004
@@ -8768,6 +8729,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV50TCL_CULL_FACE_FRONT_AND_BACK                                             0x00000408
 #define  NV50TCL_VIEWPORT_TRANSFORM_EN                                                 0x0000192c
 #define  NV50TCL_VIEW_VOLUME_CLIP_CTRL                                                 0x0000193c
+#define  NV50TCL_VIEWPORT_CLIP_RECTS_EN                                                        0x0000194c
 #define  NV50TCL_FP_CTRL_UNK196C                                                       0x0000196c
 #define  NV50TCL_FP_INTERPOLANT_CTRL                                                   0x00001988
 #define   NV50TCL_FP_INTERPOLANT_CTRL_UMASK_SHIFT                                      24