Skip to content
Snippets Groups Projects
Commit a2b8802e authored by Ian Romanick's avatar Ian Romanick
Browse files

prog_optimize: Set unused regs to PROGRAM_UNDEFINED after CMP->MOV conversion


Leaving the unused registers with other values caused assertion
failures and other problems in places that blindly iterate over all
sources.

brw_vs_emit.c:1381: get_src_reg: Assertion `c->regs[file][index].nr !=
0' failed.

Fixes i965 piglit:

    vs-uniform-array-mat[234]-col-row-rd
    vs-uniform-array-mat[234]-index-col-row-rd
    vs-uniform-array-mat[234]-index-row-rd
    vs-uniform-mat[234]-col-row-rd

Reviewed-by: Kenneth Graunke's avatarKenneth Graunke <kenneth@whitecape.org>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
(cherry picked from commit fbeb68e8)
parent 8b41ae0b
No related branches found
No related tags found
No related merge requests found
......@@ -1319,6 +1319,15 @@ _mesa_simplify_cmp(struct gl_program * program)
inst->Opcode = OPCODE_MOV;
inst->SrcReg[0] = inst->SrcReg[1];
/* Unused operands are expected to have the file set to
* PROGRAM_UNDEFINED. This is how _mesa_init_instructions initializes
* all of the sources.
*/
inst->SrcReg[1].File = PROGRAM_UNDEFINED;
inst->SrcReg[1].Swizzle = SWIZZLE_NOOP;
inst->SrcReg[2].File = PROGRAM_UNDEFINED;
inst->SrcReg[2].Swizzle = SWIZZLE_NOOP;
}
}
if (dbg) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment