zink: don't lose existing pNext when using wsi_image_create_info in image creation
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Fri, 9 Apr 2021 14:43:59 +0000 (10:43 -0400)
committerMarge Bot <eric+marge@anholt.net>
Fri, 9 Apr 2021 15:54:23 +0000 (15:54 +0000)
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10138>

src/gallium/drivers/zink/zink_resource.c

index a75fc1a..f1c5f6f 100644 (file)
@@ -417,8 +417,10 @@ resource_object_create(struct zink_screen *screen, const struct pipe_resource *t
          .scanout = true,
       };
 
-      if (screen->needs_mesa_wsi && (templ->bind & PIPE_BIND_SCANOUT))
+      if (screen->needs_mesa_wsi && (templ->bind & PIPE_BIND_SCANOUT)) {
+         image_wsi_info.pNext = ici.pNext;
          ici.pNext = &image_wsi_info;
+      }
 
       VkResult result = vkCreateImage(screen->dev, &ici, NULL, &obj->image);
       if (result != VK_SUCCESS) {