Mesa (master): Revert "intel/compiler: Silence unused parameter warning in update_inst_scoreboard"

[GitLab Mirror]

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

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Fri Apr 17 15:31:18 2020 -0700

Revert "intel/compiler: Silence unused parameter warning in update_inst_scoreboard"

This was a placeholder for the XeHP cross-pipeline synchronization
code, bring it back.

This reverts commit a80e44902f66244d257c523afe77558cf334d624.

Reviewed-by: Francisco Jerez <currojerez at riseup.net>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10000>

---

 src/intel/compiler/brw_fs_scoreboard.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/intel/compiler/brw_fs_scoreboard.cpp b/src/intel/compiler/brw_fs_scoreboard.cpp
index b5ce0fc4f70..3b1f6deac60 100644
--- a/src/intel/compiler/brw_fs_scoreboard.cpp
+++ b/src/intel/compiler/brw_fs_scoreboard.cpp
@@ -857,7 +857,7 @@ namespace {
     * instruction \p inst.
     */
    void
-   update_inst_scoreboard(const ordered_address *jps,
+   update_inst_scoreboard(const fs_visitor *shader, const ordered_address *jps,
                           const fs_inst *inst, unsigned ip, scoreboard &sb)
    {
       const bool exec_all = inst->force_writemask_all;
@@ -910,7 +910,7 @@ namespace {
       unsigned ip = 0;
 
       foreach_block_and_inst(block, fs_inst, inst, shader->cfg)
-         update_inst_scoreboard(jps, inst, ip++, sbs[block->num]);
+         update_inst_scoreboard(shader, jps, inst, ip++, sbs[block->num]);
 
       return sbs;
    }
@@ -1010,7 +1010,7 @@ namespace {
             }
          }
 
-         update_inst_scoreboard(jps, inst, ip, sb);
+         update_inst_scoreboard(shader, jps, inst, ip, sb);
          ip++;
       }