gallium: include p_state.h, replace PIPE_MAX_SHADER_OUTPUTS with PIPE_MAX_SHADER_INPUTS

This commit is contained in:
Brian 2008-01-25 08:19:45 -07:00
parent 235da629dc
commit c344bda34d

View file

@ -34,6 +34,9 @@
#define DRAW_VERTEX_H #define DRAW_VERTEX_H
#include "pipe/p_state.h"
/** /**
* Vertex attribute emit modes * Vertex attribute emit modes
*/ */
@ -68,9 +71,9 @@ struct vertex_info
{ {
uint num_attribs; uint num_attribs;
uint hwfmt[4]; /**< hardware format info for this format */ uint hwfmt[4]; /**< hardware format info for this format */
enum interp_mode interp_mode[PIPE_MAX_SHADER_OUTPUTS]; enum interp_mode interp_mode[PIPE_MAX_SHADER_INPUTS];
enum attrib_emit emit[PIPE_MAX_SHADER_OUTPUTS]; /**< EMIT_x */ enum attrib_emit emit[PIPE_MAX_SHADER_INPUTS]; /**< EMIT_x */
uint src_index[PIPE_MAX_SHADER_OUTPUTS]; /**< map to post-xform attribs */ uint src_index[PIPE_MAX_SHADER_INPUTS]; /**< map to post-xform attribs */
uint size; /**< total vertex size in dwords */ uint size; /**< total vertex size in dwords */
}; };
@ -88,7 +91,7 @@ draw_emit_vertex_attr(struct vertex_info *vinfo,
uint src_index) uint src_index)
{ {
const uint n = vinfo->num_attribs; const uint n = vinfo->num_attribs;
assert(n < PIPE_MAX_SHADER_OUTPUTS); assert(n < PIPE_MAX_SHADER_INPUTS);
vinfo->emit[n] = emit; vinfo->emit[n] = emit;
vinfo->interp_mode[n] = interp; vinfo->interp_mode[n] = interp;
vinfo->src_index[n] = src_index; vinfo->src_index[n] = src_index;