Mesa (master): i965: Fix up the FS backend for the variable array indexing pass.
Eric Anholt
anholt at kemper.freedesktop.org
Tue Sep 28 16:38:04 UTC 2010
Module: Mesa
Branch: master
Commit: 719f84d9aba6b016e1069e0461cbfc4211f5a3b5
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=719f84d9aba6b016e1069e0461cbfc4211f5a3b5
Author: Eric Anholt <eric at anholt.net>
Date: Mon Sep 27 22:15:36 2010 -0700
i965: Fix up the FS backend for the variable array indexing pass.
We need to re-run channel expressions afterwards as it generates new
vector expressions, and we need to successfully support conditional
assignment (brw_CMP takes 2 operands, not 1).
---
src/mesa/drivers/dri/i965/brw_fs.cpp | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 27ea912..78c1bc6 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -135,12 +135,12 @@ brw_link_shader(GLcontext *ctx, struct gl_shader_program *prog)
do_sub_to_add_neg(shader->ir);
do_explog_to_explog2(shader->ir);
- brw_do_channel_expressions(shader->ir);
- brw_do_vector_splitting(shader->ir);
-
do {
progress = false;
+ brw_do_channel_expressions(shader->ir);
+ brw_do_vector_splitting(shader->ir);
+
progress = do_lower_jumps(shader->ir, true, true,
true, /* main return */
false, /* continue */
@@ -520,6 +520,14 @@ fs_reg::fs_reg(class fs_visitor *v, const struct glsl_type *type)
case GLSL_TYPE_UINT:
this->type = BRW_REGISTER_TYPE_UD;
break;
+ case GLSL_TYPE_ARRAY:
+ case GLSL_TYPE_STRUCT:
+ /* These should be overridden with the type of the member when
+ * dereferenced into. BRW_REGISTER_TYPE_UD seems like a likely
+ * way to trip up if we don't.
+ */
+ this->type = BRW_REGISTER_TYPE_UD;
+ break;
default:
assert(!"not reached");
this->type = BRW_REGISTER_TYPE_F;
@@ -877,7 +885,7 @@ fs_visitor::visit(ir_assignment *ir)
if (ir->condition) {
/* Get the condition bool into the predicate. */
ir->condition->accept(this);
- inst = emit(fs_inst(BRW_OPCODE_CMP, this->result, fs_reg(0)));
+ inst = emit(fs_inst(BRW_OPCODE_CMP, reg_null, this->result, fs_reg(0)));
inst->conditional_mod = BRW_CONDITIONAL_NZ;
}
More information about the mesa-commit
mailing list