From 69e94e8939f79041b9cc21f03286b24166a0d746 Mon Sep 17 00:00:00 2001 From: Anuj Phogat Date: Wed, 17 Feb 2021 14:24:20 -0800 Subject: [PATCH] intel/anv: Fix condition for planar yuv surface Test the sampler->conversion for NULL pointer before dereferencing it. Fixes: Regressions in VulkanCTS. Fixes: 226316116cd "intel/anv: Fix condition to set MipModeFilter for YUV surface" Signed-off-by: Anuj Phogat Reviewed-by: Kenneth Graunke Reviewed-by: Jason Ekstrand --- src/intel/vulkan/genX_state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/intel/vulkan/genX_state.c b/src/intel/vulkan/genX_state.c index 0ba0ea3efd5..9dc9fb4c4b6 100644 --- a/src/intel/vulkan/genX_state.c +++ b/src/intel/vulkan/genX_state.c @@ -634,12 +634,12 @@ VkResult genX(CreateSampler)( /* From Broadwell PRM, SAMPLER_STATE: * "Mip Mode Filter must be set to MIPFILTER_NONE for Planar YUV surfaces." */ - const bool isl_format_is_planar_yuv = + const bool isl_format_is_planar_yuv = sampler->conversion && isl_format_is_yuv(sampler->conversion->format->planes[0].isl_format) && isl_format_is_planar(sampler->conversion->format->planes[0].isl_format); const uint32_t mip_filter_mode = - (sampler->conversion && isl_format_is_planar_yuv) ? + isl_format_is_planar_yuv ? MIPFILTER_NONE : vk_to_gen_mipmap_mode[pCreateInfo->mipmapMode]; struct GENX(SAMPLER_STATE) sampler_state = {