[Mesa-dev] [PATCH 19/23] i965/fs: Use next_insn_offset rather than nr_insn.

Matt Turner mattst88 at gmail.com
Mon May 19 11:55:45 PDT 2014


---
 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 872b5a4..914fb29 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
@@ -1843,12 +1843,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 9011bff..272f668 100644
--- a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
+++ b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
@@ -1330,11 +1330,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 *annotation;
       int num_annotations;
-- 
1.8.3.2



More information about the mesa-dev mailing list