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

radv: Fix radv_pipeline_is_blend_enabled

Browse Source 
This was relying on cb being NULL instead of just gracefully handling
it, and it will stop being NULL once we start tracking attachment count
as state. Moreover is was broken in the case where only the blend enable
is dynamic.

Reviewed-by: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22301>
This commit is contained in:
Connor Abbott
2023-07-03 11:21:20 +02:00
committed by Marge Bot
parent f497cc9d56
commit d322a80170
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/amd/vulkan/radv_pipeline_graphics.c
View File

@@ -493,15 +493,18 @@ radv_dynamic_state_mask(VkDynamicState state)
static bool
radv_pipeline_is_blend_enabled(const struct radv_graphics_pipeline *pipeline, const struct vk_color_blend_state *cb)
{
/* If we don't know then we have to assume that blend may be enabled. cb may also be NULL in this
* case.
*/
if (pipeline->dynamic_states & (RADV_DYNAMIC_COLOR_BLEND_ENABLE | RADV_DYNAMIC_COLOR_WRITE_MASK))
return true;
/* If we have the blend enable state, then cb being NULL indicates no attachments are written. */
if (cb) {
for (uint32_t i = 0; i < cb->attachment_count; i++) {
if (cb->attachments[i].write_mask && cb->attachments[i].blend_enable)
return true;
}
} else {
/* When all color blend states are dynamic, it's allowed to be NULL. */
if ((pipeline->dynamic_states & RADV_DYNAMIC_CB_STATES) == RADV_DYNAMIC_CB_STATES)
return true;
}
return false;