diff options
| author | Lionel Landwerlin <lionel.g.landwerlin@intel.com> | 2023-10-23 17:42:35 +0300 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2023-10-30 15:47:02 +0000 |
| commit | a0690566bdf282accedc98b1af8ee2beaf5432d7 (patch) | |
| tree | 409c275c864053fbd64c150dcad2e4745037f8e0 | |
| parent | 30a1ebe0344ae776db9d9c155498951cd8851fba (diff) | |
intel/fs: fix dynamic interpolation mode selection
We can end up in situation where we are dispatched with a multisample
framebuffer but not at per-sample. In this case we would request the
at_sample value with the wrong message configuration.
Relying on the BRW_WM_MSAA_FLAG_MULTISAMPLE_FBO flag superseeds
BRW_WM_MSAA_FLAG_PERSAMPLE_DISPATCH.
Fixes piglit tests :
spec@arb_gpu_shader5@arb_gpu_shader5-interpolateatsample*
With Zink on Anv
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 68027bd38e ("intel/fs: implement dynamic interpolation mode for dynamic persample shaders")
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25854>
(cherry picked from commit 439b0e86884eba55a4c25add9fe2763af1782b9f)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/intel/compiler/brw_lower_logical_sends.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.pick_status.json b/.pick_status.json index 98933a5b14c..e50dc6ffda0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1794,7 +1794,7 @@ "description": "intel/fs: fix dynamic interpolation mode selection", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "68027bd38e134f45d1fe8612c0c31e5379ed7435", "notes": null diff --git a/src/intel/compiler/brw_lower_logical_sends.cpp b/src/intel/compiler/brw_lower_logical_sends.cpp index c055da7e8bc..1e7d7668f98 100644 --- a/src/intel/compiler/brw_lower_logical_sends.cpp +++ b/src/intel/compiler/brw_lower_logical_sends.cpp @@ -2715,6 +2715,7 @@ lower_math_logical_send(const fs_builder &bld, fs_inst *inst) static void lower_interpolator_logical_send(const fs_builder &bld, fs_inst *inst, + const struct brw_wm_prog_key *wm_prog_key, const struct brw_wm_prog_data *wm_prog_data) { const intel_device_info *devinfo = bld.shader->devinfo; @@ -2747,7 +2748,7 @@ lower_interpolator_logical_send(const fs_builder &bld, fs_inst *inst, const bool dynamic_mode = inst->opcode == FS_OPCODE_INTERPOLATE_AT_SAMPLE && - wm_prog_data->persample_dispatch == BRW_SOMETIMES; + wm_prog_key->multisample_fbo == BRW_SOMETIMES; fs_reg desc = inst->src[1]; uint32_t desc_imm = @@ -2799,7 +2800,7 @@ lower_interpolator_logical_send(const fs_builder &bld, fs_inst *inst, desc = ubld.vgrf(BRW_REGISTER_TYPE_UD); check_dynamic_msaa_flag(ubld, wm_prog_data, - BRW_WM_MSAA_FLAG_PERSAMPLE_DISPATCH); + BRW_WM_MSAA_FLAG_MULTISAMPLE_FBO); if (orig_desc.file == IMM) { /* Not using SEL here because we would generate an instruction with 2 * immediate sources which is not supported by HW. @@ -3185,6 +3186,7 @@ fs_visitor::lower_logical_sends() case FS_OPCODE_INTERPOLATE_AT_SHARED_OFFSET: case FS_OPCODE_INTERPOLATE_AT_PER_SLOT_OFFSET: lower_interpolator_logical_send(ibld, inst, + (const brw_wm_prog_key *)key, brw_wm_prog_data(prog_data)); break; |