fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 17:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

kk: Guard writes after fragment demote

Browse source 
Required for M1 and M2 chips since they don't demote fragments.

Reviewed-by: Arcady Goldmints-Orlov <arcady@lunarg.com>
Signed-off-by: Aitor Camacho <aitor@lunarg.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38784>
This commit is contained in:
Aitor Camacho 2025-12-03 23:05:03 +09:00 • committed by Marge Bot
parent 9e145f33cb
commit 48555926ac
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/kosmickrisp/compiler/nir_to_msl.c
View file

@ -1910,10 +1910,8 @@ msl_preprocess_nir(struct nir_shader *nir)
NIR_PASS(_, nir, nir_lower_system_values);
if (nir->info.stage == MESA_SHADER_FRAGMENT) {
nir_input_attachment_options input_attachment_options = { };
nir_input_attachment_options input_attachment_options = {};
NIR_PASS(_, nir, nir_lower_input_attachments, &input_attachment_options);
/* KK_WORKAROUND_4 */
NIR_PASS(_, nir, nir_lower_is_helper_invocation);
}
NIR_PASS(_, nir, nir_opt_combine_barriers, NULL, NULL);
NIR_PASS(_, nir, nir_lower_var_copies);

11
src/kosmickrisp/vulkan/kk_shader.c
View file

@ -387,7 +387,8 @@ lower_subpass_dim(nir_builder *b, nir_tex_instr *tex, UNUSED void *_data)
}
static void
kk_lower_fs(nir_shader *nir, const struct vk_graphics_pipeline_state *state)
kk_lower_fs(struct kk_device *dev, nir_shader *nir,
const struct vk_graphics_pipeline_state *state)
{
if (state->cb)
kk_lower_fs_blend(nir, state);
@ -415,6 +416,12 @@ kk_lower_fs(nir_shader *nir, const struct vk_graphics_pipeline_state *state)
else if (nir->info.fs.needs_full_quad_helper_invocations ||
nir->info.fs.needs_coarse_quad_helper_invocations)
NIR_PASS(_, nir, msl_lower_static_sample_mask, 0xFFFFFFFF);
/* KK_WORKAROUND_4 */
if (!(dev->disabled_workarounds & BITFIELD64_BIT(4))) {
NIR_PASS(_, nir, nir_lower_helper_writes, true);
NIR_PASS(_, nir, nir_lower_is_helper_invocation);
}
}
static void
@ -517,7 +524,7 @@ kk_lower_nir(struct kk_device *dev, nir_shader *nir,
if (nir->info.stage == MESA_SHADER_VERTEX) {
kk_lower_vs(nir, state);
} else if (nir->info.stage == MESA_SHADER_FRAGMENT) {
kk_lower_fs(nir, state);
kk_lower_fs(dev, nir, state);
}
/* Descriptor lowering needs to happen after lowering blend since we will