summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nv40
diff options
context:
space:
mode:
authorZack Rusin <zackr@vmware.com>2009-12-14 17:11:46 -0500
committerZack Rusin <zackr@vmware.com>2009-12-25 05:52:16 -0500
commit89d8577fb3036547ef0b47498cc8dc5c77f886e0 (patch)
tree9356cc45b0cdaad4f979b0d328ad0562686a66e8 /src/gallium/drivers/nv40
parent57cce7a409724a261c6dae6c979496a630167742 (diff)
downloadexternal_mesa3d-89d8577fb3036547ef0b47498cc8dc5c77f886e0.zip
external_mesa3d-89d8577fb3036547ef0b47498cc8dc5c77f886e0.tar.gz
external_mesa3d-89d8577fb3036547ef0b47498cc8dc5c77f886e0.tar.bz2
gallium: add geometry shader support to gallium
Diffstat (limited to 'src/gallium/drivers/nv40')
-rw-r--r--src/gallium/drivers/nv40/nv40_draw.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv40/nv40_draw.c b/src/gallium/drivers/nv40/nv40_draw.c
index b2f19ecb..3875bc3 100644
--- a/src/gallium/drivers/nv40/nv40_draw.c
+++ b/src/gallium/drivers/nv40/nv40_draw.c
@@ -261,7 +261,8 @@ nv40_draw_elements_swtnl(struct pipe_context *pipe,
map = pipe_buffer_map(pscreen,
nv40->constbuf[PIPE_SHADER_VERTEX],
PIPE_BUFFER_USAGE_CPU_READ);
- draw_set_mapped_constant_buffer(nv40->draw, map, nr);
+ draw_set_mapped_constant_buffer(nv40->draw, PIPE_SHADER_VERTEX,
+ map, nr);
}
draw_arrays(nv40->draw, mode, start, count);
@@ -285,7 +286,7 @@ static INLINE void
emit_attrib(struct nv40_context *nv40, unsigned hw, unsigned emit,
unsigned semantic, unsigned index)
{
- unsigned draw_out = draw_find_vs_output(nv40->draw, semantic, index);
+ unsigned draw_out = draw_find_shader_output(nv40->draw, semantic, index);
unsigned a = nv40->swtnl.nr_attribs++;
nv40->swtnl.hw[a] = hw;