aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancisco Jerez2010-01-07 21:34:39 -0600
committerFrancisco Jerez2010-01-07 21:37:39 -0600
commit5963c023b84daaacb91ae0aa4cf841acff63fd1f (patch)
treec5ddd418b751fc433791fc0d9cb6bff3df3049a7 /nouveau
parentbfa44bb8610f51d84b8d23f8c5ce903689d239c6 (diff)
downloadlibdrm-5963c023b84daaacb91ae0aa4cf841acff63fd1f.tar.gz
libdrm-5963c023b84daaacb91ae0aa4cf841acff63fd1f.tar.xz
libdrm-5963c023b84daaacb91ae0aa4cf841acff63fd1f.zip
nouveau: Update nouveau_class.h.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Diffstat (limited to 'nouveau')
-rw-r--r--nouveau/nouveau_class.h53
1 files changed, 22 insertions, 31 deletions
diff --git a/nouveau/nouveau_class.h b/nouveau/nouveau_class.h
index 91d692a3..aa1705bb 100644
--- a/nouveau/nouveau_class.h
+++ b/nouveau/nouveau_class.h
@@ -1404,8 +1404,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1404#define NV04_TEXTURED_TRIANGLE_BLEND_TEXTURE_PERSPECTIVE_ENABLE (1 << 8) 1404#define NV04_TEXTURED_TRIANGLE_BLEND_TEXTURE_PERSPECTIVE_ENABLE (1 << 8)
1405#define NV04_TEXTURED_TRIANGLE_BLEND_SPECULAR_ENABLE_SHIFT 12 1405#define NV04_TEXTURED_TRIANGLE_BLEND_SPECULAR_ENABLE_SHIFT 12
1406#define NV04_TEXTURED_TRIANGLE_BLEND_SPECULAR_ENABLE_MASK 0x0000f000 1406#define NV04_TEXTURED_TRIANGLE_BLEND_SPECULAR_ENABLE_MASK 0x0000f000
1407#define NV04_TEXTURED_TRIANGLE_BLEND_FOG_ENABLE_SHIFT 16 1407#define NV04_TEXTURED_TRIANGLE_BLEND_FOG_ENABLE (1 << 16)
1408#define NV04_TEXTURED_TRIANGLE_BLEND_FOG_ENABLE_MASK 0x000f0000
1409#define NV04_TEXTURED_TRIANGLE_BLEND_BLEND_ENABLE (1 << 20) 1408#define NV04_TEXTURED_TRIANGLE_BLEND_BLEND_ENABLE (1 << 20)
1410#define NV04_TEXTURED_TRIANGLE_BLEND_SRC_SHIFT 24 1409#define NV04_TEXTURED_TRIANGLE_BLEND_SRC_SHIFT 24
1411#define NV04_TEXTURED_TRIANGLE_BLEND_SRC_MASK 0x0f000000 1410#define NV04_TEXTURED_TRIANGLE_BLEND_SRC_MASK 0x0f000000
@@ -1650,8 +1649,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1650#define NV04_MULTITEX_TRIANGLE_BLEND_TEXTURE_PERSPECTIVE_ENABLE (1 << 8) 1649#define NV04_MULTITEX_TRIANGLE_BLEND_TEXTURE_PERSPECTIVE_ENABLE (1 << 8)
1651#define NV04_MULTITEX_TRIANGLE_BLEND_SPECULAR_ENABLE_SHIFT 12 1650#define NV04_MULTITEX_TRIANGLE_BLEND_SPECULAR_ENABLE_SHIFT 12
1652#define NV04_MULTITEX_TRIANGLE_BLEND_SPECULAR_ENABLE_MASK 0x0000f000 1651#define NV04_MULTITEX_TRIANGLE_BLEND_SPECULAR_ENABLE_MASK 0x0000f000
1653#define NV04_MULTITEX_TRIANGLE_BLEND_FOG_ENABLE_SHIFT 16 1652#define NV04_MULTITEX_TRIANGLE_BLEND_FOG_ENABLE (1 << 16)
1654#define NV04_MULTITEX_TRIANGLE_BLEND_FOG_ENABLE_MASK 0x000f0000
1655#define NV04_MULTITEX_TRIANGLE_BLEND_BLEND_ENABLE (1 << 20) 1653#define NV04_MULTITEX_TRIANGLE_BLEND_BLEND_ENABLE (1 << 20)
1656#define NV04_MULTITEX_TRIANGLE_BLEND_SRC_SHIFT 24 1654#define NV04_MULTITEX_TRIANGLE_BLEND_SRC_SHIFT 24
1657#define NV04_MULTITEX_TRIANGLE_BLEND_SRC_MASK 0x0f000000 1655#define NV04_MULTITEX_TRIANGLE_BLEND_SRC_MASK 0x0f000000
@@ -2493,16 +2491,15 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2493#define NV10TCL_COLOR_MATERIAL_ENABLE_AMBIENT (1 << 2) 2491#define NV10TCL_COLOR_MATERIAL_ENABLE_AMBIENT (1 << 2)
2494#define NV10TCL_COLOR_MATERIAL_ENABLE_EMISSION (1 << 3) 2492#define NV10TCL_COLOR_MATERIAL_ENABLE_EMISSION (1 << 3)
2495#define NV10TCL_FOG_MODE 0x0000029c 2493#define NV10TCL_FOG_MODE 0x0000029c
2494#define NV10TCL_FOG_MODE_LINEAR 0x00002601
2496#define NV10TCL_FOG_MODE_EXP 0x00000800 2495#define NV10TCL_FOG_MODE_EXP 0x00000800
2497#define NV10TCL_FOG_MODE_EXP_2 0x00000802 2496#define NV10TCL_FOG_MODE_EXP_ABS 0x00000802
2498#define NV10TCL_FOG_MODE_EXP2 0x00000803 2497#define NV10TCL_FOG_MODE_EXP2 0x00000803
2499#define NV10TCL_FOG_MODE_LINEAR 0x00000804 2498#define NV10TCL_FOG_COORD 0x000002a0
2500#define NV10TCL_FOG_MODE_LINEAR_2 0x00002601 2499#define NV10TCL_FOG_COORD_FOG 0x00000000
2501#define NV10TCL_FOG_COORD_DIST 0x000002a0 2500#define NV10TCL_FOG_COORD_DIST_RADIAL 0x00000001
2502#define NV10TCL_FOG_COORD_DIST_COORD_FALSE 0x00000000 2501#define NV10TCL_FOG_COORD_DIST_ORTHOGONAL 0x00000002
2503#define NV10TCL_FOG_COORD_DIST_COORD_FRAGMENT_DEPTH_DISTANCE_EYE_RADIAL 0x00000001 2502#define NV10TCL_FOG_COORD_DIST_ORTHOGONAL_ABS 0x00000003
2504#define NV10TCL_FOG_COORD_DIST_COORD_FRAGMENT_DEPTH_DISTANCE_EYE_PLANE_ABSOLUTE 0x00000002
2505#define NV10TCL_FOG_COORD_DIST_COORD_FOG 0x00000003
2506#define NV10TCL_FOG_ENABLE 0x000002a4 2503#define NV10TCL_FOG_ENABLE 0x000002a4
2507#define NV10TCL_FOG_COLOR 0x000002a8 2504#define NV10TCL_FOG_COLOR 0x000002a8
2508#define NV10TCL_FOG_COLOR_R_SHIFT 0 2505#define NV10TCL_FOG_COLOR_R_SHIFT 0
@@ -3729,16 +3726,17 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3729#define NV20TCL_RC_FINAL1_E_MAPPING_SIGNED_NEGATE 0xe0000000 3726#define NV20TCL_RC_FINAL1_E_MAPPING_SIGNED_NEGATE 0xe0000000
3730#define NV20TCL_LIGHT_CONTROL 0x00000294 3727#define NV20TCL_LIGHT_CONTROL 0x00000294
3731#define NV20TCL_FOG_MODE 0x0000029c 3728#define NV20TCL_FOG_MODE 0x0000029c
3732#define NV20TCL_FOG_MODE_EXP 0x00000800 3729#define NV20TCL_FOG_MODE_LINEAR_UNSIGNED 0x00000804
3733#define NV20TCL_FOG_MODE_EXP_2 0x00000802 3730#define NV20TCL_FOG_MODE_LINEAR_SIGNED 0x00002601
3734#define NV20TCL_FOG_MODE_EXP2 0x00000803 3731#define NV20TCL_FOG_MODE_EXP_UNSIGNED 0x00000802
3735#define NV20TCL_FOG_MODE_LINEAR 0x00000804 3732#define NV20TCL_FOG_MODE_EXP_SIGNED 0x00000800
3736#define NV20TCL_FOG_MODE_LINEAR_2 0x00002601 3733#define NV20TCL_FOG_MODE_EXP2_UNSIGNED 0x00000803
3737#define NV20TCL_FOG_COORD_DIST 0x000002a0 3734#define NV20TCL_FOG_MODE_EXP2_SIGNED 0x00000801
3738#define NV20TCL_FOG_COORD_DIST_COORD_FALSE 0x00000000 3735#define NV20TCL_FOG_COORD 0x000002a0
3739#define NV20TCL_FOG_COORD_DIST_COORD_FRAGMENT_DEPTH_DISTANCE_EYE_RADIAL 0x00000001 3736#define NV20TCL_FOG_COORD_DIST_RADIAL 0x00000001
3740#define NV20TCL_FOG_COORD_DIST_COORD_FRAGMENT_DEPTH_DISTANCE_EYE_PLANE_ABSOLUTE 0x00000002 3737#define NV20TCL_FOG_COORD_DIST_ORTHOGONAL 0x00000002
3741#define NV20TCL_FOG_COORD_DIST_COORD_FOG 0x00000003 3738#define NV20TCL_FOG_COORD_DIST_ORTHOGONAL_ABS 0x00000003
3739#define NV20TCL_FOG_COORD_FOG 0x00000006
3742#define NV20TCL_FOG_ENABLE 0x000002a4 3740#define NV20TCL_FOG_ENABLE 0x000002a4
3743#define NV20TCL_FOG_COLOR 0x000002a8 3741#define NV20TCL_FOG_COLOR 0x000002a8
3744#define NV20TCL_FOG_COLOR_R_SHIFT 0 3742#define NV20TCL_FOG_COLOR_R_SHIFT 0
@@ -5317,16 +5315,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
5317#define NV34TCL_SCISSOR_VERT_H_SHIFT 16 5315#define NV34TCL_SCISSOR_VERT_H_SHIFT 16
5318#define NV34TCL_SCISSOR_VERT_H_MASK 0xffff0000 5316#define NV34TCL_SCISSOR_VERT_H_MASK 0xffff0000
5319#define NV34TCL_FOG_COORD_DIST 0x000008c8 5317#define NV34TCL_FOG_COORD_DIST 0x000008c8
5320#define NV34TCL_FOG_COORD_DIST_COORD_FALSE 0x00000000
5321#define NV34TCL_FOG_COORD_DIST_COORD_FRAGMENT_DEPTH_DISTANCE_EYE_RADIAL 0x00000001
5322#define NV34TCL_FOG_COORD_DIST_COORD_FRAGMENT_DEPTH_DISTANCE_EYE_PLANE_ABSOLUTE 0x00000002
5323#define NV34TCL_FOG_COORD_DIST_COORD_FOG 0x00000003
5324#define NV34TCL_FOG_MODE 0x000008cc 5318#define NV34TCL_FOG_MODE 0x000008cc
5325#define NV34TCL_FOG_MODE_EXP 0x00000800
5326#define NV34TCL_FOG_MODE_EXP_2 0x00000802
5327#define NV34TCL_FOG_MODE_EXP2 0x00000803
5328#define NV34TCL_FOG_MODE_LINEAR 0x00000804
5329#define NV34TCL_FOG_MODE_LINEAR_2 0x00002601
5330#define NV34TCL_FOG_EQUATION_CONSTANT 0x000008d0 5319#define NV34TCL_FOG_EQUATION_CONSTANT 0x000008d0
5331#define NV34TCL_FOG_EQUATION_LINEAR 0x000008d4 5320#define NV34TCL_FOG_EQUATION_LINEAR 0x000008d4
5332#define NV34TCL_FOG_EQUATION_QUADRATIC 0x000008d8 5321#define NV34TCL_FOG_EQUATION_QUADRATIC 0x000008d8
@@ -6118,6 +6107,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6118#define NV34TCL_FRONT_MATERIAL_SHININESS(x) (0x00001400+((x)*4)) 6107#define NV34TCL_FRONT_MATERIAL_SHININESS(x) (0x00001400+((x)*4))
6119#define NV34TCL_FRONT_MATERIAL_SHININESS__SIZE 0x00000006 6108#define NV34TCL_FRONT_MATERIAL_SHININESS__SIZE 0x00000006
6120#define NV34TCL_ENABLED_LIGHTS 0x00001420 6109#define NV34TCL_ENABLED_LIGHTS 0x00001420
6110#define NV34TCL_VERTEX_TWO_SIDE_ENABLE 0x0000142c
6121#define NV34TCL_FP_REG_CONTROL 0x00001450 6111#define NV34TCL_FP_REG_CONTROL 0x00001450
6122#define NV34TCL_FP_REG_CONTROL_UNK1_SHIFT 16 6112#define NV34TCL_FP_REG_CONTROL_UNK1_SHIFT 16
6123#define NV34TCL_FP_REG_CONTROL_UNK1_MASK 0xffff0000 6113#define NV34TCL_FP_REG_CONTROL_UNK1_MASK 0xffff0000
@@ -6954,6 +6944,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6954#define NV40TCL_UNK0B40__SIZE 0x00000008 6944#define NV40TCL_UNK0B40__SIZE 0x00000008
6955#define NV40TCL_VP_UPLOAD_INST(x) (0x00000b80+((x)*4)) 6945#define NV40TCL_VP_UPLOAD_INST(x) (0x00000b80+((x)*4))
6956#define NV40TCL_VP_UPLOAD_INST__SIZE 0x00000004 6946#define NV40TCL_VP_UPLOAD_INST__SIZE 0x00000004
6947#define NV40TCL_VERTEX_TWO_SIDE_ENABLE 0x0000142c
6957#define NV40TCL_CLIP_PLANE_ENABLE 0x00001478 6948#define NV40TCL_CLIP_PLANE_ENABLE 0x00001478
6958#define NV40TCL_CLIP_PLANE_ENABLE_PLANE0 (1 << 1) 6949#define NV40TCL_CLIP_PLANE_ENABLE_PLANE0 (1 << 1)
6959#define NV40TCL_CLIP_PLANE_ENABLE_PLANE1 (1 << 5) 6950#define NV40TCL_CLIP_PLANE_ENABLE_PLANE1 (1 << 5)