From: Luca Barbieri <luca@luca-barbieri.com>
Date: Sat, 20 Feb 2010 17:18:48 +0000 (+0100)
Subject: nv30: remove unused on_hw field and constant fp_reg_control field
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1771d8f8f4256773de1883a033081f9cc4cddf00;p=mesa.git

nv30: remove unused on_hw field and constant fp_reg_control field

This makes nv30_state.h equivalent to nv40_state.h
---

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;
 };