From 9678becbf94b7593ab2760a4b465eac9d4752857 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Thu, 16 Mar 2023 10:57:33 -0700 Subject: [PATCH] Revert "zink/kopper: Add extra swapchain images for Venus" This reverts commit 10f8240caf20382826015d99f368e073093880d7. Signed-off-by: Yiwei Zhang Acked-by: Mike Blumenkrantz Part-of: --- src/gallium/drivers/zink/zink_kopper.c | 4 +--- src/gallium/drivers/zink/zink_screen.c | 5 ----- src/gallium/drivers/zink/zink_types.h | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/gallium/drivers/zink/zink_kopper.c b/src/gallium/drivers/zink/zink_kopper.c index 1c930f2..c5eb335 100644 --- a/src/gallium/drivers/zink/zink_kopper.c +++ b/src/gallium/drivers/zink/zink_kopper.c @@ -261,9 +261,7 @@ kopper_CreateSwapchain(struct zink_screen *screen, struct kopper_displaytarget * cswap->scci.clipped = VK_TRUE; } cswap->scci.presentMode = cdt->present_mode; - cswap->scci.minImageCount = cdt->caps.minImageCount + screen->driver_workarounds.extra_swapchain_images; - if (cdt->caps.maxImageCount != 0) - cswap->scci.minImageCount = MIN2(cswap->scci.minImageCount, cdt->caps.maxImageCount); + cswap->scci.minImageCount = cdt->caps.minImageCount; cswap->scci.preTransform = cdt->caps.currentTransform; if (cdt->formats[1]) cswap->scci.pNext = &cdt->format_list; diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 0a6cb08..b363b1e 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -2454,11 +2454,6 @@ init_driver_workarounds(struct zink_screen *screen) screen->driver_workarounds.no_linesmooth = true; } - screen->driver_workarounds.extra_swapchain_images = 0; - if (screen->info.driver_props.driverID == VK_DRIVER_ID_MESA_VENUS) { - screen->driver_workarounds.extra_swapchain_images = 1; - } - /* This is a workarround for the lack of * gl_PointSize + glPolygonMode(..., GL_LINE), in the imagination * proprietary driver. diff --git a/src/gallium/drivers/zink/zink_types.h b/src/gallium/drivers/zink/zink_types.h index b374955..c99ca1d 100644 --- a/src/gallium/drivers/zink/zink_types.h +++ b/src/gallium/drivers/zink/zink_types.h @@ -1416,7 +1416,6 @@ struct zink_screen { bool needs_zs_shader_swizzle; unsigned z16_unscaled_bias; unsigned z24_unscaled_bias; - unsigned extra_swapchain_images; } driver_workarounds; }; -- 2.7.4