From dfeb75cc51409e5ded4957dde1e05eab102daf85 Mon Sep 17 00:00:00 2001 From: jojo61 Date: Tue, 13 Apr 2021 11:54:03 +0200 Subject: [PATCH] Support libplacebo API 127 - Attention the scaler sequence has changed you need to redefine the scalers you want to use --- softhdcuvid.cpp | 6 +++--- video.c | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/softhdcuvid.cpp b/softhdcuvid.cpp index 02169b0..7c2a76b 100644 --- a/softhdcuvid.cpp +++ b/softhdcuvid.cpp @@ -51,7 +51,7 @@ extern "C" #include "video.h" #include "codec.h" #endif -#if PLACEBO +#ifdef PLACEBO #include extern void ToggleLUT(); #endif @@ -63,7 +63,7 @@ extern void ToggleLUT(); /// vdr-plugin version number. /// Makefile extracts the version number for generating the file name /// for the distribution archive. -static const char *const VERSION = "3.4.3" +static const char *const VERSION = "3.4.4" #ifdef GIT_REV "-GIT" GIT_REV #endif @@ -1128,7 +1128,7 @@ void cMenuSetupSoft::Create(void) if (scalers == 0) { scalingtest[0] = (char *)"Off"; - for (scalers = 0; pl_named_filters[scalers].filter != NULL; scalers++) { + for (scalers = 0; pl_named_filters[scalers].name != NULL; scalers++) { scaling[scalers] = (char *)pl_named_filters[scalers].name; scalingtest[scalers + 1] = (char *)pl_named_filters[scalers].name; // printf("Scaler %s\n",pl_named_filters[scalers].name); diff --git a/video.c b/video.c index 58fce73..c40d220 100644 --- a/video.c +++ b/video.c @@ -5618,8 +5618,9 @@ void InitPlacebo() p->gpu = p->gl->gpu; #else - struct pl_vulkan_params params; + struct pl_vulkan_params params = {0}; struct pl_vk_inst_params iparams = pl_vk_inst_default_params; + VkXcbSurfaceCreateInfoKHR xcbinfo; char xcbext[] = { "VK_KHR_xcb_surface" }; @@ -5652,7 +5653,7 @@ void InitPlacebo() params.instance = p->vk_inst->instance; params.async_transfer = true; params.async_compute = true; - params.queue_count = 16; + params.queue_count = 1; params.surface = p->pSurface; params.allow_software = false;