nouveau: import color material r,g,b,a

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_reg.h b/src/mesa/drivers/dri/nouveau/nouveau_reg.h
index 200e770903f1819aa7be6e9e7507d20049dee22d..74f55c649ae9633b5047e783d5f390ef0b2f885a 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_reg.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_reg.h
@@ -383,7 +383,10 @@ Object NV11_TCL_PRIMITIVE_3D used on: NV15
 #      define          NV10_TCL_PRIMITIVE_3D_CULL_FACE                         0x0000039c
 #      define          NV10_TCL_PRIMITIVE_3D_FRONT_FACE                        0x000003a0
 #      define          NV10_TCL_PRIMITIVE_3D_NORMALIZE_ENABLE                  0x000003a4
-#      define          NV10_TCL_PRIMITIVE_3D_MATERIAL_DIFFUSE_ALPHA_FRONT      0x000003b4
+#      define          NV10_TCL_PRIMITIVE_3D_COLOR_MATERIAL_R                  0x000003a8
+#      define          NV10_TCL_PRIMITIVE_3D_COLOR_MATERIAL_G                  0x000003ac
+#      define          NV10_TCL_PRIMITIVE_3D_COLOR_MATERIAL_B                  0x000003b0
+#      define          NV10_TCL_PRIMITIVE_3D_COLOR_MATERIAL_A                  0x000003b4
 #      define          NV10_TCL_PRIMITIVE_3D_COLOR_CONTROL                     0x000003b8      /* Parameters: color_control */
 #      define          NV10_TCL_PRIMITIVE_3D_ENABLED_LIGHTS                    0x000003bc      /* Parameters: light 7 light 6 light 5 light 4 light 3 light 2 light 1 light 0 */
 #      define          NV10_TCL_PRIMITIVE_3D_CLIP_PLANE_ENABLE( d)             (0x000003c0 + d * 0x0004)
@@ -729,8 +732,10 @@ Object NV20_TCL_PRIMITIVE_3D used on: NV20
 #      define          NV20_TCL_PRIMITIVE_3D_CULL_FACE                         0x0000039c
 #      define          NV20_TCL_PRIMITIVE_3D_FRONT_FACE                        0x000003a0
 #      define          NV20_TCL_PRIMITIVE_3D_NORMALIZE_ENABLE                  0x000003a4
-#      define          NV20_TCL_PRIMITIVE_3D_COLOR_MATERIAL_FRONT              0x000003a8
-#      define          NV20_TCL_PRIMITIVE_3D_MATERIAL_DIFFUSE_ALPHA_FRONT      0x000003b4
+#      define          NV20_TCL_PRIMITIVE_3D_COLOR_MATERIAL_FRONT_R            0x000003a8
+#      define          NV20_TCL_PRIMITIVE_3D_COLOR_MATERIAL_FRONT_G            0x000003ac
+#      define          NV20_TCL_PRIMITIVE_3D_COLOR_MATERIAL_FRONT_B            0x000003b0
+#      define          NV20_TCL_PRIMITIVE_3D_COLOR_MATERIAL_FRONT_A            0x000003b4
 #      define          NV20_TCL_PRIMITIVE_3D_SEPARATE_SPECULAR_ENABLE          0x000003b8
 #      define          NV20_TCL_PRIMITIVE_3D_ENABLED_LIGHTS                    0x000003bc      /* Parameters: light 7 light 6 light 5 light 4 light 3 light 2 light 1 light 0 */
 #      define          NV20_TCL_PRIMITIVE_3D_CLIP_PLANE_ENABLE(d)              (0x000003c0 + d * 0x0004)
@@ -930,8 +935,10 @@ Object NV20_TCL_PRIMITIVE_3D used on: NV20
 #      define          NV20_TCL_PRIMITIVE_3D_LIGHT_MODEL_BACK_SIDE_PRODUCT_AMBIENT_PLUS_EMISSION_R     0x000017a0
 #      define          NV20_TCL_PRIMITIVE_3D_LIGHT_MODEL_BACK_SIDE_PRODUCT_AMBIENT_PLUS_EMISSION_G     0x000017a4
 #      define          NV20_TCL_PRIMITIVE_3D_LIGHT_MODEL_BACK_SIDE_PRODUCT_AMBIENT_PLUS_EMISSION_B     0x000017a8
-#      define          NV20_TCL_PRIMITIVE_3D_MATERIAL_DIFFUSE_ALPHA_BACK       0x000017ac
-#      define          NV20_TCL_PRIMITIVE_3D_COLOR_MATERIAL_BACK               0x000017b0
+#      define          NV20_TCL_PRIMITIVE_3D_COLOR_MATERIAL_BACK_A             0x000017ac
+#      define          NV20_TCL_PRIMITIVE_3D_COLOR_MATERIAL_BACK_R             0x000017b0
+#      define          NV20_TCL_PRIMITIVE_3D_COLOR_MATERIAL_BACK_G             0x000017b4
+#      define          NV20_TCL_PRIMITIVE_3D_COLOR_MATERIAL_BACK_B             0x000017b8
 #      define          NV20_TCL_PRIMITIVE_3D_COLOR_LOGIC_OP_ENABLE             0x000017bc
 #      define          NV20_TCL_PRIMITIVE_3D_COLOR_LOGIC_OP_OP                 0x000017c0
 #      define          NV20_TCL_PRIMITIVE_3D_LIGHT_MODEL_TWO_SIDE_ENABLE       0x000017c4
@@ -1004,7 +1011,10 @@ Object NV30_TCL_PRIMITIVE_3D used on: NV30 NV40 G70
 #      define          NV30_TCL_PRIMITIVE_3D_NORMALIZE_ENABLE                  0x0000037c
 #      define          NV30_TCL_PRIMITIVE_3D_DEPTH_RANGE_NEAR                  0x00000394
 #      define          NV30_TCL_PRIMITIVE_3D_DEPTH_RANGE_FAR                   0x00000398
-#      define          NV30_TCL_PRIMITIVE_3D_MATERIAL_DIFFUSE_ALPHA_FRONT      0x000003b4
+#      define          NV30_TCL_PRIMITIVE_3D_COLOR_MATERIAL_FRONT_R            0x000003a0
+#      define          NV30_TCL_PRIMITIVE_3D_COLOR_MATERIAL_FRONT_G            0x000003a4
+#      define          NV30_TCL_PRIMITIVE_3D_COLOR_MATERIAL_FRONT_B            0x000003a8
+#      define          NV30_TCL_PRIMITIVE_3D_COLOR_MATERIAL_FRONT_A            0x000003b4
 #      define          NV30_TCL_PRIMITIVE_3D_LINE_WIDTH_SMOOTH                 0x000003b8
 #      define          NV30_TCL_PRIMITIVE_3D_CLIP_PLANE_ENABLE(d)              (0x00000400 + d * 0x0004)
 #      define          NV30_TCL_PRIMITIVE_3D_MODELVIEW_MATRIX( d)              (0x00000480 + d * 0x0004)
@@ -1196,7 +1206,10 @@ Object NV30_TCL_PRIMITIVE_3D used on: NV30 NV40 G70
 #      define          NV30_TCL_PRIMITIVE_3D_LIGHT_MODEL_BACK_SIDE_PRODUCT_AMBIENT_PLUS_EMISSION_R     0x000017a0
 #      define          NV30_TCL_PRIMITIVE_3D_LIGHT_MODEL_BACK_SIDE_PRODUCT_AMBIENT_PLUS_EMISSION_G     0x000017a4
 #      define          NV30_TCL_PRIMITIVE_3D_LIGHT_MODEL_BACK_SIDE_PRODUCT_AMBIENT_PLUS_EMISSION_B     0x000017a8
-#      define          NV30_TCL_PRIMITIVE_3D_MATERIAL_DIFFUSE_ALPHA_BACK       0x000017c0
+#      define          NV30_TCL_PRIMITIVE_3D_COLOR_MATERIAL_BACK_R             0x000017b0
+#      define          NV30_TCL_PRIMITIVE_3D_COLOR_MATERIAL_BACK_G             0x000017b4
+#      define          NV30_TCL_PRIMITIVE_3D_COLOR_MATERIAL_BACK_B             0x000017b8
+#      define          NV30_TCL_PRIMITIVE_3D_COLOR_MATERIAL_BACK_A             0x000017c0
 #      define          NV30_TCL_PRIMITIVE_3D_FP_ACTIVE_PROGRAM                 0x000008e4
 #      define          NV30_TCL_PRIMITIVE_3D_TX_ADDRESS_UNIT(d)                (0x00001a00 + d * 0x0020)
 #      define          NV30_TCL_PRIMITIVE_3D_TX_FORMAT_UNIT(d)                 (0x00001a04 + d * 0x0020)       /* Parameters: mipmap type format ncomp cubic */