Module: Mesa Branch: staging/22.2 Commit: d4c441262933c3f1f2e10ba5577871803dae7d81 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d4c441262933c3f1f2e10ba5577871803dae7d81
Author: Samuel Pitoiset <[email protected]> Date: Wed Aug 31 16:41:21 2022 +0200 radv: fix bogus assertion with RADV_FORCE_VRS It supports VS, TES and GS. Cc: mesa-stable Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-By: Mike Blumenkrantz <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18345> (cherry picked from commit 047738daa75ecdf3be4e4f648fd0fa25474f7026) --- .pick_status.json | 2 +- src/amd/vulkan/radv_pipeline.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index e90425c41fd..f7bf18367ae 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -6682,7 +6682,7 @@ "description": "radv: fix bogus assertion with RADV_FORCE_VRS", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index 5490e159cea..1d358a8a04d 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -4683,6 +4683,7 @@ radv_create_shaders(struct radv_pipeline *pipeline, struct radv_pipeline_layout /* Force per-vertex VRS. */ if (radv_consider_force_vrs(pipeline, noop_fs, stages, *last_vgt_api_stage)) { assert(*last_vgt_api_stage == MESA_SHADER_VERTEX || + *last_vgt_api_stage == MESA_SHADER_TESS_EVAL || *last_vgt_api_stage == MESA_SHADER_GEOMETRY); nir_shader *last_vgt_shader = stages[*last_vgt_api_stage].nir; NIR_PASS(_, last_vgt_shader, radv_force_primitive_shading_rate, device);
