Mesa (main): kopper: use get_drawable_info path for non-x11 drawables

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: b6a80142178ddba9d5b970b53e1f621b95235755
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b6a80142178ddba9d5b970b53e1f621b95235755

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed Jun  1 11:31:49 2022 -0400

kopper: use get_drawable_info path for non-x11 drawables

wayland surfaces need to take this path to get resizing right

cc: mesa-stable

Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16814>

---

 src/gallium/frontends/dri/kopper.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/frontends/dri/kopper.c b/src/gallium/frontends/dri/kopper.c
index d2df5aace4f..9e7547b7828 100644
--- a/src/gallium/frontends/dri/kopper.c
+++ b/src/gallium/frontends/dri/kopper.c
@@ -680,7 +680,8 @@ kopper_update_drawable_info(struct dri_drawable *drawable)
                                 drawable->textures[ST_ATTACHMENT_BACK_LEFT] :
                                 drawable->textures[ST_ATTACHMENT_FRONT_LEFT];
 
-   if (is_window && ptex && kscreen->base.fd == -1)
+   bool do_kopper_update = is_window && ptex && kscreen->base.fd == -1;
+   if (cdraw->info.bos.sType == VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR && do_kopper_update)
       zink_kopper_update(screen, ptex, &dPriv->w, &dPriv->h);
    else
       get_drawable_info(dPriv, &x, &y, &dPriv->w, &dPriv->h);