diff options
| author | Luca Barbieri <luca@luca-barbieri.com> | 2010-08-22 23:29:34 +0200 |
|---|---|---|
| committer | Luca Barbieri <luca@luca-barbieri.com> | 2010-08-23 00:15:03 +0200 |
| commit | d507c0812d5a01d29f1f9f6942ec5cfd91ea0375 (patch) | |
| tree | 66141c4318784a7d6477cfc72d6d4c33f6660ab3 /src/gallium/drivers/nvfx/nvfx_state.h | |
| parent | d21be6ee2cae2daeb83583a5d3798f5104c00d73 (diff) | |
nvfx: support both sprite coord origins
Now we lie less when claiming OpenGL 2 support.
Also, first piglit result group is now all green, except for
fdo25614-genmipmap, which seems mesa/st's fault.
Diffstat (limited to 'src/gallium/drivers/nvfx/nvfx_state.h')
| -rw-r--r-- | src/gallium/drivers/nvfx/nvfx_state.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gallium/drivers/nvfx/nvfx_state.h b/src/gallium/drivers/nvfx/nvfx_state.h index fd2174ed69..3795191918 100644 --- a/src/gallium/drivers/nvfx/nvfx_state.h +++ b/src/gallium/drivers/nvfx/nvfx_state.h @@ -71,10 +71,11 @@ struct nvfx_fragment_program { struct nvfx_fragment_program_data *consts; unsigned nr_consts; + /* the slot at num_slots is for the sprite coordinate, if any */ unsigned num_slots; /* how many input semantics? */ - unsigned char slot_to_generic[8]; /* semantics */ - unsigned char slot_to_fp_input[8]; /* current assignment of slots for each used semantic */ - struct util_dynarray slot_relocations[8]; + unsigned char slot_to_generic[10]; /* semantics */ + unsigned char slot_to_fp_input[11]; /* current assignment of slots for each used semantic */ + struct util_dynarray slot_relocations[11]; /* This is reset to progs on any relocation update, and decreases every time we * move to a new prog due to a constant update @@ -99,7 +100,7 @@ struct nvfx_pipe_fragment_program { struct pipe_shader_state pipe; struct tgsi_shader_info info; - struct nvfx_fragment_program* fps[1]; + struct nvfx_fragment_program* fps[2]; }; #endif |