i965/vs: add support for emitting gl_ClipVertex

Removes the special-case suppression of gl_ClipVertex in the VUE map.

Also calculate vertex outcodes for user clip planes based on
gl_ClipVertex if written; otherwise gl_Position.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Chris Forbes 2013-05-20 22:10:29 +12:00
parent 3615949990
commit 06a503ca71
2 changed files with 3 additions and 7 deletions

View file

@ -2567,8 +2567,10 @@ vec4_visitor::emit_psiz_and_flags(struct brw_reg reg)
current_annotation = "Clipping flags";
for (i = 0; i < key->nr_userclip_plane_consts; i++) {
vec4_instruction *inst;
gl_varying_slot slot = (prog_data->vue_map.slots_valid & VARYING_BIT_CLIP_VERTEX)
? VARYING_SLOT_CLIP_VERTEX : VARYING_SLOT_POS;
inst = emit(DP4(dst_null_f(), src_reg(output_reg[VARYING_SLOT_POS]),
inst = emit(DP4(dst_null_f(), src_reg(output_reg[slot]),
src_reg(this->userplane[i])));
inst->conditional_mod = BRW_CONDITIONAL_L;

View file

@ -63,12 +63,6 @@ brw_compute_vue_map(struct brw_context *brw, struct brw_vue_map *vue_map,
{
const struct intel_context *intel = &brw->intel;
/* Prior to Gen6, don't assign a slot for VARYING_SLOT_CLIP_VERTEX, since
* it is unsupported.
*/
if (intel->gen < 6)
slots_valid &= ~VARYING_BIT_CLIP_VERTEX;
vue_map->slots_valid = slots_valid;
int i;