panvk: fix vs image support
Since valhall, panvk_per_arch(nir_lower_descriptors) separates the driver set and the user sets, and does not need pan_lower_image_index. Fixes:5db135f66a
("panvk: Advertize v10 support") Signed-off-by: Chia-I Wu <olvaffe@gmail.com> Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32308> (cherry picked from commit2cbb8467c1
) Conflicts: src/panfrost/ci/panfrost-g610-fails.txt
This commit is contained in:
@@ -2874,7 +2874,7 @@
|
||||
"description": "panvk: fix vs image support",
|
||||
"nominated": true,
|
||||
"nomination_type": 2,
|
||||
"resolution": 0,
|
||||
"resolution": 1,
|
||||
"main_sha": null,
|
||||
"because_sha": "5db135f66ad325dcbf782c208480fcdced93db60",
|
||||
"notes": null
|
||||
|
@@ -517,7 +517,10 @@ panvk_lower_nir(struct panvk_device *dev, nir_shader *nir,
|
||||
|
||||
pan_shader_preprocess(nir, compile_input->gpu_id);
|
||||
|
||||
if (stage == MESA_SHADER_VERTEX)
|
||||
/* since valhall, panvk_per_arch(nir_lower_descriptors) separates the
|
||||
* driver set and the user sets, and does not need pan_lower_image_index
|
||||
*/
|
||||
if (PAN_ARCH < 9 && stage == MESA_SHADER_VERTEX)
|
||||
NIR_PASS_V(nir, pan_lower_image_index, MAX_VS_ATTRIBS);
|
||||
|
||||
NIR_PASS_V(nir, nir_shader_instructions_pass, panvk_lower_sysvals,
|
||||
|
Reference in New Issue
Block a user