From a6d97b0afed27a37b0edaed0e6360ae1c7f181e9 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 2 Aug 2024 09:34:29 -0400 Subject: [PATCH] kopper: check swapchain size after possible loader image resize previously the size was checked at the top of the function, but this ignored cases where the loader might end up resizing the drawable, resulting in an attempted 0x0 swapchain creation based on stale geometry cc: mesa-stable Part-of: --- src/gallium/frontends/dri/kopper.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/gallium/frontends/dri/kopper.c b/src/gallium/frontends/dri/kopper.c index 42e81d3cef2..d65b2c05b0d 100644 --- a/src/gallium/frontends/dri/kopper.c +++ b/src/gallium/frontends/dri/kopper.c @@ -406,12 +406,6 @@ kopper_allocate_textures(struct dri_context *ctx, bool is_window = drawable->is_window; bool is_pixmap = !is_window && drawable->info.bos.sType == VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR; - width = drawable->w; - height = drawable->h; - - resized = (drawable->old_w != width || - drawable->old_h != height); - /* Wait for glthread to finish because we can't use pipe_context from * multiple threads. */ @@ -461,7 +455,16 @@ kopper_allocate_textures(struct dri_context *ctx, } else { ctx->is_shared_buffer_bound = false; } - } else { + } + + /* check size after possible loader image resize */ + width = drawable->w; + height = drawable->h; + + resized = (drawable->old_w != width || + drawable->old_h != height); + + if (!image) { /* remove outdated textures */ if (resized) { for (i = 0; i < ST_ATTACHMENT_COUNT; i++) {