AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nv30: remove unused on_hw field and constant fp_reg_control field

Browse Source 
This makes nv30_state.h equivalent to nv40_state.h
This commit is contained in:
Luca Barbieri
2010-02-20 18:18:48 +01:00
committed by Younes Manton
parent 5f71414fc9
commit 1771d8f8f4
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/nv30/nv30_fragprog.c
+1 -3
View File
@@ -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);
src/gallium/drivers/nv30/nv30_state.h
-2
View File
@@ -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;
};