aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancisco Jerez2010-03-06 14:07:31 -0600
committerFrancisco Jerez2010-03-06 14:08:06 -0600
commit581cafbc2493ad97ada41f03c8dd70f9ec4bf19d (patch)
tree2ab876e076266e6738021be902462149ff28b550 /nouveau
parent1d4d1e6b138aac8bd734c4c20617a43fb3337c63 (diff)
downloadlibdrm-581cafbc2493ad97ada41f03c8dd70f9ec4bf19d.tar.gz
libdrm-581cafbc2493ad97ada41f03c8dd70f9ec4bf19d.tar.xz
libdrm-581cafbc2493ad97ada41f03c8dd70f9ec4bf19d.zip
nouveau: Update nouveau_class.h.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Diffstat (limited to 'nouveau')
-rw-r--r--nouveau/nouveau_class.h104
1 files changed, 33 insertions, 71 deletions
diff --git a/nouveau/nouveau_class.h b/nouveau/nouveau_class.h
index e098368a..7a095463 100644
--- a/nouveau/nouveau_class.h
+++ b/nouveau/nouveau_class.h
@@ -1549,8 +1549,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1549#define NV04_TEXTURED_TRIANGLE_BLEND_SHADE_MODE_GOURAUD 0x00000080 1549#define NV04_TEXTURED_TRIANGLE_BLEND_SHADE_MODE_GOURAUD 0x00000080
1550#define NV04_TEXTURED_TRIANGLE_BLEND_SHADE_MODE_PHONG 0x000000c0 1550#define NV04_TEXTURED_TRIANGLE_BLEND_SHADE_MODE_PHONG 0x000000c0
1551#define NV04_TEXTURED_TRIANGLE_BLEND_TEXTURE_PERSPECTIVE_ENABLE (1 << 8) 1551#define NV04_TEXTURED_TRIANGLE_BLEND_TEXTURE_PERSPECTIVE_ENABLE (1 << 8)
1552#define NV04_TEXTURED_TRIANGLE_BLEND_SPECULAR_ENABLE_SHIFT 12 1552#define NV04_TEXTURED_TRIANGLE_BLEND_SPECULAR_ENABLE (1 << 12)
1553#define NV04_TEXTURED_TRIANGLE_BLEND_SPECULAR_ENABLE_MASK 0x0000f000
1554#define NV04_TEXTURED_TRIANGLE_BLEND_FOG_ENABLE (1 << 16) 1553#define NV04_TEXTURED_TRIANGLE_BLEND_FOG_ENABLE (1 << 16)
1555#define NV04_TEXTURED_TRIANGLE_BLEND_BLEND_ENABLE (1 << 20) 1554#define NV04_TEXTURED_TRIANGLE_BLEND_BLEND_ENABLE (1 << 20)
1556#define NV04_TEXTURED_TRIANGLE_BLEND_SRC_SHIFT 24 1555#define NV04_TEXTURED_TRIANGLE_BLEND_SRC_SHIFT 24
@@ -1798,8 +1797,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1798#define NV04_MULTITEX_TRIANGLE_BLEND_SHADE_MODE_GOURAUD 0x00000080 1797#define NV04_MULTITEX_TRIANGLE_BLEND_SHADE_MODE_GOURAUD 0x00000080
1799#define NV04_MULTITEX_TRIANGLE_BLEND_SHADE_MODE_PHONG 0x000000c0 1798#define NV04_MULTITEX_TRIANGLE_BLEND_SHADE_MODE_PHONG 0x000000c0
1800#define NV04_MULTITEX_TRIANGLE_BLEND_TEXTURE_PERSPECTIVE_ENABLE (1 << 8) 1799#define NV04_MULTITEX_TRIANGLE_BLEND_TEXTURE_PERSPECTIVE_ENABLE (1 << 8)
1801#define NV04_MULTITEX_TRIANGLE_BLEND_SPECULAR_ENABLE_SHIFT 12 1800#define NV04_MULTITEX_TRIANGLE_BLEND_SPECULAR_ENABLE (1 << 12)
1802#define NV04_MULTITEX_TRIANGLE_BLEND_SPECULAR_ENABLE_MASK 0x0000f000
1803#define NV04_MULTITEX_TRIANGLE_BLEND_FOG_ENABLE (1 << 16) 1801#define NV04_MULTITEX_TRIANGLE_BLEND_FOG_ENABLE (1 << 16)
1804#define NV04_MULTITEX_TRIANGLE_BLEND_BLEND_ENABLE (1 << 20) 1802#define NV04_MULTITEX_TRIANGLE_BLEND_BLEND_ENABLE (1 << 20)
1805#define NV04_MULTITEX_TRIANGLE_BLEND_SRC_SHIFT 24 1803#define NV04_MULTITEX_TRIANGLE_BLEND_SRC_SHIFT 24
@@ -3103,70 +3101,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3103#define NV10TCL_VTXFMT_STRIDE_SHIFT 8 3101#define NV10TCL_VTXFMT_STRIDE_SHIFT 8
3104#define NV10TCL_VTXFMT_STRIDE_MASK 0x0000ff00 3102#define NV10TCL_VTXFMT_STRIDE_MASK 0x0000ff00
3105#define NV10TCL_VTXFMT_POS_HOMOGENEOUS (1 << 24) 3103#define NV10TCL_VTXFMT_POS_HOMOGENEOUS (1 << 24)
3106#define NV10TCL_VERTEX_ARRAY_OFFSET_POS 0x00000d00
3107#define NV10TCL_VERTEX_ARRAY_FORMAT_POS 0x00000d04
3108#define NV10TCL_VERTEX_ARRAY_FORMAT_POS_TYPE_SHIFT 0
3109#define NV10TCL_VERTEX_ARRAY_FORMAT_POS_TYPE_MASK 0x0000000f
3110#define NV10TCL_VERTEX_ARRAY_FORMAT_POS_FIELDS_SHIFT 4
3111#define NV10TCL_VERTEX_ARRAY_FORMAT_POS_FIELDS_MASK 0x000000f0
3112#define NV10TCL_VERTEX_ARRAY_FORMAT_POS_STRIDE_SHIFT 8
3113#define NV10TCL_VERTEX_ARRAY_FORMAT_POS_STRIDE_MASK 0x0000ff00
3114#define NV10TCL_VERTEX_ARRAY_OFFSET_COL 0x00000d08
3115#define NV10TCL_VERTEX_ARRAY_FORMAT_COL 0x00000d0c
3116#define NV10TCL_VERTEX_ARRAY_FORMAT_COL_TYPE_SHIFT 0
3117#define NV10TCL_VERTEX_ARRAY_FORMAT_COL_TYPE_MASK 0x0000000f
3118#define NV10TCL_VERTEX_ARRAY_FORMAT_COL_FIELDS_SHIFT 4
3119#define NV10TCL_VERTEX_ARRAY_FORMAT_COL_FIELDS_MASK 0x000000f0
3120#define NV10TCL_VERTEX_ARRAY_FORMAT_COL_STRIDE_SHIFT 8
3121#define NV10TCL_VERTEX_ARRAY_FORMAT_COL_STRIDE_MASK 0x0000ff00
3122#define NV10TCL_VERTEX_ARRAY_OFFSET_COL2 0x00000d10
3123#define NV10TCL_VERTEX_ARRAY_FORMAT_COL2 0x00000d14
3124#define NV10TCL_VERTEX_ARRAY_FORMAT_COL2_TYPE_SHIFT 0
3125#define NV10TCL_VERTEX_ARRAY_FORMAT_COL2_TYPE_MASK 0x0000000f
3126#define NV10TCL_VERTEX_ARRAY_FORMAT_COL2_FIELDS_SHIFT 4
3127#define NV10TCL_VERTEX_ARRAY_FORMAT_COL2_FIELDS_MASK 0x000000f0
3128#define NV10TCL_VERTEX_ARRAY_FORMAT_COL2_STRIDE_SHIFT 8
3129#define NV10TCL_VERTEX_ARRAY_FORMAT_COL2_STRIDE_MASK 0x0000ff00
3130#define NV10TCL_VERTEX_ARRAY_OFFSET_TX0 0x00000d18
3131#define NV10TCL_VERTEX_ARRAY_FORMAT_TX0 0x00000d1c
3132#define NV10TCL_VERTEX_ARRAY_FORMAT_TX0_TYPE_SHIFT 0
3133#define NV10TCL_VERTEX_ARRAY_FORMAT_TX0_TYPE_MASK 0x0000000f
3134#define NV10TCL_VERTEX_ARRAY_FORMAT_TX0_FIELDS_SHIFT 4
3135#define NV10TCL_VERTEX_ARRAY_FORMAT_TX0_FIELDS_MASK 0x000000f0
3136#define NV10TCL_VERTEX_ARRAY_FORMAT_TX0_STRIDE_SHIFT 8
3137#define NV10TCL_VERTEX_ARRAY_FORMAT_TX0_STRIDE_MASK 0x0000ff00
3138#define NV10TCL_VERTEX_ARRAY_OFFSET_TX1 0x00000d20
3139#define NV10TCL_VERTEX_ARRAY_FORMAT_TX1 0x00000d24
3140#define NV10TCL_VERTEX_ARRAY_FORMAT_TX1_TYPE_SHIFT 0
3141#define NV10TCL_VERTEX_ARRAY_FORMAT_TX1_TYPE_MASK 0x0000000f
3142#define NV10TCL_VERTEX_ARRAY_FORMAT_TX1_FIELDS_SHIFT 4
3143#define NV10TCL_VERTEX_ARRAY_FORMAT_TX1_FIELDS_MASK 0x000000f0
3144#define NV10TCL_VERTEX_ARRAY_FORMAT_TX1_STRIDE_SHIFT 8
3145#define NV10TCL_VERTEX_ARRAY_FORMAT_TX1_STRIDE_MASK 0x0000ff00
3146#define NV10TCL_VERTEX_ARRAY_OFFSET_NOR 0x00000d28
3147#define NV10TCL_VERTEX_ARRAY_FORMAT_NOR 0x00000d2c
3148#define NV10TCL_VERTEX_ARRAY_FORMAT_NOR_TYPE_SHIFT 0
3149#define NV10TCL_VERTEX_ARRAY_FORMAT_NOR_TYPE_MASK 0x0000000f
3150#define NV10TCL_VERTEX_ARRAY_FORMAT_NOR_FIELDS_SHIFT 4
3151#define NV10TCL_VERTEX_ARRAY_FORMAT_NOR_FIELDS_MASK 0x000000f0
3152#define NV10TCL_VERTEX_ARRAY_FORMAT_NOR_STRIDE_SHIFT 8
3153#define NV10TCL_VERTEX_ARRAY_FORMAT_NOR_STRIDE_MASK 0x0000ff00
3154#define NV10TCL_VERTEX_ARRAY_OFFSET_WGH 0x00000d30
3155#define NV10TCL_VERTEX_ARRAY_FORMAT_WGH 0x00000d34
3156#define NV10TCL_VERTEX_ARRAY_FORMAT_WGH_TYPE_SHIFT 0
3157#define NV10TCL_VERTEX_ARRAY_FORMAT_WGH_TYPE_MASK 0x0000000f
3158#define NV10TCL_VERTEX_ARRAY_FORMAT_WGH_FIELDS_SHIFT 4
3159#define NV10TCL_VERTEX_ARRAY_FORMAT_WGH_FIELDS_MASK 0x000000f0
3160#define NV10TCL_VERTEX_ARRAY_FORMAT_WGH_STRIDE_SHIFT 8
3161#define NV10TCL_VERTEX_ARRAY_FORMAT_WGH_STRIDE_MASK 0x0000ff00
3162#define NV10TCL_VERTEX_ARRAY_OFFSET_FOG 0x00000d38
3163#define NV10TCL_VERTEX_ARRAY_FORMAT_FOG 0x00000d3c
3164#define NV10TCL_VERTEX_ARRAY_FORMAT_FOG_TYPE_SHIFT 0
3165#define NV10TCL_VERTEX_ARRAY_FORMAT_FOG_TYPE_MASK 0x0000000f
3166#define NV10TCL_VERTEX_ARRAY_FORMAT_FOG_FIELDS_SHIFT 4
3167#define NV10TCL_VERTEX_ARRAY_FORMAT_FOG_FIELDS_MASK 0x000000f0
3168#define NV10TCL_VERTEX_ARRAY_FORMAT_FOG_STRIDE_SHIFT 8
3169#define NV10TCL_VERTEX_ARRAY_FORMAT_FOG_STRIDE_MASK 0x0000ff00
3170#define NV10TCL_VERTEX_BEGIN_END 0x00000dfc 3104#define NV10TCL_VERTEX_BEGIN_END 0x00000dfc
3171#define NV10TCL_VERTEX_BEGIN_END_STOP 0x00000000 3105#define NV10TCL_VERTEX_BEGIN_END_STOP 0x00000000
3172#define NV10TCL_VERTEX_BEGIN_END_POINTS 0x00000001 3106#define NV10TCL_VERTEX_BEGIN_END_POINTS 0x00000001
@@ -6197,8 +6131,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6197#define NV34TCL_VP_CLIP_PLANES_ENABLE_PLANE3 (1 << 13) 6131#define NV34TCL_VP_CLIP_PLANES_ENABLE_PLANE3 (1 << 13)
6198#define NV34TCL_VP_CLIP_PLANES_ENABLE_PLANE4 (1 << 17) 6132#define NV34TCL_VP_CLIP_PLANES_ENABLE_PLANE4 (1 << 17)
6199#define NV34TCL_VP_CLIP_PLANES_ENABLE_PLANE5 (1 << 21) 6133#define NV34TCL_VP_CLIP_PLANES_ENABLE_PLANE5 (1 << 21)
6200#define NV34TCL_VP_CLIP_PLANES_ENABLE_PLANE6 (1 << 25)
6201#define NV34TCL_VP_CLIP_PLANES_ENABLE_PLANE7 (1 << 29)
6202#define NV34TCL_POLYGON_STIPPLE_ENABLE 0x0000147c 6134#define NV34TCL_POLYGON_STIPPLE_ENABLE 0x0000147c
6203#define NV34TCL_POLYGON_STIPPLE_PATTERN(x) (0x00001480+((x)*4)) 6135#define NV34TCL_POLYGON_STIPPLE_PATTERN(x) (0x00001480+((x)*4))
6204#define NV34TCL_POLYGON_STIPPLE_PATTERN__SIZE 0x00000020 6136#define NV34TCL_POLYGON_STIPPLE_PATTERN__SIZE 0x00000020
@@ -6588,7 +6520,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6588#define NV34TCL_POINT_SPRITE_R_MODE_ZERO 0x00000000 6520#define NV34TCL_POINT_SPRITE_R_MODE_ZERO 0x00000000
6589#define NV34TCL_POINT_SPRITE_R_MODE_R 0x00000002 6521#define NV34TCL_POINT_SPRITE_R_MODE_R 0x00000002
6590#define NV34TCL_POINT_SPRITE_R_MODE_S 0x00000004 6522#define NV34TCL_POINT_SPRITE_R_MODE_S 0x00000004
6591#define NV34TCL_POINT_SPRITE_COORD_REPLACE (1 << 11) 6523#define NV34TCL_POINT_SPRITE_COORD_REPLACE_0 (1 << 8)
6524#define NV34TCL_POINT_SPRITE_COORD_REPLACE_1 (1 << 9)
6525#define NV34TCL_POINT_SPRITE_COORD_REPLACE_2 (1 << 10)
6526#define NV34TCL_POINT_SPRITE_COORD_REPLACE_3 (1 << 11)
6527#define NV34TCL_POINT_SPRITE_COORD_REPLACE_4 (1 << 12)
6528#define NV34TCL_POINT_SPRITE_COORD_REPLACE_5 (1 << 13)
6529#define NV34TCL_POINT_SPRITE_COORD_REPLACE_6 (1 << 14)
6530#define NV34TCL_POINT_SPRITE_COORD_REPLACE_7 (1 << 15)
6592#define NV34TCL_VP_UPLOAD_CONST_ID 0x00001efc 6531#define NV34TCL_VP_UPLOAD_CONST_ID 0x00001efc
6593#define NV34TCL_VP_UPLOAD_CONST_X(x) (0x00001f00+((x)*16)) 6532#define NV34TCL_VP_UPLOAD_CONST_X(x) (0x00001f00+((x)*16))
6594#define NV34TCL_VP_UPLOAD_CONST_X__SIZE 0x00000004 6533#define NV34TCL_VP_UPLOAD_CONST_X__SIZE 0x00000004
@@ -7335,6 +7274,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
7335#define NV40TCL_MULTISAMPLE_CONTROL 0x00001d7c 7274#define NV40TCL_MULTISAMPLE_CONTROL 0x00001d7c
7336#define NV40TCL_CLEAR_VALUE_DEPTH 0x00001d8c 7275#define NV40TCL_CLEAR_VALUE_DEPTH 0x00001d8c
7337#define NV40TCL_CLEAR_VALUE_COLOR 0x00001d90 7276#define NV40TCL_CLEAR_VALUE_COLOR 0x00001d90
7277#define NV40TCL_CLEAR_VALUE_COLOR_B_SHIFT 0
7278#define NV40TCL_CLEAR_VALUE_COLOR_B_MASK 0x000000ff
7279#define NV40TCL_CLEAR_VALUE_COLOR_G_SHIFT 8
7280#define NV40TCL_CLEAR_VALUE_COLOR_G_MASK 0x0000ff00
7281#define NV40TCL_CLEAR_VALUE_COLOR_R_SHIFT 16
7282#define NV40TCL_CLEAR_VALUE_COLOR_R_MASK 0x00ff0000
7283#define NV40TCL_CLEAR_VALUE_COLOR_A_SHIFT 24
7284#define NV40TCL_CLEAR_VALUE_COLOR_A_MASK 0xff000000
7338#define NV40TCL_CLEAR_BUFFERS 0x00001d94 7285#define NV40TCL_CLEAR_BUFFERS 0x00001d94
7339#define NV40TCL_CLEAR_BUFFERS_COLOR_A (1 << 7) 7286#define NV40TCL_CLEAR_BUFFERS_COLOR_A (1 << 7)
7340#define NV40TCL_CLEAR_BUFFERS_COLOR_B (1 << 6) 7287#define NV40TCL_CLEAR_BUFFERS_COLOR_B (1 << 6)
@@ -7354,6 +7301,20 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
7354#define NV40TCL_VP_START_FROM_ID 0x00001ea0 7301#define NV40TCL_VP_START_FROM_ID 0x00001ea0
7355#define NV40TCL_POINT_SIZE 0x00001ee0 7302#define NV40TCL_POINT_SIZE 0x00001ee0
7356#define NV40TCL_POINT_SPRITE 0x00001ee8 7303#define NV40TCL_POINT_SPRITE 0x00001ee8
7304#define NV40TCL_POINT_SPRITE_ENABLE (1 << 0)
7305#define NV40TCL_POINT_SPRITE_R_MODE_SHIFT 1
7306#define NV40TCL_POINT_SPRITE_R_MODE_MASK 0x00000006
7307#define NV40TCL_POINT_SPRITE_R_MODE_ZERO 0x00000000
7308#define NV40TCL_POINT_SPRITE_R_MODE_R 0x00000002
7309#define NV40TCL_POINT_SPRITE_R_MODE_S 0x00000004
7310#define NV40TCL_POINT_SPRITE_COORD_REPLACE_0 (1 << 8)
7311#define NV40TCL_POINT_SPRITE_COORD_REPLACE_1 (1 << 9)
7312#define NV40TCL_POINT_SPRITE_COORD_REPLACE_2 (1 << 10)
7313#define NV40TCL_POINT_SPRITE_COORD_REPLACE_3 (1 << 11)
7314#define NV40TCL_POINT_SPRITE_COORD_REPLACE_4 (1 << 12)
7315#define NV40TCL_POINT_SPRITE_COORD_REPLACE_5 (1 << 13)
7316#define NV40TCL_POINT_SPRITE_COORD_REPLACE_6 (1 << 14)
7317#define NV40TCL_POINT_SPRITE_COORD_REPLACE_7 (1 << 15)
7357#define NV40TCL_VP_UPLOAD_CONST_ID 0x00001efc 7318#define NV40TCL_VP_UPLOAD_CONST_ID 0x00001efc
7358#define NV40TCL_VP_UPLOAD_CONST_X(x) (0x00001f00+((x)*16)) 7319#define NV40TCL_VP_UPLOAD_CONST_X(x) (0x00001f00+((x)*16))
7359#define NV40TCL_VP_UPLOAD_CONST_X__SIZE 0x00000004 7320#define NV40TCL_VP_UPLOAD_CONST_X__SIZE 0x00000004
@@ -8768,6 +8729,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
8768#define NV50TCL_CULL_FACE_FRONT_AND_BACK 0x00000408 8729#define NV50TCL_CULL_FACE_FRONT_AND_BACK 0x00000408
8769#define NV50TCL_VIEWPORT_TRANSFORM_EN 0x0000192c 8730#define NV50TCL_VIEWPORT_TRANSFORM_EN 0x0000192c
8770#define NV50TCL_VIEW_VOLUME_CLIP_CTRL 0x0000193c 8731#define NV50TCL_VIEW_VOLUME_CLIP_CTRL 0x0000193c
8732#define NV50TCL_VIEWPORT_CLIP_RECTS_EN 0x0000194c
8771#define NV50TCL_FP_CTRL_UNK196C 0x0000196c 8733#define NV50TCL_FP_CTRL_UNK196C 0x0000196c
8772#define NV50TCL_FP_INTERPOLANT_CTRL 0x00001988 8734#define NV50TCL_FP_INTERPOLANT_CTRL 0x00001988
8773#define NV50TCL_FP_INTERPOLANT_CTRL_UMASK_SHIFT 24 8735#define NV50TCL_FP_INTERPOLANT_CTRL_UMASK_SHIFT 24