From b10631865d85b59b6b3acfbc1e2b5aa52db5d6cb Mon Sep 17 00:00:00 2001
From: Hyunjun Ko <zzoon@igalia.com>
Date: Thu, 15 Jun 2023 15:38:18 +0900
Subject: [PATCH] vulkan/video: adds more conditions for setting
 loop_filter_across_slices_enable in h265 slice parsing.

Fixes: efdcacb230 ("vulkan/video: add to parse h265 slice.")

Signed-off-by: Hyunjun Ko <zzoon@igalia.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23688>
---
 src/vulkan/runtime/vk_video.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vulkan/runtime/vk_video.c b/src/vulkan/runtime/vk_video.c
index e9cc5ab5649..703a6c6772f 100644
--- a/src/vulkan/runtime/vk_video.c
+++ b/src/vulkan/runtime/vk_video.c
@@ -792,7 +792,9 @@ vk_video_parse_h265_slice_header(const struct VkVideoDecodeInfoKHR *frame_info,
       }
    }
 
-   if (pps->flags.pps_loop_filter_across_slices_enabled_flag)
+   if (pps->flags.pps_loop_filter_across_slices_enabled_flag &&
+         (params->sao_luma_flag || params->sao_chroma_flag ||
+          !params->disable_deblocking_filter_idc))
       params->loop_filter_across_slices_enable = vl_rbsp_u(&rbsp, 1);
 
    if (pps->flags.tiles_enabled_flag || pps->flags.entropy_coding_sync_enabled_flag) {