summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nvfx/nvfx_state.h
diff options
context:
space:
mode:
authorLuca Barbieri <[email protected]>2010-08-22 12:02:41 +0200
committerLuca Barbieri <[email protected]>2010-08-22 15:42:17 +0200
commit7de1f86c49716eeadb443507d16ead933288059c (patch)
treeb9d55e24616fa7b149b07bf0079ca2dae6fabd14 /src/gallium/drivers/nvfx/nvfx_state.h
parent9fefab340f59519efc5c5690347a54e437d9407a (diff)
nvfx: simplify and correct fragment program update logic
This version should hopefully be much clearer and thus less likely to be subtly broken. Also fixes point sprites on nv40 and possibly some other bugs too.
Diffstat (limited to 'src/gallium/drivers/nvfx/nvfx_state.h')
-rw-r--r--src/gallium/drivers/nvfx/nvfx_state.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/nvfx/nvfx_state.h b/src/gallium/drivers/nvfx/nvfx_state.h
index 1247abcfa21..05d41cfc8dd 100644
--- a/src/gallium/drivers/nvfx/nvfx_state.h
+++ b/src/gallium/drivers/nvfx/nvfx_state.h
@@ -32,7 +32,7 @@ struct nvfx_vertex_program {
unsigned nr_consts;
char generic_to_fp_input[256];
- unsigned texcoord_ouput_mask;
+ int sprite_fp_input;
struct nouveau_resource *exec;
unsigned exec_start;
@@ -67,6 +67,7 @@ struct nvfx_fragment_program {
boolean translated;
unsigned samplers;
unsigned point_sprite_control;
+ unsigned or;
uint32_t *insn;
int insn_len;