diff options
| author | Zack Rusin <zackr@vmware.com> | 2009-12-14 17:11:46 -0500 |
|---|---|---|
| committer | Zack Rusin <zackr@vmware.com> | 2009-12-25 05:52:16 -0500 |
| commit | 89d8577fb3036547ef0b47498cc8dc5c77f886e0 (patch) | |
| tree | 9356cc45b0cdaad4f979b0d328ad0562686a66e8 /src/gallium/drivers/softpipe/sp_state_derived.c | |
| parent | 57cce7a409724a261c6dae6c979496a630167742 (diff) | |
gallium: add geometry shader support to gallium
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_state_derived.c')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_state_derived.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/softpipe/sp_state_derived.c b/src/gallium/drivers/softpipe/sp_state_derived.c index c24a737d07..f6856a5f69 100644 --- a/src/gallium/drivers/softpipe/sp_state_derived.c +++ b/src/gallium/drivers/softpipe/sp_state_derived.c @@ -67,7 +67,7 @@ softpipe_get_vertex_info(struct softpipe_context *softpipe) /* compute vertex layout now */ const struct sp_fragment_shader *spfs = softpipe->fs; struct vertex_info *vinfo_vbuf = &softpipe->vertex_info_vbuf; - const uint num = draw_num_vs_outputs(softpipe->draw); + const uint num = draw_current_shader_outputs(softpipe->draw); uint i; /* Tell draw_vbuf to simply emit the whole post-xform vertex @@ -117,13 +117,13 @@ softpipe_get_vertex_info(struct softpipe_context *softpipe) } /* this includes texcoords and varying vars */ - src = draw_find_vs_output(softpipe->draw, - spfs->info.input_semantic_name[i], - spfs->info.input_semantic_index[i]); + src = draw_find_shader_output(softpipe->draw, + spfs->info.input_semantic_name[i], + spfs->info.input_semantic_index[i]); draw_emit_vertex_attr(vinfo, EMIT_4F, interp, src); } - softpipe->psize_slot = draw_find_vs_output(softpipe->draw, + softpipe->psize_slot = draw_find_shader_output(softpipe->draw, TGSI_SEMANTIC_PSIZE, 0); if (softpipe->psize_slot > 0) { draw_emit_vertex_attr(vinfo, EMIT_4F, INTERP_CONSTANT, |