Mesa (master): i965/compaction: Make src_offset local to the for loop.
Matt Turner
mattst88 at kemper.freedesktop.org
Thu Sep 25 18:26:23 UTC 2014
Module: Mesa
Branch: master
Commit: eebf1f5441740704812d981b801e8ba6674370bd
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=eebf1f5441740704812d981b801e8ba6674370bd
Author: Matt Turner <mattst88 at gmail.com>
Date: Fri Aug 22 22:08:54 2014 -0700
i965/compaction: Make src_offset local to the for loop.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
---
src/mesa/drivers/dri/i965/brw_eu_compact.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_eu_compact.c b/src/mesa/drivers/dri/i965/brw_eu_compact.c
index 6af134c..dd32175 100644
--- a/src/mesa/drivers/dri/i965/brw_eu_compact.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_compact.c
@@ -1107,10 +1107,10 @@ brw_compact_instructions(struct brw_compile *p, int start_offset,
if (brw->gen < 6)
return;
- int src_offset;
int offset = 0;
int compacted_count = 0;
- for (src_offset = 0; src_offset < p->next_insn_offset - start_offset;) {
+ for (int src_offset = 0; src_offset < p->next_insn_offset - start_offset;
+ src_offset += sizeof(brw_inst)) {
brw_inst *src = store + src_offset;
void *dst = store + offset;
@@ -1131,10 +1131,7 @@ brw_compact_instructions(struct brw_compile *p, int start_offset,
}
offset += 8;
- src_offset += 16;
} else {
- int size = brw_inst_cmpt_control(brw, src) ? 8 : 16;
-
/* It appears that the end of thread SEND instruction needs to be
* aligned, or the GPU hangs.
*/
@@ -1155,10 +1152,9 @@ brw_compact_instructions(struct brw_compile *p, int start_offset,
* place.
*/
if (offset != src_offset) {
- memmove(dst, src, size);
+ memmove(dst, src, sizeof(brw_inst));
}
- offset += size;
- src_offset += size;
+ offset += sizeof(brw_inst);
}
}
More information about the mesa-commit
mailing list