diff options
| author | Luca Barbieri <[email protected]> | 2010-02-20 18:18:48 +0100 |
|---|---|---|
| committer | Younes Manton <[email protected]> | 2010-03-15 00:03:00 -0400 |
| commit | 1771d8f8f4256773de1883a033081f9cc4cddf00 (patch) | |
| tree | 65babed7a8308e5e9aa5ae19869511d89e7703eb | |
| 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
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_fragprog.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_state.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/gallium/drivers/nv30/nv30_fragprog.c b/src/gallium/drivers/nv30/nv30_fragprog.c index 2c432c6dfa7..74bf68012a9 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); diff --git a/src/gallium/drivers/nv30/nv30_state.h b/src/gallium/drivers/nv30/nv30_state.h index 66c26360cb2..b1c7f84a0a0 100644 --- a/src/gallium/drivers/nv30/nv30_state.h +++ b/src/gallium/drivers/nv30/nv30_state.h @@ -54,7 +54,6 @@ struct nv30_fragment_program { struct tgsi_shader_info info; boolean translated; - boolean on_hw; unsigned samplers; uint32_t *insn; @@ -66,7 +65,6 @@ struct nv30_fragment_program { struct pipe_buffer *buffer; uint32_t fp_control; - uint32_t fp_reg_control; struct nouveau_stateobj *so; }; |