summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrice Mandin <pmandin@caramail.com>2008-07-12 10:13:58 +0200
committerPatrice Mandin <pmandin@caramail.com>2008-07-12 10:13:58 +0200
commit9489de99802e635271c1ae84630fc02892af1699 (patch)
tree4f11ee53609498e124a14837e6efffe71880e58d
parentb23e20a386729e75492069445bb924412dc29a0c (diff)
nv30: was setting wrong register
-rw-r--r--src/gallium/drivers/nv30/nv30_fragprog.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gallium/drivers/nv30/nv30_fragprog.c b/src/gallium/drivers/nv30/nv30_fragprog.c
index 06ed04cbfe..59e79d66f2 100644
--- a/src/gallium/drivers/nv30/nv30_fragprog.c
+++ b/src/gallium/drivers/nv30/nv30_fragprog.c
@@ -841,16 +841,15 @@ nv30_fragprog_validate(struct nv30_context *nv30)
fp->buffer = ws->buffer_create(ws, 0x100, 0, fp->insn_len * 4);
nv30_fragprog_upload(nv30, fp);
- so = so_new(4, 1);
+ so = so_new(6, 1);
so_method(so, nv30->screen->rankine, NV34TCL_FP_ACTIVE_PROGRAM, 1);
so_reloc (so, fp->buffer, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_GART |
NOUVEAU_BO_RD | NOUVEAU_BO_LOW | NOUVEAU_BO_OR,
NV34TCL_FP_ACTIVE_PROGRAM_DMA0, NV34TCL_FP_ACTIVE_PROGRAM_DMA1);
so_method(so, nv30->screen->rankine, NV34TCL_FP_CONTROL, 1);
so_data (so, fp->fp_control);
- /* FIXME: Add these, and you'll have big slowdown */
- /*so_method(so, nv30->screen->rankine, NV34TCL_FP_REG_CONTROL, 1);
- so_data (so, fp->fp_control);*/
+ so_method(so, nv30->screen->rankine, NV34TCL_FP_REG_CONTROL, 1);
+ so_data (so, fp->fp_reg_control);
so_ref(so, &fp->so);
update_constants: