Mesa (master): dri/nouveau: Update nouveau_class.h.
Francisco Jerez
currojerez at kemper.freedesktop.org
Thu Sep 16 17:48:11 UTC 2010
Module: Mesa
Branch: master
Commit: aad06c852491d9a83e74625220923da1626896ed
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=aad06c852491d9a83e74625220923da1626896ed
Author: Francisco Jerez <currojerez at riseup.net>
Date: Tue Sep 14 21:22:45 2010 +0200
dri/nouveau: Update nouveau_class.h.
---
src/mesa/drivers/dri/nouveau/nouveau_class.h | 40 +++++++++++++-------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_class.h b/src/mesa/drivers/dri/nouveau/nouveau_class.h
index 32ee815..5cb13ac 100644
--- 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
More information about the mesa-commit
mailing list