Mesa (master): i965/fs: Use next_insn_offset rather than nr_insn.

[Matt Turner]

Module: Mesa
Branch: master
Commit: 424303db7f9ad47524ec5f3e38500620c16ab5a1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=424303db7f9ad47524ec5f3e38500620c16ab5a1

Author: Matt Turner <mattst88 at gmail.com>
Date:   Sun May 18 11:16:26 2014 -0700

i965/fs: Use next_insn_offset rather than nr_insn.

Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/drivers/dri/i965/brw_fs_generator.cpp  |    4 ++--
 src/mesa/drivers/dri/i965/gen8_fs_generator.cpp |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
index 6cff9b3..d1d2719 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
@@ -1796,12 +1796,12 @@ fs_generator::generate_assembly(exec_list *simd8_instructions,
 
    if (simd16_instructions) {
       /* align to 64 byte boundary. */
-      while ((p->nr_insn * sizeof(struct brw_instruction)) % 64) {
+      while (p->next_insn_offset % 64) {
          brw_NOP(p);
       }
 
       /* Save off the start of this SIMD16 program */
-      prog_data->prog_offset_16 = p->nr_insn * sizeof(struct brw_instruction);
+      prog_data->prog_offset_16 = p->next_insn_offset;
 
       brw_set_compression_control(p, BRW_COMPRESSION_COMPRESSED);
 
diff --git a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
index aec9421..bab1208 100644
--- a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
+++ b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
@@ -1284,11 +1284,11 @@ gen8_fs_generator::generate_assembly(exec_list *simd8_instructions,
 
    if (simd16_instructions) {
       /* Align to a 64-byte boundary. */
-      while ((nr_inst * sizeof(gen8_instruction)) % 64)
+      while (next_inst_offset % 64)
          NOP();
 
       /* Save off the start of this SIMD16 program */
-      prog_data->prog_offset_16 = nr_inst * sizeof(gen8_instruction);
+      prog_data->prog_offset_16 = next_inst_offset;
 
       struct annotation_info annotation;
       memset(&annotation, 0, sizeof(annotation));