RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

hwdec_cuda: reduce nesting in check functions 

This simplifies the code and makes it easier to read.
This commit is contained in:
Jrelvas 2024-05-03 09:47:19 +01:00 committed by Kacper Michajłow
parent 58f50c8e49
commit 1759d73c83
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
video/out/hwdec/hwdec_cuda_gl.c
View File

@ -106,14 +106,12 @@ static void cuda_ext_gl_uninit(const struct ra_hwdec_mapper *mapper, int n)
#define CHECK_CU(x) check_cu(hw, (x), #x)
static bool cuda_gl_check(const struct ra_hwdec *hw) {
if (ra_is_gl(hw->ra_ctx->ra)) {
GL *gl = ra_gl_get(hw->ra_ctx->ra);
if (gl->version < 210 && gl->es < 300) {
MP_VERBOSE(hw, "need OpenGL >= 2.1 or OpenGL-ES >= 3.0\n");
return false;
}
} else {
// This is not an OpenGL RA.
if (!ra_is_gl(hw->ra_ctx->ra))
return false; // This is not an OpenGL RA.
GL *gl = ra_gl_get(hw->ra_ctx->ra);
if (gl->version < 210 && gl->es < 300) {
MP_VERBOSE(hw, "need OpenGL >= 2.1 or OpenGL-ES >= 3.0\n");
return false;
}

22
video/out/hwdec/hwdec_cuda_vk.c
View File

@ -273,18 +273,16 @@ static bool cuda_ext_vk_signal(const struct ra_hwdec_mapper *mapper, int n)
static bool cuda_vk_check(const struct ra_hwdec *hw) {
pl_gpu gpu = ra_pl_get(hw->ra_ctx->ra);
if (gpu != NULL) {
if (!(gpu->export_caps.tex & HANDLE_TYPE)) {
MP_VERBOSE(hw, "CUDA hwdec with Vulkan requires exportable texture memory of type 0x%X.\n",
HANDLE_TYPE);
return false;
} else if (!(gpu->export_caps.sync & HANDLE_TYPE)) {
MP_VERBOSE(hw, "CUDA hwdec with Vulkan requires exportable semaphores of type 0x%X.\n",
HANDLE_TYPE);
return false;
}
} else {
// This is not a Vulkan RA.
if (gpu == NULL)
return false; // This is not a Vulkan RA.
if (!(gpu->export_caps.tex & HANDLE_TYPE)) {
MP_VERBOSE(hw, "CUDA hwdec with Vulkan requires exportable texture memory of type 0x%X.\n",
HANDLE_TYPE);
return false;
} else if (!(gpu->export_caps.sync & HANDLE_TYPE)) {
MP_VERBOSE(hw, "CUDA hwdec with Vulkan requires exportable semaphores of type 0x%X.\n",
HANDLE_TYPE);
return false;
}