diff options
author | Luca Barbieri <luca@luca-barbieri.com> | 2010-02-20 18:18:48 +0100 |
---|---|---|
committer | Younes Manton <younes.m@gmail.com> | 2010-03-15 00:03:00 -0400 |
commit | 1771d8f8f4256773de1883a033081f9cc4cddf00 (patch) | |
tree | 65babed7a8308e5e9aa5ae19869511d89e7703eb /src/gallium/drivers/nv30/nv30_fragprog.c | |
parent | 5f71414fc941f0d390c03633f1a53534807cfca6 (diff) |
nv30: remove unused on_hw field and constant fp_reg_control field
This makes nv30_state.h equivalent to nv40_state.h
Diffstat (limited to 'src/gallium/drivers/nv30/nv30_fragprog.c')
-rw-r--r-- | src/gallium/drivers/nv30/nv30_fragprog.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gallium/drivers/nv30/nv30_fragprog.c b/src/gallium/drivers/nv30/nv30_fragprog.c index 2c432c6dfa..74bf68012a 100644 --- a/src/gallium/drivers/nv30/nv30_fragprog.c +++ b/src/gallium/drivers/nv30/nv30_fragprog.c @@ -759,7 +759,6 @@ nv30_fragprog_translate(struct nv30_context *nv30, } fp->fp_control |= (fpc->num_regs-1)/2; - fp->fp_reg_control = (1<<16)|0x4; /* Terminate final instruction */ fp->insn[fpc->inst_offset] |= 0x00000001; @@ -773,7 +772,6 @@ nv30_fragprog_translate(struct nv30_context *nv30, fp->insn[fpc->inst_offset + 3] = 0x00000000; fp->translated = TRUE; - fp->on_hw = FALSE; out_err: tgsi_parse_free(&parse); FREE(fpc); @@ -846,7 +844,7 @@ nv30_fragprog_validate(struct nv30_context *nv30) so_method(so, nv30->screen->rankine, NV34TCL_FP_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_data (so, (1<<16)|0x4); so_method(so, nv30->screen->rankine, NV34TCL_TX_UNITS_ENABLE, 1); so_data (so, fp->samplers); so_ref(so, &fp->so); |