AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: Fix up the FS backend for the variable array indexing pass.

Browse Source 
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).
This commit is contained in:
Eric Anholt
2010-09-27 22:15:36 -07:00
parent 57edd7c5c1
commit 719f84d9ab
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i965/brw_fs.cpp
+12 -4
View File
@@ -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;
}