fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 11:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

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

This reverts commit a80e44902f.

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10000>
(cherry picked from commit 78b643fb7f)
This commit is contained in:
Jordan Justen 2020-04-17 15:31:18 -07:00 • committed by Eric Engestrom
parent f6e8543ff7
commit 8e39721254
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -688,7 +688,7 @@
"description": "Revert \"intel/compiler: Silence unused parameter warning in update_inst_scoreboard\"",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "a80e44902f66244d257c523afe77558cf334d624"
},

6
src/intel/compiler/brw_fs_scoreboard.cpp
View file

@ -791,7 +791,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;
@ -844,7 +844,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;
}
@ -944,7 +944,7 @@ namespace {
}
}
update_inst_scoreboard(jps, inst, ip, sb);
update_inst_scoreboard(shader, jps, inst, ip, sb);
ip++;
}