summaryrefslogtreecommitdiff
authorPeter Winters <peter@whoei.org>2007-10-22 15:04:23 (GMT)
committer Peter Winters <peter@whoei.org>2007-10-22 15:04:23 (GMT)
commitcf053adacabaee887ecedaa9967b07b3185095b5 (patch) (side-by-side diff)
tree6379d3be986b447b091993ee80aeda8be757f380
parentb0605fbeef0765e39554a15ea9f871c19258f72c (diff)
downloadxf86-video-nouveau-cf053adacabaee887ecedaa9967b07b3185095b5.zip
xf86-video-nouveau-cf053adacabaee887ecedaa9967b07b3185095b5.tar.gz
Fix some blending stuff for NV10 EXA
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/nv10_exa.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nv10_exa.c b/src/nv10_exa.c
index 2ab6757..dff9a91 100644
--- a/src/nv10_exa.c
+++ b/src/nv10_exa.c
@@ -254,6 +254,8 @@ static void NV10SetPictOp(NVPtr pNv,int op)
BEGIN_RING(Nv3D, NV10_TCL_PRIMITIVE_3D_BLEND_FUNC_SRC, 2);
OUT_RING (pictops[op].src);
OUT_RING (pictops[op].dst);
+ BEGIN_RING(Nv3D, NV10_TCL_PRIMITIVE_3D_BLEND_FUNC_ENABLE, 1);
+ OUT_RING (1);
}
Bool NV10PrepareComposite(int op,
@@ -598,9 +600,9 @@ NVAccelInitNV10TCL(ScrnInfoPtr pScrn)
/* Set vertex component */
BEGIN_RING(Nv3D, NV10_TCL_PRIMITIVE_3D_VERTEX_COL_4F_R, 4);
- OUT_RINGf (0.6);
- OUT_RINGf (0.4);
- OUT_RINGf (0.2);
+ OUT_RINGf (1.0);
+ OUT_RINGf (1.0);
+ OUT_RINGf (1.0);
OUT_RINGf (1.0);
BEGIN_RING(Nv3D, NV10_TCL_PRIMITIVE_3D_VERTEX_COL2_3F_R, 3);
OUT_RING (0);