summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2011-08-30 15:34:43 -0700
committerEric Anholt <[email protected]>2011-09-06 18:02:00 -0700
commit9bd8d90646572a170bd96a72d2f8d5739df381be (patch)
tree7dd6fcde7336077d4576c2927c70b94b982d2688 /src/mesa
parent9367960ea64a087895caaadbd0353080c14b4bab (diff)
i965/vs: Fix point size handling on gen4.
Fixes glsl-vs-point-size. Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
index e0e3ce375bf..dac8cf91a63 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
@@ -1748,14 +1748,15 @@ vec4_visitor::emit_psiz_and_flags(struct brw_reg reg)
emit(MOV(header1, 0u));
if (c->prog_data.outputs_written & BITFIELD64_BIT(VERT_RESULT_PSIZ)) {
- assert(!"finishme: psiz");
- src_reg psiz;
+ src_reg psiz = src_reg(output_reg[VERT_RESULT_PSIZ]);
+ current_annotation = "Point size";
header1.writemask = WRITEMASK_W;
- emit(MUL(header1, psiz, 1u << 11));
+ emit(MUL(header1, psiz, src_reg((float)(1 << 11))));
emit(AND(header1, src_reg(header1), 0x7ff << 8));
}
+ current_annotation = "Clipping flags";
for (i = 0; i < c->key.nr_userclip; i++) {
vec4_instruction *inst;
@@ -1792,7 +1793,7 @@ vec4_visitor::emit_psiz_and_flags(struct brw_reg reg)
}
header1.writemask = WRITEMASK_XYZW;
- emit(MOV(reg, src_reg(header1)));
+ emit(MOV(retype(reg, BRW_REGISTER_TYPE_UD), src_reg(header1)));
} else if (intel->gen < 6) {
emit(MOV(retype(reg, BRW_REGISTER_TYPE_UD), 0u));
} else {