summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2008-01-25 08:19:45 -0700
committerBrian <brian.paul@tungstengraphics.com>2008-01-25 08:20:10 -0700
commitc344bda34dcbc1731573edc94de0c20549557adf (patch)
treeb37816e6d38214e1391819c091b5b5a56b6287c5
parent235da629dceb23bfddea1eadfcf771d2794d6119 (diff)
gallium: include p_state.h, replace PIPE_MAX_SHADER_OUTPUTS with PIPE_MAX_SHADER_INPUTS
-rw-r--r--src/mesa/pipe/draw/draw_vertex.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/mesa/pipe/draw/draw_vertex.h b/src/mesa/pipe/draw/draw_vertex.h
index f20b10f8d7..dfc637b19b 100644
--- a/src/mesa/pipe/draw/draw_vertex.h
+++ b/src/mesa/pipe/draw/draw_vertex.h
@@ -34,6 +34,9 @@
#define DRAW_VERTEX_H
+#include "pipe/p_state.h"
+
+
/**
* Vertex attribute emit modes
*/
@@ -68,9 +71,9 @@ struct vertex_info
{
uint num_attribs;
uint hwfmt[4]; /**< hardware format info for this format */
- enum interp_mode interp_mode[PIPE_MAX_SHADER_OUTPUTS];
- enum attrib_emit emit[PIPE_MAX_SHADER_OUTPUTS]; /**< EMIT_x */
- uint src_index[PIPE_MAX_SHADER_OUTPUTS]; /**< map to post-xform attribs */
+ enum interp_mode interp_mode[PIPE_MAX_SHADER_INPUTS];
+ enum attrib_emit emit[PIPE_MAX_SHADER_INPUTS]; /**< EMIT_x */
+ uint src_index[PIPE_MAX_SHADER_INPUTS]; /**< map to post-xform attribs */
uint size; /**< total vertex size in dwords */
};
@@ -88,7 +91,7 @@ draw_emit_vertex_attr(struct vertex_info *vinfo,
uint src_index)
{
const uint n = vinfo->num_attribs;
- assert(n < PIPE_MAX_SHADER_OUTPUTS);
+ assert(n < PIPE_MAX_SHADER_INPUTS);
vinfo->emit[n] = emit;
vinfo->interp_mode[n] = interp;
vinfo->src_index[n] = src_index;