nouveau: Regenerate nouveau_class.h.
authorFrancisco Jerez <currojerez@riseup.net>
Wed, 17 Mar 2010 20:40:33 +0000 (21:40 +0100)
committerFrancisco Jerez <currojerez@riseup.net>
Thu, 18 Mar 2010 14:04:20 +0000 (15:04 +0100)
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
nouveau/nouveau_class.h

index 9b417ce..0167cbc 100644 (file)
@@ -2866,38 +2866,38 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define    NV10TCL_ENABLED_LIGHTS_7_NONPOSITIONAL                                      0x00004000
 #define    NV10TCL_ENABLED_LIGHTS_7_POSITIONAL                                         0x00008000
 #define    NV10TCL_ENABLED_LIGHTS_7_DIRECTIONAL                                                0x0000c000
-#define  NV10TCL_TX_GEN_S(x)                                                           (0x000003c0+((x)*16))
-#define  NV10TCL_TX_GEN_S__SIZE                                                                0x00000002
-#define   NV10TCL_TX_GEN_S_FALSE                                                       0x00000000
-#define   NV10TCL_TX_GEN_S_EYE_LINEAR                                                  0x00002400
-#define   NV10TCL_TX_GEN_S_OBJECT_LINEAR                                               0x00002401
-#define   NV10TCL_TX_GEN_S_SPHERE_MAP                                                  0x00002402
-#define   NV10TCL_TX_GEN_S_NORMAL_MAP                                                  0x00008511
-#define   NV10TCL_TX_GEN_S_REFLECTION_MAP                                              0x00008512
-#define  NV10TCL_TX_GEN_T(x)                                                           (0x000003c4+((x)*16))
-#define  NV10TCL_TX_GEN_T__SIZE                                                                0x00000002
-#define   NV10TCL_TX_GEN_T_FALSE                                                       0x00000000
-#define   NV10TCL_TX_GEN_T_EYE_LINEAR                                                  0x00002400
-#define   NV10TCL_TX_GEN_T_OBJECT_LINEAR                                               0x00002401
-#define   NV10TCL_TX_GEN_T_SPHERE_MAP                                                  0x00002402
-#define   NV10TCL_TX_GEN_T_NORMAL_MAP                                                  0x00008511
-#define   NV10TCL_TX_GEN_T_REFLECTION_MAP                                              0x00008512
-#define  NV10TCL_TX_GEN_R(x)                                                           (0x000003c8+((x)*16))
-#define  NV10TCL_TX_GEN_R__SIZE                                                                0x00000002
-#define   NV10TCL_TX_GEN_R_FALSE                                                       0x00000000
-#define   NV10TCL_TX_GEN_R_EYE_LINEAR                                                  0x00002400
-#define   NV10TCL_TX_GEN_R_OBJECT_LINEAR                                               0x00002401
-#define   NV10TCL_TX_GEN_R_SPHERE_MAP                                                  0x00002402
-#define   NV10TCL_TX_GEN_R_NORMAL_MAP                                                  0x00008511
-#define   NV10TCL_TX_GEN_R_REFLECTION_MAP                                              0x00008512
-#define  NV10TCL_TX_GEN_Q(x)                                                           (0x000003cc+((x)*16))
-#define  NV10TCL_TX_GEN_Q__SIZE                                                                0x00000002
-#define   NV10TCL_TX_GEN_Q_FALSE                                                       0x00000000
-#define   NV10TCL_TX_GEN_Q_EYE_LINEAR                                                  0x00002400
-#define   NV10TCL_TX_GEN_Q_OBJECT_LINEAR                                               0x00002401
-#define   NV10TCL_TX_GEN_Q_SPHERE_MAP                                                  0x00002402
-#define   NV10TCL_TX_GEN_Q_NORMAL_MAP                                                  0x00008511
-#define   NV10TCL_TX_GEN_Q_REFLECTION_MAP                                              0x00008512
+#define  NV10TCL_TX_GEN_MODE_S(x)                                                      (0x000003c0+((x)*16))
+#define  NV10TCL_TX_GEN_MODE_S__SIZE                                                   0x00000002
+#define   NV10TCL_TX_GEN_MODE_S_FALSE                                                  0x00000000
+#define   NV10TCL_TX_GEN_MODE_S_EYE_LINEAR                                             0x00002400
+#define   NV10TCL_TX_GEN_MODE_S_OBJECT_LINEAR                                          0x00002401
+#define   NV10TCL_TX_GEN_MODE_S_SPHERE_MAP                                             0x00002402
+#define   NV10TCL_TX_GEN_MODE_S_NORMAL_MAP                                             0x00008511
+#define   NV10TCL_TX_GEN_MODE_S_REFLECTION_MAP                                         0x00008512
+#define  NV10TCL_TX_GEN_MODE_T(x)                                                      (0x000003c4+((x)*16))
+#define  NV10TCL_TX_GEN_MODE_T__SIZE                                                   0x00000002
+#define   NV10TCL_TX_GEN_MODE_T_FALSE                                                  0x00000000
+#define   NV10TCL_TX_GEN_MODE_T_EYE_LINEAR                                             0x00002400
+#define   NV10TCL_TX_GEN_MODE_T_OBJECT_LINEAR                                          0x00002401
+#define   NV10TCL_TX_GEN_MODE_T_SPHERE_MAP                                             0x00002402
+#define   NV10TCL_TX_GEN_MODE_T_NORMAL_MAP                                             0x00008511
+#define   NV10TCL_TX_GEN_MODE_T_REFLECTION_MAP                                         0x00008512
+#define  NV10TCL_TX_GEN_MODE_R(x)                                                      (0x000003c8+((x)*16))
+#define  NV10TCL_TX_GEN_MODE_R__SIZE                                                   0x00000002
+#define   NV10TCL_TX_GEN_MODE_R_FALSE                                                  0x00000000
+#define   NV10TCL_TX_GEN_MODE_R_EYE_LINEAR                                             0x00002400
+#define   NV10TCL_TX_GEN_MODE_R_OBJECT_LINEAR                                          0x00002401
+#define   NV10TCL_TX_GEN_MODE_R_SPHERE_MAP                                             0x00002402
+#define   NV10TCL_TX_GEN_MODE_R_NORMAL_MAP                                             0x00008511
+#define   NV10TCL_TX_GEN_MODE_R_REFLECTION_MAP                                         0x00008512
+#define  NV10TCL_TX_GEN_MODE_Q(x)                                                      (0x000003cc+((x)*16))
+#define  NV10TCL_TX_GEN_MODE_Q__SIZE                                                   0x00000002
+#define   NV10TCL_TX_GEN_MODE_Q_FALSE                                                  0x00000000
+#define   NV10TCL_TX_GEN_MODE_Q_EYE_LINEAR                                             0x00002400
+#define   NV10TCL_TX_GEN_MODE_Q_OBJECT_LINEAR                                          0x00002401
+#define   NV10TCL_TX_GEN_MODE_Q_SPHERE_MAP                                             0x00002402
+#define   NV10TCL_TX_GEN_MODE_Q_NORMAL_MAP                                             0x00008511
+#define   NV10TCL_TX_GEN_MODE_Q_REFLECTION_MAP                                         0x00008512
 #define  NV10TCL_TX_MATRIX_ENABLE(x)                                                   (0x000003e0+((x)*4))
 #define  NV10TCL_TX_MATRIX_ENABLE__SIZE                                                        0x00000002
 #define  NV10TCL_VIEW_MATRIX_ENABLE                                                    0x000003e8
@@ -2919,14 +2919,38 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV10TCL_TX0_MATRIX__SIZE                                                      0x00000010
 #define  NV10TCL_TX1_MATRIX(x)                                                         (0x00000580+((x)*4))
 #define  NV10TCL_TX1_MATRIX__SIZE                                                      0x00000010
-#define  NV10TCL_CLIP_PLANE_A(x)                                                       (0x00000600+((x)*16))
-#define  NV10TCL_CLIP_PLANE_A__SIZE                                                    0x00000008
-#define  NV10TCL_CLIP_PLANE_B(x)                                                       (0x00000604+((x)*16))
-#define  NV10TCL_CLIP_PLANE_B__SIZE                                                    0x00000008
-#define  NV10TCL_CLIP_PLANE_C(x)                                                       (0x00000608+((x)*16))
-#define  NV10TCL_CLIP_PLANE_C__SIZE                                                    0x00000008
-#define  NV10TCL_CLIP_PLANE_D(x)                                                       (0x0000060c+((x)*16))
-#define  NV10TCL_CLIP_PLANE_D__SIZE                                                    0x00000008
+#define  NV10TCL_TX_GEN_COEFF_S_A(x)                                                   (0x00000600+((x)*64))
+#define  NV10TCL_TX_GEN_COEFF_S_A__SIZE                                                        0x00000002
+#define  NV10TCL_TX_GEN_COEFF_S_B(x)                                                   (0x00000604+((x)*64))
+#define  NV10TCL_TX_GEN_COEFF_S_B__SIZE                                                        0x00000002
+#define  NV10TCL_TX_GEN_COEFF_S_C(x)                                                   (0x00000608+((x)*64))
+#define  NV10TCL_TX_GEN_COEFF_S_C__SIZE                                                        0x00000002
+#define  NV10TCL_TX_GEN_COEFF_S_D(x)                                                   (0x0000060c+((x)*64))
+#define  NV10TCL_TX_GEN_COEFF_S_D__SIZE                                                        0x00000002
+#define  NV10TCL_TX_GEN_COEFF_T_A(x)                                                   (0x00000610+((x)*64))
+#define  NV10TCL_TX_GEN_COEFF_T_A__SIZE                                                        0x00000002
+#define  NV10TCL_TX_GEN_COEFF_T_B(x)                                                   (0x00000614+((x)*64))
+#define  NV10TCL_TX_GEN_COEFF_T_B__SIZE                                                        0x00000002
+#define  NV10TCL_TX_GEN_COEFF_T_C(x)                                                   (0x00000618+((x)*64))
+#define  NV10TCL_TX_GEN_COEFF_T_C__SIZE                                                        0x00000002
+#define  NV10TCL_TX_GEN_COEFF_T_D(x)                                                   (0x0000061c+((x)*64))
+#define  NV10TCL_TX_GEN_COEFF_T_D__SIZE                                                        0x00000002
+#define  NV10TCL_TX_GEN_COEFF_R_A(x)                                                   (0x00000620+((x)*64))
+#define  NV10TCL_TX_GEN_COEFF_R_A__SIZE                                                        0x00000002
+#define  NV10TCL_TX_GEN_COEFF_R_B(x)                                                   (0x00000624+((x)*64))
+#define  NV10TCL_TX_GEN_COEFF_R_B__SIZE                                                        0x00000002
+#define  NV10TCL_TX_GEN_COEFF_R_C(x)                                                   (0x00000628+((x)*64))
+#define  NV10TCL_TX_GEN_COEFF_R_C__SIZE                                                        0x00000002
+#define  NV10TCL_TX_GEN_COEFF_R_D(x)                                                   (0x0000062c+((x)*64))
+#define  NV10TCL_TX_GEN_COEFF_R_D__SIZE                                                        0x00000002
+#define  NV10TCL_TX_GEN_COEFF_Q_A(x)                                                   (0x00000630+((x)*64))
+#define  NV10TCL_TX_GEN_COEFF_Q_A__SIZE                                                        0x00000002
+#define  NV10TCL_TX_GEN_COEFF_Q_B(x)                                                   (0x00000634+((x)*64))
+#define  NV10TCL_TX_GEN_COEFF_Q_B__SIZE                                                        0x00000002
+#define  NV10TCL_TX_GEN_COEFF_Q_C(x)                                                   (0x00000638+((x)*64))
+#define  NV10TCL_TX_GEN_COEFF_Q_C__SIZE                                                        0x00000002
+#define  NV10TCL_TX_GEN_COEFF_Q_D(x)                                                   (0x0000063c+((x)*64))
+#define  NV10TCL_TX_GEN_COEFF_Q_D__SIZE                                                        0x00000002
 #define  NV10TCL_FOG_EQUATION_CONSTANT                                                 0x00000680
 #define  NV10TCL_FOG_EQUATION_LINEAR                                                   0x00000684
 #define  NV10TCL_FOG_EQUATION_QUADRATIC                                                        0x00000688
@@ -3941,38 +3965,38 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define    NV20TCL_ENABLED_LIGHTS_7_NONPOSITIONAL                                      0x00004000
 #define    NV20TCL_ENABLED_LIGHTS_7_POSITIONAL                                         0x00008000
 #define    NV20TCL_ENABLED_LIGHTS_7_DIRECTIONAL                                                0x0000c000
-#define  NV20TCL_TX_GEN_S(x)                                                           (0x000003c0+((x)*16))
-#define  NV20TCL_TX_GEN_S__SIZE                                                                0x00000004
-#define   NV20TCL_TX_GEN_S_FALSE                                                       0x00000000
-#define   NV20TCL_TX_GEN_S_EYE_LINEAR                                                  0x00002400
-#define   NV20TCL_TX_GEN_S_OBJECT_LINEAR                                               0x00002401
-#define   NV20TCL_TX_GEN_S_SPHERE_MAP                                                  0x00002402
-#define   NV20TCL_TX_GEN_S_NORMAL_MAP                                                  0x00008511
-#define   NV20TCL_TX_GEN_S_REFLECTION_MAP                                              0x00008512
-#define  NV20TCL_TX_GEN_T(x)                                                           (0x000003c4+((x)*16))
-#define  NV20TCL_TX_GEN_T__SIZE                                                                0x00000004
-#define   NV20TCL_TX_GEN_T_FALSE                                                       0x00000000
-#define   NV20TCL_TX_GEN_T_EYE_LINEAR                                                  0x00002400
-#define   NV20TCL_TX_GEN_T_OBJECT_LINEAR                                               0x00002401
-#define   NV20TCL_TX_GEN_T_SPHERE_MAP                                                  0x00002402
-#define   NV20TCL_TX_GEN_T_NORMAL_MAP                                                  0x00008511
-#define   NV20TCL_TX_GEN_T_REFLECTION_MAP                                              0x00008512
-#define  NV20TCL_TX_GEN_R(x)                                                           (0x000003c8+((x)*16))
-#define  NV20TCL_TX_GEN_R__SIZE                                                                0x00000004
-#define   NV20TCL_TX_GEN_R_FALSE                                                       0x00000000
-#define   NV20TCL_TX_GEN_R_EYE_LINEAR                                                  0x00002400
-#define   NV20TCL_TX_GEN_R_OBJECT_LINEAR                                               0x00002401
-#define   NV20TCL_TX_GEN_R_SPHERE_MAP                                                  0x00002402
-#define   NV20TCL_TX_GEN_R_NORMAL_MAP                                                  0x00008511
-#define   NV20TCL_TX_GEN_R_REFLECTION_MAP                                              0x00008512
-#define  NV20TCL_TX_GEN_Q(x)                                                           (0x000003cc+((x)*16))
-#define  NV20TCL_TX_GEN_Q__SIZE                                                                0x00000004
-#define   NV20TCL_TX_GEN_Q_FALSE                                                       0x00000000
-#define   NV20TCL_TX_GEN_Q_EYE_LINEAR                                                  0x00002400
-#define   NV20TCL_TX_GEN_Q_OBJECT_LINEAR                                               0x00002401
-#define   NV20TCL_TX_GEN_Q_SPHERE_MAP                                                  0x00002402
-#define   NV20TCL_TX_GEN_Q_NORMAL_MAP                                                  0x00008511
-#define   NV20TCL_TX_GEN_Q_REFLECTION_MAP                                              0x00008512
+#define  NV20TCL_TX_GEN_MODE_S(x)                                                      (0x000003c0+((x)*16))
+#define  NV20TCL_TX_GEN_MODE_S__SIZE                                                   0x00000004
+#define   NV20TCL_TX_GEN_MODE_S_FALSE                                                  0x00000000
+#define   NV20TCL_TX_GEN_MODE_S_EYE_LINEAR                                             0x00002400
+#define   NV20TCL_TX_GEN_MODE_S_OBJECT_LINEAR                                          0x00002401
+#define   NV20TCL_TX_GEN_MODE_S_SPHERE_MAP                                             0x00002402
+#define   NV20TCL_TX_GEN_MODE_S_NORMAL_MAP                                             0x00008511
+#define   NV20TCL_TX_GEN_MODE_S_REFLECTION_MAP                                         0x00008512
+#define  NV20TCL_TX_GEN_MODE_T(x)                                                      (0x000003c4+((x)*16))
+#define  NV20TCL_TX_GEN_MODE_T__SIZE                                                   0x00000004
+#define   NV20TCL_TX_GEN_MODE_T_FALSE                                                  0x00000000
+#define   NV20TCL_TX_GEN_MODE_T_EYE_LINEAR                                             0x00002400
+#define   NV20TCL_TX_GEN_MODE_T_OBJECT_LINEAR                                          0x00002401
+#define   NV20TCL_TX_GEN_MODE_T_SPHERE_MAP                                             0x00002402
+#define   NV20TCL_TX_GEN_MODE_T_NORMAL_MAP                                             0x00008511
+#define   NV20TCL_TX_GEN_MODE_T_REFLECTION_MAP                                         0x00008512
+#define  NV20TCL_TX_GEN_MODE_R(x)                                                      (0x000003c8+((x)*16))
+#define  NV20TCL_TX_GEN_MODE_R__SIZE                                                   0x00000004
+#define   NV20TCL_TX_GEN_MODE_R_FALSE                                                  0x00000000
+#define   NV20TCL_TX_GEN_MODE_R_EYE_LINEAR                                             0x00002400
+#define   NV20TCL_TX_GEN_MODE_R_OBJECT_LINEAR                                          0x00002401
+#define   NV20TCL_TX_GEN_MODE_R_SPHERE_MAP                                             0x00002402
+#define   NV20TCL_TX_GEN_MODE_R_NORMAL_MAP                                             0x00008511
+#define   NV20TCL_TX_GEN_MODE_R_REFLECTION_MAP                                         0x00008512
+#define  NV20TCL_TX_GEN_MODE_Q(x)                                                      (0x000003cc+((x)*16))
+#define  NV20TCL_TX_GEN_MODE_Q__SIZE                                                   0x00000004
+#define   NV20TCL_TX_GEN_MODE_Q_FALSE                                                  0x00000000
+#define   NV20TCL_TX_GEN_MODE_Q_EYE_LINEAR                                             0x00002400
+#define   NV20TCL_TX_GEN_MODE_Q_OBJECT_LINEAR                                          0x00002401
+#define   NV20TCL_TX_GEN_MODE_Q_SPHERE_MAP                                             0x00002402
+#define   NV20TCL_TX_GEN_MODE_Q_NORMAL_MAP                                             0x00008511
+#define   NV20TCL_TX_GEN_MODE_Q_REFLECTION_MAP                                         0x00008512
 #define  NV20TCL_TX_MATRIX_ENABLE(x)                                                   (0x00000420+((x)*4))
 #define  NV20TCL_TX_MATRIX_ENABLE__SIZE                                                        0x00000004
 #define  NV20TCL_POINT_SIZE                                                            0x0000043c
@@ -4002,38 +4026,38 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV20TCL_TX2_MATRIX__SIZE                                                      0x00000010
 #define  NV20TCL_TX3_MATRIX(x)                                                         (0x00000780+((x)*4))
 #define  NV20TCL_TX3_MATRIX__SIZE                                                      0x00000010
-#define  NV20TCL_TX0_CLIP_PLANE_A(x)                                                   (0x00000840+((x)*16))
-#define  NV20TCL_TX0_CLIP_PLANE_A__SIZE                                                        0x00000004
-#define  NV20TCL_TX0_CLIP_PLANE_B(x)                                                   (0x00000844+((x)*16))
-#define  NV20TCL_TX0_CLIP_PLANE_B__SIZE                                                        0x00000004
-#define  NV20TCL_TX0_CLIP_PLANE_C(x)                                                   (0x00000848+((x)*16))
-#define  NV20TCL_TX0_CLIP_PLANE_C__SIZE                                                        0x00000004
-#define  NV20TCL_TX0_CLIP_PLANE_D(x)                                                   (0x0000084c+((x)*16))
-#define  NV20TCL_TX0_CLIP_PLANE_D__SIZE                                                        0x00000004
-#define  NV20TCL_TX1_CLIP_PLANE_A(x)                                                   (0x00000880+((x)*16))
-#define  NV20TCL_TX1_CLIP_PLANE_A__SIZE                                                        0x00000004
-#define  NV20TCL_TX1_CLIP_PLANE_B(x)                                                   (0x00000884+((x)*16))
-#define  NV20TCL_TX1_CLIP_PLANE_B__SIZE                                                        0x00000004
-#define  NV20TCL_TX1_CLIP_PLANE_C(x)                                                   (0x00000888+((x)*16))
-#define  NV20TCL_TX1_CLIP_PLANE_C__SIZE                                                        0x00000004
-#define  NV20TCL_TX1_CLIP_PLANE_D(x)                                                   (0x0000088c+((x)*16))
-#define  NV20TCL_TX1_CLIP_PLANE_D__SIZE                                                        0x00000004
-#define  NV20TCL_TX2_CLIP_PLANE_A(x)                                                   (0x000008c0+((x)*16))
-#define  NV20TCL_TX2_CLIP_PLANE_A__SIZE                                                        0x00000004
-#define  NV20TCL_TX2_CLIP_PLANE_B(x)                                                   (0x000008c4+((x)*16))
-#define  NV20TCL_TX2_CLIP_PLANE_B__SIZE                                                        0x00000004
-#define  NV20TCL_TX2_CLIP_PLANE_C(x)                                                   (0x000008c8+((x)*16))
-#define  NV20TCL_TX2_CLIP_PLANE_C__SIZE                                                        0x00000004
-#define  NV20TCL_TX2_CLIP_PLANE_D(x)                                                   (0x000008cc+((x)*16))
-#define  NV20TCL_TX2_CLIP_PLANE_D__SIZE                                                        0x00000004
-#define  NV20TCL_TX3_CLIP_PLANE_A(x)                                                   (0x00000900+((x)*16))
-#define  NV20TCL_TX3_CLIP_PLANE_A__SIZE                                                        0x00000004
-#define  NV20TCL_TX3_CLIP_PLANE_B(x)                                                   (0x00000904+((x)*16))
-#define  NV20TCL_TX3_CLIP_PLANE_B__SIZE                                                        0x00000004
-#define  NV20TCL_TX3_CLIP_PLANE_C(x)                                                   (0x00000908+((x)*16))
-#define  NV20TCL_TX3_CLIP_PLANE_C__SIZE                                                        0x00000004
-#define  NV20TCL_TX3_CLIP_PLANE_D(x)                                                   (0x0000090c+((x)*16))
-#define  NV20TCL_TX3_CLIP_PLANE_D__SIZE                                                        0x00000004
+#define  NV20TCL_TX_GEN_COEFF_S_A(x)                                                   (0x00000840+((x)*64))
+#define  NV20TCL_TX_GEN_COEFF_S_A__SIZE                                                        0x00000004
+#define  NV20TCL_TX_GEN_COEFF_S_B(x)                                                   (0x00000844+((x)*64))
+#define  NV20TCL_TX_GEN_COEFF_S_B__SIZE                                                        0x00000004
+#define  NV20TCL_TX_GEN_COEFF_S_C(x)                                                   (0x00000848+((x)*64))
+#define  NV20TCL_TX_GEN_COEFF_S_C__SIZE                                                        0x00000004
+#define  NV20TCL_TX_GEN_COEFF_S_D(x)                                                   (0x0000084c+((x)*64))
+#define  NV20TCL_TX_GEN_COEFF_S_D__SIZE                                                        0x00000004
+#define  NV20TCL_TX_GEN_COEFF_T_A(x)                                                   (0x00000850+((x)*64))
+#define  NV20TCL_TX_GEN_COEFF_T_A__SIZE                                                        0x00000004
+#define  NV20TCL_TX_GEN_COEFF_T_B(x)                                                   (0x00000854+((x)*64))
+#define  NV20TCL_TX_GEN_COEFF_T_B__SIZE                                                        0x00000004
+#define  NV20TCL_TX_GEN_COEFF_T_C(x)                                                   (0x00000858+((x)*64))
+#define  NV20TCL_TX_GEN_COEFF_T_C__SIZE                                                        0x00000004
+#define  NV20TCL_TX_GEN_COEFF_T_D(x)                                                   (0x0000085c+((x)*64))
+#define  NV20TCL_TX_GEN_COEFF_T_D__SIZE                                                        0x00000004
+#define  NV20TCL_TX_GEN_COEFF_R_A(x)                                                   (0x00000860+((x)*64))
+#define  NV20TCL_TX_GEN_COEFF_R_A__SIZE                                                        0x00000004
+#define  NV20TCL_TX_GEN_COEFF_R_B(x)                                                   (0x00000864+((x)*64))
+#define  NV20TCL_TX_GEN_COEFF_R_B__SIZE                                                        0x00000004
+#define  NV20TCL_TX_GEN_COEFF_R_C(x)                                                   (0x00000868+((x)*64))
+#define  NV20TCL_TX_GEN_COEFF_R_C__SIZE                                                        0x00000004
+#define  NV20TCL_TX_GEN_COEFF_R_D(x)                                                   (0x0000086c+((x)*64))
+#define  NV20TCL_TX_GEN_COEFF_R_D__SIZE                                                        0x00000004
+#define  NV20TCL_TX_GEN_COEFF_Q_A(x)                                                   (0x00000870+((x)*64))
+#define  NV20TCL_TX_GEN_COEFF_Q_A__SIZE                                                        0x00000004
+#define  NV20TCL_TX_GEN_COEFF_Q_B(x)                                                   (0x00000874+((x)*64))
+#define  NV20TCL_TX_GEN_COEFF_Q_B__SIZE                                                        0x00000004
+#define  NV20TCL_TX_GEN_COEFF_Q_C(x)                                                   (0x00000878+((x)*64))
+#define  NV20TCL_TX_GEN_COEFF_Q_C__SIZE                                                        0x00000004
+#define  NV20TCL_TX_GEN_COEFF_Q_D(x)                                                   (0x0000087c+((x)*64))
+#define  NV20TCL_TX_GEN_COEFF_Q_D__SIZE                                                        0x00000004
 #define  NV20TCL_FOG_EQUATION_CONSTANT                                                 0x000009c0
 #define  NV20TCL_FOG_EQUATION_LINEAR                                                   0x000009c4
 #define  NV20TCL_FOG_EQUATION_QUADRATIC                                                        0x000009c8
@@ -6299,10 +6323,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define    NV34TCL_TX_FORMAT_FORMAT_DSDT8_RECT                                         0x00001700
 #define    NV34TCL_TX_FORMAT_FORMAT_A8L8                                               0x00001a00
 #define    NV34TCL_TX_FORMAT_FORMAT_A8_RECT                                            0x00001b00
-#define    NV34TCL_TX_FORMAT_FORMAT_A8_RECT2                                           0x00001b00
 #define    NV34TCL_TX_FORMAT_FORMAT_A4R4G4B4_RECT                                      0x00001d00
 #define    NV34TCL_TX_FORMAT_FORMAT_R8G8B8_RECT                                                0x00001e00
-#define    NV34TCL_TX_FORMAT_FORMAT_L8A8_RECT                                          0x00002000
 #define    NV34TCL_TX_FORMAT_FORMAT_A8L8_RECT                                          0x00002000
 #define    NV34TCL_TX_FORMAT_FORMAT_DSDT8                                              0x00002800
 #define    NV34TCL_TX_FORMAT_FORMAT_HILO16                                             0x00003300