summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/nvfx/nvfx_state.c
AgeCommit message (Collapse)Author
2010-03-15nvfx: fix up after mergeKeith Whitwell
2010-03-15Merge commit 'origin/master' into gallium-sampler-viewKeith Whitwell
Conflicts: src/gallium/drivers/nv30/nv30_context.h src/gallium/drivers/nv30/nv30_state.c src/gallium/drivers/nv40/nv40_context.h src/gallium/drivers/nv40/nv40_state.c src/gallium/drivers/r300/r300_emit.c
2010-03-15nv30, nv40: partially non-trivially unify sampler state in nv[34]0_state.cLuca Barbieri
Many things, like texture wrap modes and min/mag filters are common. Some others, like annisotropy and lod settings, are not.
2010-03-15nv30, nv40: non-trivially unify nv[34]0_vertprog.cLuca Barbieri
vertprog.c is similar but has substantial differences: 1. nv40 supports clip planes 2. nv40 uses a more advanced register allocator 3. Some register setup is different 4. Constants with the same name have different values This patch unifies the two files. nv30 gains clip plane support and the nv40 register allocator. A new NVFX_VP(x) macro is introduced that at runtime resolved to either the nv30 or the nv40 constant value. nv30 clip planes are not tested and might not work
2010-03-15nv30, nv40: partially unify nv[34]0_state.cLuca Barbieri
state.c is identical except for: 1. Sampler state creation is different 2. nv40 swtnl support 3. Separate blend equations on nv40 This patch unifies nv[34]0_state.c, except the sampler state creation code.