fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

softpipe: use draw_find_vs_output() directly

Browse source
This commit is contained in:
Brian 2008-02-25 14:47:13 -07:00
parent d6c7f7e314
commit c037b4d45a
1 changed files with 7 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/gallium/drivers/softpipe/sp_state_derived.c
View file

@ -34,33 +34,6 @@
#include "sp_state.h"
/**
* Search vertex program's outputs to find a match for the given
* semantic name/index. Return the index of the output slot.
*
* Return 0 if not found. This will cause the fragment program to use
* vertex attrib 0 (position) in the cases where the fragment program
* attempts to use a missing vertex program output. This is an undefined
* condition that users shouldn't hit anyway.
*/
static int
find_vs_output(struct softpipe_context *sp,
const struct pipe_shader_state *vs,
uint semantic_name,
uint semantic_index)
{
uint i;
for (i = 0; i < vs->num_outputs; i++) {
if (vs->output_semantic_name[i] == semantic_name &&
vs->output_semantic_index[i] == semantic_index)
return i;
}
/* See if the draw module is introducing a new attribute... */
return draw_find_vs_output(sp->draw, semantic_name, semantic_index);
}
/**
* Mark the current vertex layout as "invalid".
* We'll validate the vertex layout later, when we start to actually
@ -114,24 +87,25 @@ softpipe_get_vertex_info(struct softpipe_context *softpipe)
int src;
switch (fs->input_semantic_name[i]) {
case TGSI_SEMANTIC_POSITION:
src = find_vs_output(softpipe, vs, TGSI_SEMANTIC_POSITION, 0);
src = draw_find_vs_output(softpipe->draw,
TGSI_SEMANTIC_POSITION, 0);
draw_emit_vertex_attr(vinfo, EMIT_4F, INTERP_POS, src);
break;
case TGSI_SEMANTIC_COLOR:
src = find_vs_output(softpipe, vs, TGSI_SEMANTIC_COLOR,
src = draw_find_vs_output(softpipe->draw, TGSI_SEMANTIC_COLOR,
fs->input_semantic_index[i]);
draw_emit_vertex_attr(vinfo, EMIT_4F, colorInterp, src);
break;
case TGSI_SEMANTIC_FOG:
src = find_vs_output(softpipe, vs, TGSI_SEMANTIC_FOG, 0);
src = draw_find_vs_output(softpipe->draw, TGSI_SEMANTIC_FOG, 0);
draw_emit_vertex_attr(vinfo, EMIT_4F, INTERP_PERSPECTIVE, src);
break;
case TGSI_SEMANTIC_GENERIC:
/* this includes texcoords and varying vars */
src = find_vs_output(softpipe, vs, TGSI_SEMANTIC_GENERIC,
src = draw_find_vs_output(softpipe->draw, TGSI_SEMANTIC_GENERIC,
fs->input_semantic_index[i]);
draw_emit_vertex_attr(vinfo, EMIT_4F, INTERP_PERSPECTIVE, src);
break;
@ -141,7 +115,8 @@ softpipe_get_vertex_info(struct softpipe_context *softpipe)
}
}
softpipe->psize_slot = find_vs_output(softpipe, vs, TGSI_SEMANTIC_PSIZE, 0);
softpipe->psize_slot = draw_find_vs_output(softpipe->draw,
TGSI_SEMANTIC_PSIZE, 0);
if (softpipe->psize_slot > 0) {
draw_emit_vertex_attr(vinfo, EMIT_4F, INTERP_CONSTANT,
softpipe->psize_slot);