projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5aac920
)
gs: fix drivers so they work with geometry shaders
author
Zack Rusin
<zackr@vmware.com>
Sat, 19 Dec 2009 18:54:53 +0000
(13:54 -0500)
committer
Zack Rusin
<zackr@vmware.com>
Fri, 25 Dec 2009 10:52:17 +0000
(
05:52
-0500)
src/gallium/drivers/llvmpipe/lp_state_derived.c
patch
|
blob
|
history
src/gallium/drivers/r300/r300_state_derived.c
patch
|
blob
|
history
src/gallium/drivers/svga/svga_swtnl_state.c
patch
|
blob
|
history
diff --git
a/src/gallium/drivers/llvmpipe/lp_state_derived.c
b/src/gallium/drivers/llvmpipe/lp_state_derived.c
index fdc6a389b41f53718c53b42f617846a9837d6dfb..acfd7be5f74732f7ab637609594254f9948dc1ef 100644
(file)
--- a/
src/gallium/drivers/llvmpipe/lp_state_derived.c
+++ b/
src/gallium/drivers/llvmpipe/lp_state_derived.c
@@
-116,13
+116,13
@@
llvmpipe_get_vertex_info(struct llvmpipe_context *llvmpipe)
}
/* this includes texcoords and varying vars */
}
/* this includes texcoords and varying vars */
- src = draw_find_
vs
_output(llvmpipe->draw,
+ src = draw_find_
shader
_output(llvmpipe->draw,
lpfs->info.input_semantic_name[i],
lpfs->info.input_semantic_index[i]);
draw_emit_vertex_attr(vinfo, EMIT_4F, interp, src);
}
lpfs->info.input_semantic_name[i],
lpfs->info.input_semantic_index[i]);
draw_emit_vertex_attr(vinfo, EMIT_4F, interp, src);
}
- llvmpipe->psize_slot = draw_find_
vs
_output(llvmpipe->draw,
+ llvmpipe->psize_slot = draw_find_
shader
_output(llvmpipe->draw,
TGSI_SEMANTIC_PSIZE, 0);
if (llvmpipe->psize_slot > 0) {
draw_emit_vertex_attr(vinfo, EMIT_4F, INTERP_CONSTANT,
TGSI_SEMANTIC_PSIZE, 0);
if (llvmpipe->psize_slot > 0) {
draw_emit_vertex_attr(vinfo, EMIT_4F, INTERP_CONSTANT,
diff --git
a/src/gallium/drivers/r300/r300_state_derived.c
b/src/gallium/drivers/r300/r300_state_derived.c
index 29bc701a86e3180772a968157138138e10d24a81..727ae7ade6d57e7e62681e0af55a7ebdf4d99b40 100644
(file)
--- a/
src/gallium/drivers/r300/r300_state_derived.c
+++ b/
src/gallium/drivers/r300/r300_state_derived.c
@@
-71,9
+71,9
@@
static void r300_draw_emit_attrib(struct r300_context* r300,
struct tgsi_shader_info* info = &r300->vs->info;
int output;
struct tgsi_shader_info* info = &r300->vs->info;
int output;
- output = draw_find_
vs
_output(r300->draw,
- info->output_semantic_name[index],
- info->output_semantic_index[index]);
+ output = draw_find_
shader
_output(r300->draw,
+
info->output_semantic_name[index],
+
info->output_semantic_index[index]);
draw_emit_vertex_attr(&r300->vertex_info->vinfo, emit, interp, output);
}
draw_emit_vertex_attr(&r300->vertex_info->vinfo, emit, interp, output);
}
diff --git
a/src/gallium/drivers/svga/svga_swtnl_state.c
b/src/gallium/drivers/svga/svga_swtnl_state.c
index 25b8c2af3a0a3d5cffff9d74adf2dc7a86d78414..94b6ccc62dd7fef172858c44b86152aed5dc10e4 100644
(file)
--- a/
src/gallium/drivers/svga/svga_swtnl_state.c
+++ b/
src/gallium/drivers/svga/svga_swtnl_state.c
@@
-156,7
+156,7
@@
int svga_swtnl_update_vdecl( struct svga_context *svga )
memset(vdecl, 0, sizeof(vdecl));
/* always add position */
memset(vdecl, 0, sizeof(vdecl));
/* always add position */
- src = draw_find_
vs
_output(draw, TGSI_SEMANTIC_POSITION, 0);
+ src = draw_find_
shader
_output(draw, TGSI_SEMANTIC_POSITION, 0);
draw_emit_vertex_attr(vinfo, EMIT_4F, INTERP_LINEAR, src);
vinfo->attrib[0].emit = EMIT_4F;
vdecl[0].array.offset = offset;
draw_emit_vertex_attr(vinfo, EMIT_4F, INTERP_LINEAR, src);
vinfo->attrib[0].emit = EMIT_4F;
vdecl[0].array.offset = offset;
@@
-169,7
+169,7
@@
int svga_swtnl_update_vdecl( struct svga_context *svga )
for (i = 0; i < fs->base.info.num_inputs; i++) {
unsigned name = fs->base.info.input_semantic_name[i];
unsigned index = fs->base.info.input_semantic_index[i];
for (i = 0; i < fs->base.info.num_inputs; i++) {
unsigned name = fs->base.info.input_semantic_name[i];
unsigned index = fs->base.info.input_semantic_index[i];
- src = draw_find_
vs
_output(draw, name, index);
+ src = draw_find_
shader
_output(draw, name, index);
vdecl[nr_decls].array.offset = offset;
vdecl[nr_decls].identity.usageIndex = fs->base.info.input_semantic_index[i];
vdecl[nr_decls].array.offset = offset;
vdecl[nr_decls].identity.usageIndex = fs->base.info.input_semantic_index[i];