nv30, nv40: non-trivially unify nv[34]0_state_fb.c
authorLuca Barbieri <luca@luca-barbieri.com>
Sat, 20 Feb 2010 23:59:30 +0000 (00:59 +0100)
committerYounes Manton <younes.m@gmail.com>
Mon, 15 Mar 2010 04:03:02 +0000 (00:03 -0400)
commitcd0d03adab65a9586e0c5d60e9ee487677914f3b
tree0cd09ba062fd9389886ad23ea566571be66bcec3
parent4d93ef1a015c8ec7341b0793e87ec375014436b3
nv30, nv40: non-trivially unify nv[34]0_state_fb.c

The files are significantly different due to:
1. nv30 support 2 render targets, nv40 4
2. z-buffer pitch is set differently
3. nv30 has a limitation of colour_bits >= zeta_bits. This may not
   actually exist in the driver though
4. nv30 points color0 at depth in the depth-only case
5. nv30 sets NV34TCL_VIEWPORT_TX_ORIGIN to 0. This is probably
   unnecessary

This patch attempts to unify the two files and preserve the existing
behavior.
src/gallium/drivers/nv30/Makefile
src/gallium/drivers/nv30/nv30_context.h
src/gallium/drivers/nv40/Makefile
src/gallium/drivers/nv40/nv40_context.h
src/gallium/drivers/nv40/nv40_state_fb.c [deleted file]
src/gallium/drivers/nvfx/Makefile
src/gallium/drivers/nvfx/nvfx_context.h
src/gallium/drivers/nvfx/nvfx_state_emit.c
src/gallium/drivers/nvfx/nvfx_state_fb.c [moved from src/gallium/drivers/nv30/nv30_state_fb.c with 53% similarity]