diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2022-02-06 14:13:24 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-02-24 14:56:50 -0800 |
| commit | c1822e7222f090a336b03f7403788bc2cac0bc6f (patch) | |
| tree | 7d1446e3431a1e2359f95870ec37ef8fd00cbed2 | |
| parent | fb8a9be463fd4e8bbe6e9340f4a7e61f97018630 (diff) | |
intel/fs: Assert that old pull-const code is not used if devinfo->has_lsc
Jason changed this to use LSC in:
f5876dfdb9b ("intel/fs: Lower uniform pull constant load message to LSC dataport")
Cc: 22.0 <mesa-stable>
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14384>
(cherry picked from commit e2cd0c3a3c21d99ad0b99d1e21a8cad148a78aaf)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/intel/compiler/brw_fs_generator.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index bbb53d6f9f6..25bc1bdd516 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -49,7 +49,7 @@ "description": "intel/fs: Assert that old pull-const code is not used if devinfo->has_lsc", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/intel/compiler/brw_fs_generator.cpp b/src/intel/compiler/brw_fs_generator.cpp index aab50a1c5a7..c1ebcda9fbd 100644 --- a/src/intel/compiler/brw_fs_generator.cpp +++ b/src/intel/compiler/brw_fs_generator.cpp @@ -1592,6 +1592,7 @@ fs_generator::generate_uniform_pull_constant_load_gfx7(fs_inst *inst, assert(index.type == BRW_REGISTER_TYPE_UD); assert(payload.file == BRW_GENERAL_REGISTER_FILE); assert(type_sz(dst.type) == 4); + assert(!devinfo->has_lsc); if (index.file == BRW_IMMEDIATE_VALUE) { const uint32_t surf_index = index.ud; |