.gitignore

@@ -1,3 +1 @@
-SOURCES/dataclasses-0.8.tar.gz
-SOURCES/mesa-23.1.4.tar.xz
-SOURCES/meson-0.61.4.tar.gz
+SOURCES/mesa-21.1.5.tar.xz

.mesa.metadata

@@ -1,3 +1 @@
-ef25d3e9e2523805baa314a4adcb915ae901740e SOURCES/dataclasses-0.8.tar.gz
-8a48c0e1fbda2c9563ddcf95b05012ab00a8a692 SOURCES/mesa-23.1.4.tar.xz
-b0ab169abd8ec87ce773a02b2c7d6a8664b8db00 SOURCES/meson-0.61.4.tar.gz
+6962198a822b83195065611e253cde98f627e904 SOURCES/mesa-21.1.5.tar.xz

SOURCES/0001-clover-llvm-move-to-modern-pass-manager.patch

@@ -1,127 +0,0 @@
-From 2d4fe5f229791fde52846b3f583c12508b5109d6 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Fri, 25 Aug 2023 12:43:44 +1000
-Subject: [PATCH] clover/llvm: move to modern pass manager.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This seems like it should work, but I haven't tested it yet.
-
-Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24879>
----
- .../frontends/clover/llvm/invocation.cpp      | 64 +++++++++++++++----
- 1 file changed, 51 insertions(+), 13 deletions(-)
-
-diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp
-index 7a50fea3323..43d26fe1abb 100644
---- a/src/gallium/frontends/clover/llvm/invocation.cpp
-+++ b/src/gallium/frontends/clover/llvm/invocation.cpp
-@@ -27,13 +27,17 @@
- #include <llvm/IR/DiagnosticPrinter.h>
- #include <llvm/IR/DiagnosticInfo.h>
- #include <llvm/IR/LLVMContext.h>
-+#include <llvm/IR/Module.h>
- #include <llvm/Support/raw_ostream.h>
--#include <llvm/Transforms/IPO/PassManagerBuilder.h>
-+#include <llvm/Transforms/IPO/Internalize.h>
- #include <llvm-c/Target.h>
- #ifdef HAVE_CLOVER_SPIRV
- #include <LLVMSPIRVLib/LLVMSPIRVLib.h>
- #endif
- 
-+#include <llvm-c/TargetMachine.h>
-+#include <llvm-c/Transforms/PassBuilder.h>
-+#include <llvm/Support/CBindingWrapping.h>
- #include <clang/CodeGen/CodeGenAction.h>
- #include <clang/Lex/PreprocessorOptions.h>
- #include <clang/Frontend/TextDiagnosticBuffer.h>
-@@ -439,10 +443,10 @@ clover::llvm::compile_program(const std::string &source,
- 
- namespace {
-    void
--   optimize(Module &mod, unsigned optimization_level,
-+   optimize(Module &mod,
-+            const std::string& ir_target,
-+            unsigned optimization_level,
-             bool internalize_symbols) {
--      ::llvm::legacy::PassManager pm;
--
-       // By default, the function internalizer pass will look for a function
-       // called "main" and then mark all other functions as internal.  Marking
-       // functions as internal enables the optimizer to perform optimizations
-@@ -458,19 +462,53 @@ namespace {
-       if (internalize_symbols) {
-          std::vector<std::string> names =
-             map(std::mem_fn(&Function::getName), get_kernels(mod));
--         pm.add(::llvm::createInternalizePass(
-+         internalizeModule(mod,
-                       [=](const ::llvm::GlobalValue &gv) {
-                          return std::find(names.begin(), names.end(),
-                                           gv.getName()) != names.end();
--                      }));
-+                      });
-       }
- 
--      ::llvm::PassManagerBuilder pmb;
--      pmb.OptLevel = optimization_level;
--      pmb.LibraryInfo = new ::llvm::TargetLibraryInfoImpl(
--         ::llvm::Triple(mod.getTargetTriple()));
--      pmb.populateModulePassManager(pm);
--      pm.run(mod);
-+
-+      const char *opt_str = NULL;
-+      LLVMCodeGenOptLevel level;
-+      switch (optimization_level) {
-+      case 0:
-+      default:
-+         opt_str = "default<O0>";
-+         level = LLVMCodeGenLevelNone;
-+         break;
-+      case 1:
-+         opt_str = "default<O1>";
-+         level = LLVMCodeGenLevelLess;
-+         break;
-+      case 2:
-+         opt_str = "default<O2>";
-+         level = LLVMCodeGenLevelDefault;
-+         break;
-+      case 3:
-+         opt_str = "default<O3>";
-+         level = LLVMCodeGenLevelAggressive;
-+         break;
-+      }
-+
-+      const target &target = ir_target;
-+      LLVMTargetRef targ;
-+      char *err_message;
-+
-+      if (LLVMGetTargetFromTriple(target.triple.c_str(), &targ, &err_message))
-+         return;
-+      LLVMTargetMachineRef tm =
-+         LLVMCreateTargetMachine(targ, target.triple.c_str(),
-+                                 target.cpu.c_str(), "", level,
-+                                 LLVMRelocDefault, LLVMCodeModelDefault);
-+
-+      if (!tm)
-+         return;
-+      LLVMPassBuilderOptionsRef opts = LLVMCreatePassBuilderOptions();
-+      LLVMRunPasses(wrap(&mod), opt_str, tm, opts);
-+
-+      LLVMDisposeTargetMachine(tm);
-    }
- 
-    std::unique_ptr<Module>
-@@ -500,7 +538,7 @@ clover::llvm::link_program(const std::vector<binary> &binaries,
-    auto c = create_compiler_instance(dev, dev.ir_target(), options, r_log);
-    auto mod = link(*ctx, *c, binaries, r_log);
- 
--   optimize(*mod, c->getCodeGenOpts().OptimizationLevel, !create_library);
-+   optimize(*mod, dev.ir_target(), c->getCodeGenOpts().OptimizationLevel, !create_library);
- 
-    static std::atomic_uint seq(0);
-    const std::string id = "." + mod->getModuleIdentifier() + "-" +
--- 
-2.42.0
-

SOURCES/0001-llvmpipe-only-include-old-Transform-includes-when-ne.patch

@@ -1,41 +0,0 @@
-From 9ba416cdc67073cdda9a73fe9d37304b82bdd526 Mon Sep 17 00:00:00 2001
-From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
-Date: Fri, 12 May 2023 09:58:26 +0200
-Subject: [PATCH] llvmpipe: only include old Transform includes when needed
-
-This fixes building with recent LLVM where these 2 .h files
-were removed.
-
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8671
-Acked-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22980>
----
- src/gallium/auxiliary/gallivm/lp_bld_init.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
-index 24d082398e9..9e0d6a5f643 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
-@@ -42,14 +42,14 @@
- 
- #include <llvm/Config/llvm-config.h>
- #include <llvm-c/Analysis.h>
--#include <llvm-c/Transforms/Scalar.h>
--#if LLVM_VERSION_MAJOR >= 7
--#include <llvm-c/Transforms/Utils.h>
--#endif
- #include <llvm-c/BitWriter.h>
- #if GALLIVM_USE_NEW_PASS == 1
- #include <llvm-c/Transforms/PassBuilder.h>
- #elif GALLIVM_HAVE_CORO == 1
-+#include <llvm-c/Transforms/Scalar.h>
-+#if LLVM_VERSION_MAJOR >= 7
-+#include <llvm-c/Transforms/Utils.h>
-+#endif
- #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64)
- #include <llvm-c/Transforms/IPO.h>
- #endif
--- 
-2.42.0
-

SOURCES/0001-mesa-fix-off-by-one-for-newblock-allocation-in-dlist.patch

@@ -1,28 +0,0 @@
-From 460d2c46a903fed295a1528c8b6273dd6b0e0d19 Mon Sep 17 00:00:00 2001
-From: thfrwn <11335318+rfht@users.noreply.github.com>
-Date: Fri, 9 Feb 2024 17:00:55 -0500
-Subject: [PATCH] mesa: fix off-by-one for newblock allocation in dlist_alloc
-
-Cc: mesa-stable
-Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27556>
----
- src/mesa/main/dlist.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
-index b0184a24e20..9213641699a 100644
---- a/src/mesa/main/dlist.c
-+++ b/src/mesa/main/dlist.c
-@@ -1220,7 +1220,7 @@ dlist_alloc(struct gl_context *ctx, OpCode opcode, GLuint bytes, bool align8)
-       ctx->ListState.CurrentPos++;
-    }
- 
--   if (ctx->ListState.CurrentPos + numNodes + contNodes > BLOCK_SIZE) {
-+   if (ctx->ListState.CurrentPos + numNodes + contNodes >= BLOCK_SIZE) {
-       /* This block is full.  Allocate a new block and chain to it */
-       Node *newblock;
-       Node *n = ctx->ListState.CurrentBlock + ctx->ListState.CurrentPos;
--- 
-2.45.2
-

SOURCES/Makefile

@@ -1,23 +0,0 @@
-VERSION ?= 23.1.4
-SANITIZE ?= 1
-
-DIRNAME = mesa-${VERSION}
-
-all: archive
-
-clean:
-	rm -rf $(DIRNAME)/
-	rm -f mesa-${VERSION}.tar.xz
-
-clone: clean
-	curl -O https://archive.mesa3d.org/mesa-${VERSION}.tar.xz
-	tar xf mesa-${VERSION}.tar.xz
-
-sanitize: clone vl_mpeg12_decoder.c vl_decoder.c
-ifdef SANITIZE
-	cat < vl_mpeg12_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
-	cat < vl_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_decoder.c
-endif
-
-archive: clone sanitize
-	tar caf ${DIRNAME}.tar.xz ${DIRNAME}

SOURCES/fix-py-ver.patch

@@ -1,12 +0,0 @@
-diff -up mesa-23.1.4/meson.build.dma mesa-23.1.4/meson.build
---- mesa-23.1.4/meson.build.dma	2023-07-28 10:15:41.807945483 +1000
-+++ mesa-23.1.4/meson.build	2023-07-28 10:15:46.465030794 +1000
-@@ -835,7 +835,7 @@ if get_option('allow-kcmp') \
-   pre_args += '-DALLOW_KCMP'
- endif
- 
--prog_python = import('python').find_installation('python3')
-+prog_python = import('python').find_installation('python3.6')
- has_mako = run_command(
-   prog_python, '-c',
-   '''

SOURCES/gnome-shell-glthread-disable.patch

@@ -1,11 +0,0 @@
-diff -up mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf.dma mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf
---- mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf.dma	2022-11-25 10:32:32.175879868 +1000
-+++ mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf	2022-11-25 10:32:43.743067470 +1000
-@@ -653,6 +653,7 @@ TODO: document the other workarounds.
-         <application name="gnome-shell" executable="gnome-shell">
-             <option name="adaptive_sync" value="false" />
-             <option name="v3d_nonmsaa_texture_size_limit" value="true" />
-+            <option name="mesa_glthread" value="false"/>
-         </application>
-         <application name="Desktop — Plasma" executable="plasmashell">
-             <option name="adaptive_sync" value="false" />

SOURCES/lavapipe-disable-env-var.patch

@@ -1,13 +0,0 @@
-diff -up mesa-21.3.0/src/gallium/frontends/lavapipe/lvp_device.cdma mesa-21.3.0/src/gallium/frontends/lavapipe/lvp_device.c
---- mesa-21.3.0/src/gallium/frontends/lavapipe/lvp_device.cdma	2021-11-18 06:16:20.000000000 +1000
-+++ mesa-21.3.0/src/gallium/frontends/lavapipe/lvp_device.c	2021-11-18 07:03:17.652283186 +1000
-@@ -213,6 +213,9 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_Creat
-    if (pAllocator == NULL)
-       pAllocator = vk_default_allocator();
- 
-+   if (!getenv("RH_SW_VULKAN"))
-+      return VK_ERROR_INITIALIZATION_FAILED;
-+
-    instance = vk_zalloc(pAllocator, sizeof(*instance), 8,
-                         VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
-    if (!instance)

SOURCES/mesa-vk-wsi-sw-fixes.patch

@@ -0,0 +1,403 @@
+diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c
+index e2a7d337ecf..bc4d87611e0 100644
+--- a/src/vulkan/wsi/wsi_common_wayland.c
++++ b/src/vulkan/wsi/wsi_common_wayland.c
+@@ -31,6 +31,7 @@
+ #include <string.h>
+ #include <pthread.h>
+ #include <poll.h>
++#include <sys/mman.h>
+ 
+ #include "drm-uapi/drm_fourcc.h"
+ 
+@@ -44,9 +45,15 @@
+ #include <util/hash_table.h>
+ #include <util/timespec.h>
+ #include <util/u_vector.h>
++#include <util/anon_file.h>
+ 
+ struct wsi_wayland;
+ 
++struct wsi_wl_display_swrast {
++   struct wl_shm *                              wl_shm;
++   struct u_vector                              formats;
++};
++
+ struct wsi_wl_display_drm {
+    struct wl_drm *                              wl_drm;
+    struct u_vector                              formats;
+@@ -69,6 +76,7 @@ struct wsi_wl_display {
+    struct wl_display *                          wl_display_wrapper;
+    struct wl_event_queue *                      queue;
+ 
++   struct wsi_wl_display_swrast                 swrast;
+    struct wsi_wl_display_drm                    drm;
+    struct wsi_wl_display_dmabuf                 dmabuf;
+ 
+@@ -79,6 +87,8 @@ struct wsi_wl_display {
+ 
+    /* Only used for displays created by wsi_wl_display_create */
+    uint32_t                                     refcount;
++
++   bool sw;
+ };
+ 
+ struct wsi_wayland {
+@@ -183,6 +193,40 @@ wsi_wl_display_add_wl_format(struct wsi_wl_display *display,
+    }
+ }
+ 
++static void
++wsi_wl_display_add_wl_shm_format(struct wsi_wl_display *display,
++                                 struct u_vector *formats,
++                                 uint32_t wl_shm_format)
++{
++   switch (wl_shm_format) {
++   case WL_SHM_FORMAT_XBGR8888:
++      wsi_wl_display_add_vk_format(display, formats,
++                                   VK_FORMAT_R8G8B8_SRGB);
++      wsi_wl_display_add_vk_format(display, formats,
++                                   VK_FORMAT_R8G8B8_UNORM);
++      FALLTHROUGH;
++   case WL_SHM_FORMAT_ABGR8888:
++      wsi_wl_display_add_vk_format(display, formats,
++                                   VK_FORMAT_R8G8B8A8_SRGB);
++      wsi_wl_display_add_vk_format(display, formats,
++                                   VK_FORMAT_R8G8B8A8_UNORM);
++      break;
++   case WL_SHM_FORMAT_XRGB8888:
++      wsi_wl_display_add_vk_format(display, formats,
++                                   VK_FORMAT_B8G8R8_SRGB);
++      wsi_wl_display_add_vk_format(display, formats,
++                                   VK_FORMAT_B8G8R8_UNORM);
++      FALLTHROUGH;
++   case WL_SHM_FORMAT_ARGB8888:
++      wsi_wl_display_add_vk_format(display, formats,
++                                   VK_FORMAT_B8G8R8A8_SRGB);
++      wsi_wl_display_add_vk_format(display, formats,
++                                   VK_FORMAT_B8G8R8A8_UNORM);
++      break;
++   }
++}
++
++
+ static void
+ drm_handle_device(void *data, struct wl_drm *drm, const char *name)
+ {
+@@ -232,6 +276,23 @@ wl_drm_format_for_vk_format(VkFormat vk_format, bool alpha)
+    }
+ }
+ 
++static uint32_t
++wl_shm_format_for_vk_format(VkFormat vk_format, bool alpha)
++{
++   switch (vk_format) {
++   case VK_FORMAT_R8G8B8A8_UNORM:
++   case VK_FORMAT_R8G8B8A8_SRGB:
++      return alpha ? WL_SHM_FORMAT_ABGR8888 : WL_SHM_FORMAT_XBGR8888;
++   case VK_FORMAT_B8G8R8A8_UNORM:
++   case VK_FORMAT_B8G8R8A8_SRGB:
++      return alpha ? WL_SHM_FORMAT_ARGB8888 : WL_SHM_FORMAT_XRGB8888;
++
++   default:
++      assert(!"Unsupported Vulkan format");
++      return 0;
++   }
++}
++
+ static void
+ drm_handle_format(void *data, struct wl_drm *drm, uint32_t wl_format)
+ {
+@@ -311,12 +372,34 @@ static const struct zwp_linux_dmabuf_v1_listener dmabuf_listener = {
+    dmabuf_handle_modifier,
+ };
+ 
++static void
++shm_handle_format(void *data, struct wl_shm *shm, uint32_t format)
++{
++   struct wsi_wl_display *display = data;
++   if (display->swrast.formats.element_size == 0)
++      return;
++
++   wsi_wl_display_add_wl_shm_format(display, &display->swrast.formats, format);
++}
++
++static const struct wl_shm_listener shm_listener = {
++   .format = shm_handle_format
++};
++
+ static void
+ registry_handle_global(void *data, struct wl_registry *registry,
+                        uint32_t name, const char *interface, uint32_t version)
+ {
+    struct wsi_wl_display *display = data;
+ 
++   if (display->sw) {
++      if (strcmp(interface, "wl_shm") == 0) {
++         display->swrast.wl_shm = wl_registry_bind(registry, name, &wl_shm_interface, 1);
++         wl_shm_add_listener(display->swrast.wl_shm, &shm_listener, display);
++      }
++      return;
++   }
++
+    if (strcmp(interface, "wl_drm") == 0) {
+       assert(display->drm.wl_drm == NULL);
+ 
+@@ -348,10 +431,13 @@ wsi_wl_display_finish(struct wsi_wl_display *display)
+ {
+    assert(display->refcount == 0);
+ 
++   u_vector_finish(&display->swrast.formats);
+    u_vector_finish(&display->drm.formats);
+    u_vector_finish(&display->dmabuf.formats);
+    u_vector_finish(&display->dmabuf.modifiers.argb8888);
+    u_vector_finish(&display->dmabuf.modifiers.xrgb8888);
++   if (display->swrast.wl_shm)
++      wl_shm_destroy(display->swrast.wl_shm);
+    if (display->drm.wl_drm)
+       wl_drm_destroy(display->drm.wl_drm);
+    if (display->dmabuf.wl_dmabuf)
+@@ -366,16 +452,18 @@ static VkResult
+ wsi_wl_display_init(struct wsi_wayland *wsi_wl,
+                     struct wsi_wl_display *display,
+                     struct wl_display *wl_display,
+-                    bool get_format_list)
++                    bool get_format_list, bool sw)
+ {
+    VkResult result = VK_SUCCESS;
+    memset(display, 0, sizeof(*display));
+ 
+    display->wsi_wl = wsi_wl;
+    display->wl_display = wl_display;
++   display->sw = sw;
+ 
+    if (get_format_list) {
+-      if (!u_vector_init(&display->drm.formats, sizeof(VkFormat), 8) ||
++      if (!u_vector_init(&display->swrast.formats, sizeof(VkFormat), 8) ||
++          !u_vector_init(&display->drm.formats, sizeof(VkFormat), 8) ||
+           !u_vector_init(&display->dmabuf.formats, sizeof(VkFormat), 8) ||
+           !u_vector_init(&display->dmabuf.modifiers.argb8888,
+                          sizeof(uint64_t), 32) ||
+@@ -414,7 +502,7 @@ wsi_wl_display_init(struct wsi_wayland *wsi_wl,
+    wl_display_roundtrip_queue(display->wl_display, display->queue);
+ 
+    /* Round-trip again to get formats, modifiers and capabilities */
+-   if (display->drm.wl_drm || display->dmabuf.wl_dmabuf)
++   if (display->drm.wl_drm || display->dmabuf.wl_dmabuf || display->swrast.wl_shm)
+       wl_display_roundtrip_queue(display->wl_display, display->queue);
+ 
+    if (wsi_wl->wsi->force_bgra8_unorm_first) {
+@@ -432,8 +520,10 @@ wsi_wl_display_init(struct wsi_wayland *wsi_wl,
+       }
+    }
+ 
++   if (display->sw)
++      display->formats = &display->swrast.formats;
+    /* We need prime support for wl_drm */
+-   if (display->drm.wl_drm &&
++   else if (display->drm.wl_drm &&
+        (display->drm.capabilities & WL_DRM_CAPABILITY_PRIME)) {
+       display->formats = &display->drm.formats;
+    } else if (display->dmabuf.wl_dmabuf) {
+@@ -463,6 +553,7 @@ fail:
+ 
+ static VkResult
+ wsi_wl_display_create(struct wsi_wayland *wsi, struct wl_display *wl_display,
++                      bool sw,
+                       struct wsi_wl_display **display_out)
+ {
+    struct wsi_wl_display *display =
+@@ -471,7 +562,8 @@ wsi_wl_display_create(struct wsi_wayland *wsi, struct wl_display *wl_display,
+    if (!display)
+       return VK_ERROR_OUT_OF_HOST_MEMORY;
+ 
+-   VkResult result = wsi_wl_display_init(wsi, display, wl_display, true);
++   VkResult result = wsi_wl_display_init(wsi, display, wl_display, true,
++                                         sw);
+    if (result != VK_SUCCESS) {
+       vk_free(wsi->alloc, display);
+       return result;
+@@ -509,7 +601,8 @@ wsi_wl_get_presentation_support(struct wsi_device *wsi_device,
+       (struct wsi_wayland *)wsi_device->wsi[VK_ICD_WSI_PLATFORM_WAYLAND];
+ 
+    struct wsi_wl_display display;
+-   VkResult ret = wsi_wl_display_init(wsi, &display, wl_display, false);
++   VkResult ret = wsi_wl_display_init(wsi, &display, wl_display, false,
++                                      wsi_device->sw);
+    if (ret == VK_SUCCESS)
+       wsi_wl_display_finish(&display);
+ 
+@@ -612,7 +705,8 @@ wsi_wl_surface_get_formats(VkIcdSurfaceBase *icd_surface,
+       (struct wsi_wayland *)wsi_device->wsi[VK_ICD_WSI_PLATFORM_WAYLAND];
+ 
+    struct wsi_wl_display display;
+-   if (wsi_wl_display_init(wsi, &display, surface->display, true))
++   if (wsi_wl_display_init(wsi, &display, surface->display, true,
++                           wsi_device->sw))
+       return VK_ERROR_SURFACE_LOST_KHR;
+ 
+    VK_OUTARRAY_MAKE(out, pSurfaceFormats, pSurfaceFormatCount);
+@@ -642,7 +736,8 @@ wsi_wl_surface_get_formats2(VkIcdSurfaceBase *icd_surface,
+       (struct wsi_wayland *)wsi_device->wsi[VK_ICD_WSI_PLATFORM_WAYLAND];
+ 
+    struct wsi_wl_display display;
+-   if (wsi_wl_display_init(wsi, &display, surface->display, true))
++   if (wsi_wl_display_init(wsi, &display, surface->display, true,
++                           wsi_device->sw))
+       return VK_ERROR_SURFACE_LOST_KHR;
+ 
+    VK_OUTARRAY_MAKE(out, pSurfaceFormats, pSurfaceFormatCount);
+@@ -722,10 +817,12 @@ struct wsi_wl_image {
+    struct wsi_image                             base;
+    struct wl_buffer *                           buffer;
+    bool                                         busy;
++   void *                                       data_ptr;
++   uint32_t                                     data_size;
+ };
+ 
+ struct wsi_wl_swapchain {
+-   struct wsi_swapchain                        base;
++   struct wsi_swapchain                         base;
+ 
+    struct wsi_wl_display                        *display;
+ 
+@@ -742,6 +839,7 @@ struct wsi_wl_swapchain {
+    VkExtent2D                                   extent;
+    VkFormat                                     vk_format;
+    uint32_t                                     drm_format;
++   uint32_t                                     shm_format;
+ 
+    uint32_t                                     num_drm_modifiers;
+    const uint64_t *                             drm_modifiers;
+@@ -859,6 +957,23 @@ wsi_wl_swapchain_queue_present(struct wsi_swapchain *wsi_chain,
+ {
+    struct wsi_wl_swapchain *chain = (struct wsi_wl_swapchain *)wsi_chain;
+ 
++   if (chain->display->sw) {
++      struct wsi_wl_image *image = &chain->images[image_index];
++      void *dptr = image->data_ptr;
++      void *sptr;
++      chain->base.wsi->MapMemory(chain->base.device,
++                                 image->base.memory,
++                                 0, 0, 0, &sptr);
++
++      for (unsigned r = 0; r < chain->extent.height; r++) {
++         memcpy(dptr, sptr, image->base.row_pitches[0]);
++         dptr += image->base.row_pitches[0];
++         sptr += image->base.row_pitches[0];
++      }
++      chain->base.wsi->UnmapMemory(chain->base.device,
++                                   image->base.memory);
++
++   }
+    if (chain->base.present_mode == VK_PRESENT_MODE_FIFO_KHR) {
+       while (!chain->fifo_ready) {
+          int ret = wl_display_dispatch_queue(chain->display->wl_display,
+@@ -928,7 +1043,31 @@ wsi_wl_image_init(struct wsi_wl_swapchain *chain,
+    if (result != VK_SUCCESS)
+       return result;
+ 
+-   if (!chain->drm_wrapper) {
++   if (display->sw) {
++      int fd, stride;
++
++      stride = image->base.row_pitches[0];
++      image->data_size = stride * chain->extent.height;
++
++      /* Create a shareable buffer */
++      fd = os_create_anonymous_file(image->data_size, NULL);
++      if (fd < 0)
++         goto fail_image;
++
++      image->data_ptr = mmap(NULL, image->data_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
++      if (image->data_ptr == MAP_FAILED) {
++         close(fd);
++         goto fail_image;
++      }
++      /* Share it in a wl_buffer */
++      struct wl_shm_pool *pool = wl_shm_create_pool(display->swrast.wl_shm, fd, image->data_size);
++      wl_proxy_set_queue((struct wl_proxy *)pool, display->queue);
++      image->buffer = wl_shm_pool_create_buffer(pool, 0, chain->extent.width,
++                                                chain->extent.height, stride,
++                                                chain->shm_format);
++      wl_shm_pool_destroy(pool);
++      close(fd);
++   } else if (!chain->drm_wrapper) {
+       /* Only request modifiers if we have dmabuf, else it must be implicit. */
+       assert(display->dmabuf.wl_dmabuf);
+       assert(image->base.drm_modifier != DRM_FORMAT_MOD_INVALID);
+@@ -995,6 +1134,8 @@ wsi_wl_swapchain_destroy(struct wsi_swapchain *wsi_chain,
+       if (chain->images[i].buffer) {
+          wl_buffer_destroy(chain->images[i].buffer);
+          wsi_destroy_image(&chain->base, &chain->images[i].base);
++         if (chain->images[i].data_ptr)
++            munmap(chain->images[i].data_ptr, chain->images[i].data_size);
+       }
+    }
+ 
+@@ -1049,8 +1190,10 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
+    /* Mark a bunch of stuff as NULL.  This way we can just call
+     * destroy_swapchain for cleanup.
+     */
+-   for (uint32_t i = 0; i < num_images; i++)
++   for (uint32_t i = 0; i < num_images; i++) {
+       chain->images[i].buffer = NULL;
++      chain->images[i].data_ptr = NULL;
++   }
+    chain->surface = NULL;
+    chain->drm_wrapper = NULL;
+    chain->frame = NULL;
+@@ -1066,7 +1209,10 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
+    chain->base.image_count = num_images;
+    chain->extent = pCreateInfo->imageExtent;
+    chain->vk_format = pCreateInfo->imageFormat;
+-   chain->drm_format = wl_drm_format_for_vk_format(chain->vk_format, alpha);
++   if (wsi_device->sw)
++      chain->shm_format = wl_shm_format_for_vk_format(chain->vk_format, alpha);
++   else
++      chain->drm_format = wl_drm_format_for_vk_format(chain->vk_format, alpha);
+ 
+    if (pCreateInfo->oldSwapchain) {
+       /* If we have an oldSwapchain parameter, copy the display struct over
+@@ -1076,7 +1222,8 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
+       chain->display = wsi_wl_display_ref(old_chain->display);
+    } else {
+       chain->display = NULL;
+-      result = wsi_wl_display_create(wsi, surface->display, &chain->display);
++      result = wsi_wl_display_create(wsi, surface->display,
++                                     wsi_device->sw, &chain->display);
+       if (result != VK_SUCCESS)
+          goto fail;
+    }
+diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c
+index 54769b81ccc..fa0c3d997dc 100644
+--- a/src/vulkan/wsi/wsi_common_x11.c
++++ b/src/vulkan/wsi/wsi_common_x11.c
+@@ -439,8 +439,10 @@ VkBool32 wsi_get_physical_device_xcb_presentation_support(
+    if (!wsi_conn)
+       return false;
+ 
+-   if (!wsi_x11_check_for_dri3(wsi_conn))
+-      return false;
++   if (!wsi_device->sw) {
++      if (!wsi_x11_check_for_dri3(wsi_conn))
++         return false;
++   }
+ 
+    unsigned visual_depth;
+    if (!connection_get_visualtype(connection, visual_id, &visual_depth))
+@@ -484,9 +486,11 @@ x11_surface_get_support(VkIcdSurfaceBase *icd_surface,
+    if (!wsi_conn)
+       return VK_ERROR_OUT_OF_HOST_MEMORY;
+ 
+-   if (!wsi_x11_check_for_dri3(wsi_conn)) {
+-      *pSupported = false;
+-      return VK_SUCCESS;
++   if (!wsi_device->sw) {
++      if (!wsi_x11_check_for_dri3(wsi_conn)) {
++         *pSupported = false;
++         return VK_SUCCESS;
++      }
+    }
+ 
+    unsigned visual_depth;

SOURCES/radeonsi-turn-off-glthread.patch

@@ -1,11 +0,0 @@
-diff -up mesa-22.3.3/src/gallium/drivers/radeonsi/driinfo_radeonsi.h.dma mesa-22.3.3/src/gallium/drivers/radeonsi/driinfo_radeonsi.h
---- mesa-22.3.3/src/gallium/drivers/radeonsi/driinfo_radeonsi.h.dma	2023-01-25 06:17:54.993167334 +1000
-+++ mesa-22.3.3/src/gallium/drivers/radeonsi/driinfo_radeonsi.h	2023-01-25 06:17:57.363203425 +1000
-@@ -1,7 +1,6 @@
- // DriConf options specific to radeonsi
- DRI_CONF_SECTION_PERFORMANCE
- DRI_CONF_ADAPTIVE_SYNC(true)
--DRI_CONF_MESA_GLTHREAD(true)
- DRI_CONF_SECTION_END
- 
- DRI_CONF_SECTION_DEBUG

SOURCES/vl_decoder.c

@@ -1,20 +0,0 @@
-#include "vl_decoder.h"
-bool
-vl_profile_supported(struct pipe_screen *screen, enum pipe_video_profile profile,
-                     enum pipe_video_entrypoint entrypoint)
-{
-   return false;
-}
-
-int
-vl_level_supported(struct pipe_screen *screen, enum pipe_video_profile profile)
-{
-   return 0;
-}
-
-struct pipe_video_codec *
-vl_create_decoder(struct pipe_context *pipe,
-                  const struct pipe_video_codec *templat)
-{
-   return NULL;
-}

SOURCES/vl_mpeg12_decoder.c

@@ -1,7 +0,0 @@
-#include "vl_mpeg12_decoder.h"
-struct pipe_video_codec *
-vl_create_mpeg12_decoder(struct pipe_context *context,
-                         const struct pipe_video_codec *templat)
-{
-    return NULL;
-}