diff options
| author | Luca Barbieri <luca@luca-barbieri.com> | 2010-02-21 00:59:30 +0100 |
|---|---|---|
| committer | Younes Manton <younes.m@gmail.com> | 2010-03-15 00:03:02 -0400 |
| commit | cd0d03adab65a9586e0c5d60e9ee487677914f3b (patch) | |
| tree | 0cd09ba062fd9389886ad23ea566571be66bcec3 /src/gallium/drivers/nvfx/nvfx_state_emit.c | |
| parent | 4d93ef1a015c8ec7341b0793e87ec375014436b3 (diff) | |
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.
Diffstat (limited to 'src/gallium/drivers/nvfx/nvfx_state_emit.c')
| -rw-r--r-- | src/gallium/drivers/nvfx/nvfx_state_emit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nvfx/nvfx_state_emit.c b/src/gallium/drivers/nvfx/nvfx_state_emit.c index b86cb44936..d3088e4211 100644 --- a/src/gallium/drivers/nvfx/nvfx_state_emit.c +++ b/src/gallium/drivers/nvfx/nvfx_state_emit.c @@ -5,7 +5,7 @@ #define RENDER_STATES(name, nvxx, vbo) \ static struct nvfx_state_entry *name##_render_states[] = { \ - &nvxx##_state_framebuffer, \ + &nvfx_state_framebuffer, \ &nvfx_state_rasterizer, \ &nvfx_state_scissor, \ &nvfx_state_stipple, \ |