OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: force fragment shader execution when occlusion queries are active

Browse Source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: mesa-stable
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34732>
(cherry picked from commit f7bc22e0d726d60a911270ea08fad36d8a52605c)
This commit is contained in:
Lionel Landwerlin
2025-04-29 09:48:30 +03:00
committed by Eric Engestrom
parent ebf87ad70b
commit a17da10518
2 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@@ -294,7 +294,7 @@
"description": "anv: force fragment shader execution when occlusion queries are active",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

23
src/intel/vulkan/genX_gfx_state.c
View File

@@ -890,27 +890,16 @@ update_ps_extra_has_uav(struct anv_gfx_dynamic_state *hw_state,
{
const struct brw_wm_prog_data *wm_prog_data = get_wm_prog_data(pipeline);
#if GFX_VERx10 >= 125
SET_STAGE(PS_EXTRA, ps_extra.PixelShaderHasUAV,
wm_prog_data && wm_prog_data->has_side_effects,
FRAGMENT);
#else
/* Prior to Gfx12.5 the HW seems to avoid spawning fragment shaders even if
* 3DSTATE_PS_EXTRA::PixelShaderKillsPixel=true when
* 3DSTATE_PS_BLEND::HasWriteableRT=false. This is causing problems with
* occlusion queries with 0 attachments. There are no CTS tests exercising
* this but zink+anv fails a bunch of tests like piglit
* arb_framebuffer_no_attachments-query.
*
* Here we choose to tweak the PixelShaderHasUAV to make sure the fragment
* shaders are run properly.
/* Force fragment shader execution if occlusion queries are active to
* ensure PS_DEPTH_COUNT is correct. Otherwise a fragment shader with
* discard and no render target setup could be increment PS_DEPTH_COUNT if
* the HW internally decides to not run the shader because it has already
* established that depth-test is passing.
*/
SET_STAGE(PS_EXTRA, ps_extra.PixelShaderHasUAV,
wm_prog_data && (wm_prog_data->has_side_effects ||
(gfx->color_att_count == 0 &&
gfx->n_occlusion_queries > 0)),
gfx->n_occlusion_queries > 0),
FRAGMENT);
#endif
}
ALWAYS_INLINE static void