summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <mdaenzer@redhat.com>2020-02-18 12:12:01 +0100
committerDylan Baker <dylan@pnwbakers.com>2020-02-20 13:36:38 -0800
commit2a807e98b235bc7198c08f6b7fe8c2b1cc2d834b (patch)
treed97e92087bdefe092efe07c7ca374960c9e0247a
parent735a90abe50bb288eabfdd71f48cd229754ce62d (diff)
st/vdpau: Only call is_video_format_supported hook if needed
Namely only if *is_supported is true, otherwise the hook result can't affect it. Avoids ../src/gallium/state_trackers/vdpau/vdpau_private.h:138: FormatYCBCRToPipe: Assertion `0' failed. with assertions enabled. Fixes: 5d5b414a7b84 "st/vdpau: fix chroma_format handling in VideoSurfaceQueryGetPutBitsYCbCrCapabilities" Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3848> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3848> (cherry picked from commit 7e6010106fb3c4eb5436de869183e857243c1006)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/state_trackers/vdpau/query.c14
2 files changed, 8 insertions, 8 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 12c3930eaff..33a365be759 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -256,7 +256,7 @@
"description": "st/vdpau: Only call is_video_format_supported hook if needed",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "5d5b414a7b840a4a90050041fabd88a9af6dca43"
},
diff --git a/src/gallium/state_trackers/vdpau/query.c b/src/gallium/state_trackers/vdpau/query.c
index 5f644bbeea0..eca1b3031c1 100644
--- a/src/gallium/state_trackers/vdpau/query.c
+++ b/src/gallium/state_trackers/vdpau/query.c
@@ -154,13 +154,13 @@ vlVdpVideoSurfaceQueryGetPutBitsYCbCrCapabilities(VdpDevice device, VdpChromaTyp
break;
}
- *is_supported &= pscreen->is_video_format_supported
- (
- pscreen,
- FormatYCBCRToPipe(bits_ycbcr_format),
- PIPE_VIDEO_PROFILE_UNKNOWN,
- PIPE_VIDEO_ENTRYPOINT_BITSTREAM
- );
+ if (*is_supported &&
+ !pscreen->is_video_format_supported(pscreen,
+ FormatYCBCRToPipe(bits_ycbcr_format),
+ PIPE_VIDEO_PROFILE_UNKNOWN,
+ PIPE_VIDEO_ENTRYPOINT_BITSTREAM)) {
+ *is_supported = false;
+ }
mtx_unlock(&dev->mutex);
return VDP_STATUS_OK;