diff options
| author | Luca Barbieri <luca@luca-barbieri.com> | 2010-02-21 11:12:08 +0100 |
|---|---|---|
| committer | Younes Manton <younes.m@gmail.com> | 2010-03-15 00:03:03 -0400 |
| commit | 6e1d0fc5eba8cda4f4c8f3188f53fec6d2d2e9c3 (patch) | |
| tree | 8d7314e1ed530b395717316fdd71ec364df8da2b /src/gallium/drivers/nvfx/nvfx_state_emit.c | |
| parent | f9eafeca297497a94c438ea28ed59f3a45ed2566 (diff) | |
nv30, nv40: unify nv[34]0_vbo.c
The files are identical, except for swtnl support which is commented
out on nv30 and restart being initialized on nv30 to avoid a compiler
warning.
Diffstat (limited to 'src/gallium/drivers/nvfx/nvfx_state_emit.c')
| -rw-r--r-- | src/gallium/drivers/nvfx/nvfx_state_emit.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gallium/drivers/nvfx/nvfx_state_emit.c b/src/gallium/drivers/nvfx/nvfx_state_emit.c index 9961dacce4..88b86f9fb5 100644 --- a/src/gallium/drivers/nvfx/nvfx_state_emit.c +++ b/src/gallium/drivers/nvfx/nvfx_state_emit.c @@ -3,10 +3,6 @@ #include "nvfx_state.h" #include "draw/draw_context.h" -/* temporary, will be removed in next patch */ -#define nv30_state_vtxfmt nvfx_state_vtxfmt -#define nv40_state_vtxfmt nvfx_state_vtxfmt - #define RENDER_STATES(name, nvxx, vbo) \ static struct nvfx_state_entry *name##_render_states[] = { \ &nvfx_state_framebuffer, \ @@ -21,7 +17,7 @@ static struct nvfx_state_entry *name##_render_states[] = { \ &nvfx_state_zsa, \ &nvfx_state_sr, \ &nvfx_state_viewport, \ - &nvxx##_state_##vbo, \ + &nvfx_state_##vbo, \ NULL \ } |