projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 138b5b9)
r600g: Check comp_mask before merging export instructions
authorVincent Lejeune <vljn@ovi.com>
Sun, 3 Mar 2013 20:35:38 +0000 (21:35 +0100)
committerVincent Lejeune <vljn@ovi.com>
Sun, 3 Mar 2013 20:39:51 +0000 (21:39 +0100)
Fixes a llvm uncovered (rare) bug where consecutive exports were
merged even if they have incompatible mask.

src/gallium/drivers/r600/r600_asm.c patch | blob | history

diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index b5a29cbb003e84f0eb36114bc0052835c6feb9fd..cb3e7a6302512cb3aae539938479d4c06f5fa439 100644 (file)
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -145,6 +145,7 @@ int r600_bytecode_add_output(struct r600_bytecode *bc,
                output->swizzle_y == bc->cf_last->output.swizzle_y &&
                output->swizzle_z == bc->cf_last->output.swizzle_z &&
                output->swizzle_w == bc->cf_last->output.swizzle_w &&
+               output->comp_mask == bc->cf_last->output.comp_mask &&
                (output->burst_count + bc->cf_last->output.burst_count) <= 16) {
 
                if ((output->gpr + output->burst_count) == bc->cf_last->output.gpr &&