diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-03-16 12:49:46 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-03-16 12:49:46 +1100 |
| commit | c4354f84603cabb0e33ea3f586cc89bfdc27f79b (patch) | |
| tree | 01585e52a3cca102c212630d8bac345058e150f6 /src/gallium/include/pipe/p_state.h | |
| parent | 5e17088ee3d0ddfa8871d92d262bb5242bdd92bd (diff) | |
| parent | cb98f71d42e4c714dfb0c3e29d28d8418a1ee86b (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/include/pipe/p_state.h')
| -rw-r--r-- | src/gallium/include/pipe/p_state.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h index e338a27383..5791a10119 100644 --- a/src/gallium/include/pipe/p_state.h +++ b/src/gallium/include/pipe/p_state.h @@ -110,6 +110,7 @@ struct pipe_rasterizer_state unsigned line_stipple_pattern:16; unsigned line_last_pixel:1; unsigned bypass_clipping:1; + unsigned bypass_vs:1; /**< vertices are already fully transformed */ unsigned origin_lower_left:1; /**< Is (0,0) the lower-left corner? */ float line_width; @@ -162,13 +163,6 @@ struct pipe_constant_buffer struct pipe_shader_state { const struct tgsi_token *tokens; - /* XXX these are going away */ - ubyte num_inputs; - ubyte num_outputs; - ubyte input_semantic_name[PIPE_MAX_SHADER_INPUTS]; /**< TGSI_SEMANTIC_x */ - ubyte input_semantic_index[PIPE_MAX_SHADER_INPUTS]; - ubyte output_semantic_name[PIPE_MAX_SHADER_OUTPUTS]; /**< TGSI_SEMANTIC_x */ - ubyte output_semantic_index[PIPE_MAX_SHADER_OUTPUTS]; }; |