<div dir="ltr">On 5 June 2013 15:50, Chris Forbes <span dir="ltr"><<a href="mailto:chrisf@ijw.co.nz" target="_blank">chrisf@ijw.co.nz</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Removes the special-case suppression of gl_ClipVertex in the VUE map.<br>
<br>
Also calculate vertex outcodes for user clip planes based on<br>
gl_ClipVertex if written; otherwise gl_Position.<br>
<br>
Signed-off-by: Chris Forbes <<a href="mailto:chrisf@ijw.co.nz">chrisf@ijw.co.nz</a>><br></blockquote><div><br></div><div>Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>><br>
</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
---<br>
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 4 +++-<br>
src/mesa/drivers/dri/i965/brw_vs.c | 6 ------<br>
2 files changed, 3 insertions(+), 7 deletions(-)<br>
<br>
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp<br>
index b2f8f00..33c1b24 100644<br>
--- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp<br>
+++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp<br>
@@ -2567,8 +2567,10 @@ vec4_visitor::emit_psiz_and_flags(struct brw_reg reg)<br>
current_annotation = "Clipping flags";<br>
for (i = 0; i < key->nr_userclip_plane_consts; i++) {<br>
vec4_instruction *inst;<br>
+ gl_varying_slot slot = (prog_data->vue_map.slots_valid & VARYING_BIT_CLIP_VERTEX)<br>
+ ? VARYING_SLOT_CLIP_VERTEX : VARYING_SLOT_POS;<br>
<br>
- inst = emit(DP4(dst_null_f(), src_reg(output_reg[VARYING_SLOT_POS]),<br>
+ inst = emit(DP4(dst_null_f(), src_reg(output_reg[slot]),<br>
src_reg(this->userplane[i])));<br>
inst->conditional_mod = BRW_CONDITIONAL_L;<br>
<br>
diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c<br>
index 6eb916e..720325d 100644<br>
--- a/src/mesa/drivers/dri/i965/brw_vs.c<br>
+++ b/src/mesa/drivers/dri/i965/brw_vs.c<br>
@@ -63,12 +63,6 @@ brw_compute_vue_map(struct brw_context *brw, struct brw_vue_map *vue_map,<br>
{<br>
const struct intel_context *intel = &brw->intel;<br>
<br>
- /* Prior to Gen6, don't assign a slot for VARYING_SLOT_CLIP_VERTEX, since<br>
- * it is unsupported.<br>
- */<br>
- if (intel->gen < 6)<br>
- slots_valid &= ~VARYING_BIT_CLIP_VERTEX;<br>
-<br>
vue_map->slots_valid = slots_valid;<br>
int i;<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
1.8.3<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div></div>