diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c index b5166430815..998ca887180 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.c +++ b/src/gallium/drivers/panfrost/pan_cmdstream.c @@ -465,7 +465,7 @@ pan_merge_empty_fs(struct mali_renderer_state_packed *rsd) cfg.properties.shader_modifies_coverage = true; cfg.properties.allow_forward_pixel_to_kill = true; cfg.properties.allow_forward_pixel_to_be_killed = true; - cfg.properties.zs_update_operation = MALI_PIXEL_KILL_STRONG_EARLY; + cfg.properties.zs_update_operation = MALI_PIXEL_KILL_FORCE_EARLY; /* Alpha isn't written so these are vacuous */ cfg.multisample_misc.overdraw_alpha0 = true; diff --git a/src/gallium/drivers/panfrost/pan_fb_preload.c b/src/gallium/drivers/panfrost/pan_fb_preload.c index 7766aefc614..17e103d18df 100644 --- a/src/gallium/drivers/panfrost/pan_fb_preload.c +++ b/src/gallium/drivers/panfrost/pan_fb_preload.c @@ -259,7 +259,7 @@ pan_preload_emit_rsd(const struct pan_preload_shader_data *preload_shader, cfg.properties.pixel_kill_operation = MALI_PIXEL_KILL_FORCE_LATE; } else { /* Skipping ATEST requires forcing Z/S */ - cfg.properties.zs_update_operation = MALI_PIXEL_KILL_STRONG_EARLY; + cfg.properties.zs_update_operation = MALI_PIXEL_KILL_FORCE_EARLY; cfg.properties.pixel_kill_operation = MALI_PIXEL_KILL_FORCE_EARLY; } @@ -1190,7 +1190,7 @@ pan_preload_emit_dcd(struct pan_fb_preload_cache *cache, struct pan_pool *pool, cfg.blend_count = 0; } else { /* Skipping ATEST requires forcing Z/S */ - cfg.zs_update_operation = MALI_PIXEL_KILL_STRONG_EARLY; + cfg.zs_update_operation = MALI_PIXEL_KILL_FORCE_EARLY; cfg.pixel_kill_operation = MALI_PIXEL_KILL_FORCE_EARLY; cfg.blend = blend.gpu; diff --git a/src/panfrost/lib/genxml/v10.xml b/src/panfrost/lib/genxml/v10.xml index ffef9d59cbf..d33176c22e3 100644 --- a/src/panfrost/lib/genxml/v10.xml +++ b/src/panfrost/lib/genxml/v10.xml @@ -356,7 +356,6 @@ - diff --git a/src/panfrost/lib/genxml/v9.xml b/src/panfrost/lib/genxml/v9.xml index 59e80e4edfb..9b2a445f0c2 100644 --- a/src/panfrost/lib/genxml/v9.xml +++ b/src/panfrost/lib/genxml/v9.xml @@ -373,7 +373,6 @@ - diff --git a/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c b/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c index 076a04813d8..d83ef117df6 100644 --- a/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c +++ b/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c @@ -1540,7 +1540,7 @@ prepare_dcd(struct panvk_cmd_buffer *cmdbuf) cfg.allow_forward_pixel_to_kill = true; cfg.allow_forward_pixel_to_be_killed = true; cfg.pixel_kill_operation = MALI_PIXEL_KILL_FORCE_EARLY; - cfg.zs_update_operation = MALI_PIXEL_KILL_STRONG_EARLY; + cfg.zs_update_operation = MALI_PIXEL_KILL_FORCE_EARLY; cfg.overdraw_alpha0 = true; cfg.overdraw_alpha1 = true; } diff --git a/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c b/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c index e1aab7bc0f6..ea383dc9194 100644 --- a/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c +++ b/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c @@ -287,7 +287,7 @@ panvk_draw_prepare_fs_rsd(struct panvk_cmd_buffer *cmdbuf, cfg.properties.depth_source = MALI_DEPTH_SOURCE_FIXED_FUNCTION; cfg.properties.allow_forward_pixel_to_kill = true; cfg.properties.allow_forward_pixel_to_be_killed = true; - cfg.properties.zs_update_operation = MALI_PIXEL_KILL_STRONG_EARLY; + cfg.properties.zs_update_operation = MALI_PIXEL_KILL_FORCE_EARLY; } bool msaa = dyns->ms.rasterization_samples > 1; diff --git a/src/panfrost/vulkan/panvk_vX_cmd_fb_preload.c b/src/panfrost/vulkan/panvk_vX_cmd_fb_preload.c index b6315e3c8eb..28d96508def 100644 --- a/src/panfrost/vulkan/panvk_vX_cmd_fb_preload.c +++ b/src/panfrost/vulkan/panvk_vX_cmd_fb_preload.c @@ -376,7 +376,7 @@ cmd_emit_dcd(struct panvk_cmd_buffer *cmdbuf, struct pan_fb_info *fbinfo, if (key->aspects == VK_IMAGE_ASPECT_COLOR_BIT) { /* Skipping ATEST requires forcing Z/S */ - cfg.properties.zs_update_operation = MALI_PIXEL_KILL_STRONG_EARLY; + cfg.properties.zs_update_operation = MALI_PIXEL_KILL_FORCE_EARLY; cfg.properties.pixel_kill_operation = MALI_PIXEL_KILL_FORCE_EARLY; } else { /* Writing Z/S requires late updates */ @@ -620,7 +620,7 @@ cmd_emit_dcd(struct panvk_cmd_buffer *cmdbuf, struct pan_fb_info *fbinfo, pan_pack(&dcds[dcd_idx], DRAW, cfg) { if (key->aspects == VK_IMAGE_ASPECT_COLOR_BIT) { /* Skipping ATEST requires forcing Z/S */ - cfg.zs_update_operation = MALI_PIXEL_KILL_STRONG_EARLY; + cfg.zs_update_operation = MALI_PIXEL_KILL_FORCE_EARLY; cfg.pixel_kill_operation = MALI_PIXEL_KILL_FORCE_EARLY; cfg.blend = bds.gpu;