dri/nouveau: Update nouveau_class.h.

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_class.h b/src/mesa/drivers/dri/nouveau/nouveau_class.h
index 32ee8157d5ddaf4ea119a32f40ca5937f1436dcb..5cb13acf7bcc397afac52b3e2ee6e5112f708a2e 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_class.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_class.h
@@ -2340,12 +2340,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV10TCL_RC_OUT_ALPHA_BIAS                                                    (1 << 15)
 #define    NV10TCL_RC_OUT_ALPHA_BIAS_NONE                                              0x00000000
 #define    NV10TCL_RC_OUT_ALPHA_BIAS_BIAS_BY_NEGATIVE_ONE_HALF                         0x00008000
-#define   NV10TCL_RC_OUT_ALPHA_SCALE_SHIFT                                             17
-#define   NV10TCL_RC_OUT_ALPHA_SCALE_MASK                                              0x00000000
+#define   NV10TCL_RC_OUT_ALPHA_SCALE_SHIFT                                             16
+#define   NV10TCL_RC_OUT_ALPHA_SCALE_MASK                                              0x00030000
 #define    NV10TCL_RC_OUT_ALPHA_SCALE_NONE                                             0x00000000
-#define    NV10TCL_RC_OUT_ALPHA_SCALE_SCALE_BY_TWO                                     0x00020000
-#define    NV10TCL_RC_OUT_ALPHA_SCALE_SCALE_BY_FOUR                                    0x00040000
-#define    NV10TCL_RC_OUT_ALPHA_SCALE_SCALE_BY_ONE_HALF                                        0x00060000
+#define    NV10TCL_RC_OUT_ALPHA_SCALE_SCALE_BY_TWO                                     0x00010000
+#define    NV10TCL_RC_OUT_ALPHA_SCALE_SCALE_BY_FOUR                                    0x00020000
+#define    NV10TCL_RC_OUT_ALPHA_SCALE_SCALE_BY_ONE_HALF                                        0x00030000
 #define  NV10TCL_RC_OUT_RGB(x)                                                         (0x00000280+((x)*4))
 #define  NV10TCL_RC_OUT_RGB__SIZE                                                      0x00000002
 #define   NV10TCL_RC_OUT_RGB_CD_OUTPUT_SHIFT                                           0
@@ -2402,12 +2402,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV10TCL_RC_OUT_RGB_BIAS                                                      (1 << 15)
 #define    NV10TCL_RC_OUT_RGB_BIAS_NONE                                                        0x00000000
 #define    NV10TCL_RC_OUT_RGB_BIAS_BIAS_BY_NEGATIVE_ONE_HALF                           0x00008000
-#define   NV10TCL_RC_OUT_RGB_SCALE_SHIFT                                               17
-#define   NV10TCL_RC_OUT_RGB_SCALE_MASK                                                        0x00000000
+#define   NV10TCL_RC_OUT_RGB_SCALE_SHIFT                                               16
+#define   NV10TCL_RC_OUT_RGB_SCALE_MASK                                                        0x00030000
 #define    NV10TCL_RC_OUT_RGB_SCALE_NONE                                               0x00000000
-#define    NV10TCL_RC_OUT_RGB_SCALE_SCALE_BY_TWO                                       0x00020000
-#define    NV10TCL_RC_OUT_RGB_SCALE_SCALE_BY_FOUR                                      0x00040000
-#define    NV10TCL_RC_OUT_RGB_SCALE_SCALE_BY_ONE_HALF                                  0x00060000
+#define    NV10TCL_RC_OUT_RGB_SCALE_SCALE_BY_TWO                                       0x00010000
+#define    NV10TCL_RC_OUT_RGB_SCALE_SCALE_BY_FOUR                                      0x00020000
+#define    NV10TCL_RC_OUT_RGB_SCALE_SCALE_BY_ONE_HALF                                  0x00030000
 #define   NV10TCL_RC_OUT_RGB_OPERATION_SHIFT                                           27
 #define   NV10TCL_RC_OUT_RGB_OPERATION_MASK                                            0x38000000
 #define  NV10TCL_RC_FINAL0                                                             0x00000288
@@ -4148,12 +4148,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV20TCL_RC_OUT_ALPHA_BIAS                                                    (1 << 15)
 #define    NV20TCL_RC_OUT_ALPHA_BIAS_NONE                                              0x00000000
 #define    NV20TCL_RC_OUT_ALPHA_BIAS_BIAS_BY_NEGATIVE_ONE_HALF                         0x00008000
-#define   NV20TCL_RC_OUT_ALPHA_SCALE_SHIFT                                             17
-#define   NV20TCL_RC_OUT_ALPHA_SCALE_MASK                                              0x00000000
+#define   NV20TCL_RC_OUT_ALPHA_SCALE_SHIFT                                             16
+#define   NV20TCL_RC_OUT_ALPHA_SCALE_MASK                                              0x00030000
 #define    NV20TCL_RC_OUT_ALPHA_SCALE_NONE                                             0x00000000
-#define    NV20TCL_RC_OUT_ALPHA_SCALE_SCALE_BY_TWO                                     0x00020000
-#define    NV20TCL_RC_OUT_ALPHA_SCALE_SCALE_BY_FOUR                                    0x00040000
-#define    NV20TCL_RC_OUT_ALPHA_SCALE_SCALE_BY_ONE_HALF                                        0x00060000
+#define    NV20TCL_RC_OUT_ALPHA_SCALE_SCALE_BY_TWO                                     0x00010000
+#define    NV20TCL_RC_OUT_ALPHA_SCALE_SCALE_BY_FOUR                                    0x00020000
+#define    NV20TCL_RC_OUT_ALPHA_SCALE_SCALE_BY_ONE_HALF                                        0x00030000
 #define  NV20TCL_RC_IN_RGB(x)                                                          (0x00000ac0+((x)*4))
 #define  NV20TCL_RC_IN_RGB__SIZE                                                       0x00000008
 #define   NV20TCL_RC_IN_RGB_D_INPUT_SHIFT                                              0
@@ -4849,12 +4849,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV20TCL_RC_OUT_RGB_BIAS                                                      (1 << 15)
 #define    NV20TCL_RC_OUT_RGB_BIAS_NONE                                                        0x00000000
 #define    NV20TCL_RC_OUT_RGB_BIAS_BIAS_BY_NEGATIVE_ONE_HALF                           0x00008000
-#define   NV20TCL_RC_OUT_RGB_SCALE_SHIFT                                               17
-#define   NV20TCL_RC_OUT_RGB_SCALE_MASK                                                        0x00000000
+#define   NV20TCL_RC_OUT_RGB_SCALE_SHIFT                                               16
+#define   NV20TCL_RC_OUT_RGB_SCALE_MASK                                                        0x00030000
 #define    NV20TCL_RC_OUT_RGB_SCALE_NONE                                               0x00000000
-#define    NV20TCL_RC_OUT_RGB_SCALE_SCALE_BY_TWO                                       0x00020000
-#define    NV20TCL_RC_OUT_RGB_SCALE_SCALE_BY_FOUR                                      0x00040000
-#define    NV20TCL_RC_OUT_RGB_SCALE_SCALE_BY_ONE_HALF                                  0x00060000
+#define    NV20TCL_RC_OUT_RGB_SCALE_SCALE_BY_TWO                                       0x00010000
+#define    NV20TCL_RC_OUT_RGB_SCALE_SCALE_BY_FOUR                                      0x00020000
+#define    NV20TCL_RC_OUT_RGB_SCALE_SCALE_BY_ONE_HALF                                  0x00030000
 #define  NV20TCL_RC_ENABLE                                                             0x00001e60
 #define   NV20TCL_RC_ENABLE_NUM_COMBINERS_SHIFT                                                0
 #define   NV20TCL_RC_ENABLE_NUM_COMBINERS_MASK                                         0x0000000f