nouveau: Update nouveau_class.h.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>

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.
 #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_FOG_ENABLE_SHIFT					16
-#define   NV04_TEXTURED_TRIANGLE_BLEND_FOG_ENABLE_MASK					0x000f0000
+#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
 #define   NV04_TEXTURED_TRIANGLE_BLEND_SRC_MASK						0x0f000000
@@ -1650,8 +1649,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #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_FOG_ENABLE_SHIFT					16
-#define   NV04_MULTITEX_TRIANGLE_BLEND_FOG_ENABLE_MASK					0x000f0000
+#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
 #define   NV04_MULTITEX_TRIANGLE_BLEND_SRC_MASK						0x0f000000
@@ -2493,16 +2491,15 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV10TCL_COLOR_MATERIAL_ENABLE_AMBIENT						(1 <<  2)
 #define   NV10TCL_COLOR_MATERIAL_ENABLE_EMISSION					(1 <<  3)
 #define  NV10TCL_FOG_MODE								0x0000029c
+#define   NV10TCL_FOG_MODE_LINEAR							0x00002601
 #define   NV10TCL_FOG_MODE_EXP								0x00000800
-#define   NV10TCL_FOG_MODE_EXP_2							0x00000802
+#define   NV10TCL_FOG_MODE_EXP_ABS							0x00000802
 #define   NV10TCL_FOG_MODE_EXP2								0x00000803
-#define   NV10TCL_FOG_MODE_LINEAR							0x00000804
-#define   NV10TCL_FOG_MODE_LINEAR_2							0x00002601
-#define  NV10TCL_FOG_COORD_DIST								0x000002a0
-#define   NV10TCL_FOG_COORD_DIST_COORD_FALSE						0x00000000
-#define   NV10TCL_FOG_COORD_DIST_COORD_FRAGMENT_DEPTH_DISTANCE_EYE_RADIAL		0x00000001
-#define   NV10TCL_FOG_COORD_DIST_COORD_FRAGMENT_DEPTH_DISTANCE_EYE_PLANE_ABSOLUTE	0x00000002
-#define   NV10TCL_FOG_COORD_DIST_COORD_FOG						0x00000003
+#define  NV10TCL_FOG_COORD								0x000002a0
+#define   NV10TCL_FOG_COORD_FOG								0x00000000
+#define   NV10TCL_FOG_COORD_DIST_RADIAL							0x00000001
+#define   NV10TCL_FOG_COORD_DIST_ORTHOGONAL						0x00000002
+#define   NV10TCL_FOG_COORD_DIST_ORTHOGONAL_ABS						0x00000003
 #define  NV10TCL_FOG_ENABLE								0x000002a4
 #define  NV10TCL_FOG_COLOR								0x000002a8
 #define   NV10TCL_FOG_COLOR_R_SHIFT							0
@@ -3729,16 +3726,17 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define    NV20TCL_RC_FINAL1_E_MAPPING_SIGNED_NEGATE					0xe0000000
 #define  NV20TCL_LIGHT_CONTROL								0x00000294
 #define  NV20TCL_FOG_MODE								0x0000029c
-#define   NV20TCL_FOG_MODE_EXP								0x00000800
-#define   NV20TCL_FOG_MODE_EXP_2							0x00000802
-#define   NV20TCL_FOG_MODE_EXP2								0x00000803
-#define   NV20TCL_FOG_MODE_LINEAR							0x00000804
-#define   NV20TCL_FOG_MODE_LINEAR_2							0x00002601
-#define  NV20TCL_FOG_COORD_DIST								0x000002a0
-#define   NV20TCL_FOG_COORD_DIST_COORD_FALSE						0x00000000
-#define   NV20TCL_FOG_COORD_DIST_COORD_FRAGMENT_DEPTH_DISTANCE_EYE_RADIAL		0x00000001
-#define   NV20TCL_FOG_COORD_DIST_COORD_FRAGMENT_DEPTH_DISTANCE_EYE_PLANE_ABSOLUTE	0x00000002
-#define   NV20TCL_FOG_COORD_DIST_COORD_FOG						0x00000003
+#define   NV20TCL_FOG_MODE_LINEAR_UNSIGNED						0x00000804
+#define   NV20TCL_FOG_MODE_LINEAR_SIGNED						0x00002601
+#define   NV20TCL_FOG_MODE_EXP_UNSIGNED							0x00000802
+#define   NV20TCL_FOG_MODE_EXP_SIGNED							0x00000800
+#define   NV20TCL_FOG_MODE_EXP2_UNSIGNED						0x00000803
+#define   NV20TCL_FOG_MODE_EXP2_SIGNED							0x00000801
+#define  NV20TCL_FOG_COORD								0x000002a0
+#define   NV20TCL_FOG_COORD_DIST_RADIAL							0x00000001
+#define   NV20TCL_FOG_COORD_DIST_ORTHOGONAL						0x00000002
+#define   NV20TCL_FOG_COORD_DIST_ORTHOGONAL_ABS						0x00000003
+#define   NV20TCL_FOG_COORD_FOG								0x00000006
 #define  NV20TCL_FOG_ENABLE								0x000002a4
 #define  NV20TCL_FOG_COLOR								0x000002a8
 #define   NV20TCL_FOG_COLOR_R_SHIFT							0
@@ -5317,16 +5315,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV34TCL_SCISSOR_VERT_H_SHIFT							16
 #define   NV34TCL_SCISSOR_VERT_H_MASK							0xffff0000
 #define  NV34TCL_FOG_COORD_DIST								0x000008c8
-#define   NV34TCL_FOG_COORD_DIST_COORD_FALSE						0x00000000
-#define   NV34TCL_FOG_COORD_DIST_COORD_FRAGMENT_DEPTH_DISTANCE_EYE_RADIAL		0x00000001
-#define   NV34TCL_FOG_COORD_DIST_COORD_FRAGMENT_DEPTH_DISTANCE_EYE_PLANE_ABSOLUTE	0x00000002
-#define   NV34TCL_FOG_COORD_DIST_COORD_FOG						0x00000003
 #define  NV34TCL_FOG_MODE								0x000008cc
-#define   NV34TCL_FOG_MODE_EXP								0x00000800
-#define   NV34TCL_FOG_MODE_EXP_2							0x00000802
-#define   NV34TCL_FOG_MODE_EXP2								0x00000803
-#define   NV34TCL_FOG_MODE_LINEAR							0x00000804
-#define   NV34TCL_FOG_MODE_LINEAR_2							0x00002601
 #define  NV34TCL_FOG_EQUATION_CONSTANT							0x000008d0
 #define  NV34TCL_FOG_EQUATION_LINEAR							0x000008d4
 #define  NV34TCL_FOG_EQUATION_QUADRATIC							0x000008d8
@@ -6118,6 +6107,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV34TCL_FRONT_MATERIAL_SHININESS(x)						(0x00001400+((x)*4))
 #define  NV34TCL_FRONT_MATERIAL_SHININESS__SIZE						0x00000006
 #define  NV34TCL_ENABLED_LIGHTS								0x00001420
+#define  NV34TCL_VERTEX_TWO_SIDE_ENABLE							0x0000142c
 #define  NV34TCL_FP_REG_CONTROL								0x00001450
 #define   NV34TCL_FP_REG_CONTROL_UNK1_SHIFT						16
 #define   NV34TCL_FP_REG_CONTROL_UNK1_MASK						0xffff0000
@@ -6954,6 +6944,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV40TCL_UNK0B40__SIZE								0x00000008
 #define  NV40TCL_VP_UPLOAD_INST(x)							(0x00000b80+((x)*4))
 #define  NV40TCL_VP_UPLOAD_INST__SIZE							0x00000004
+#define  NV40TCL_VERTEX_TWO_SIDE_ENABLE							0x0000142c
 #define  NV40TCL_CLIP_PLANE_ENABLE							0x00001478
 #define   NV40TCL_CLIP_PLANE_ENABLE_PLANE0						(1 <<  1)
 #define   NV40TCL_CLIP_PLANE_ENABLE_PLANE1						(1 <<  5)