From 88a4e5a282750dc7be7351485be170d9e4ea15a2 Mon Sep 17 00:00:00 2001
From: Pete Walter <pwalter@fedoraproject.org>
Date: Wed, 19 Oct 2022 18:52:26 +0100
Subject: [PATCH] Update to 22.2.2

---
 ...ouveau-Use-format-modifiers-in-buffer-alloca.patch | 11 +++++++----
 mesa.spec                                             |  2 +-
 sources                                               |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/0003-Revert-nouveau-Use-format-modifiers-in-buffer-alloca.patch b/0003-Revert-nouveau-Use-format-modifiers-in-buffer-alloca.patch
index 22a7ec6..7ba474d 100644
--- a/0003-Revert-nouveau-Use-format-modifiers-in-buffer-alloca.patch
+++ b/0003-Revert-nouveau-Use-format-modifiers-in-buffer-alloca.patch
@@ -59,7 +59,7 @@ index e0a9d48249f..8260a90f0d6 100644
  
        tsx = NVC0_TILE_SIZE_X(lvl->tile_mode); /* x is tile row pitch in bytes */
        tsy = NVC0_TILE_SIZE_Y(lvl->tile_mode);
-@@ -358,84 +346,6 @@ nvc0_miptree_get_handle(struct pipe_screen *pscreen,
+@@ -358,87 +346,6 @@ nvc0_miptree_get_handle(struct pipe_screen *pscreen,
     return true;
  }
  
@@ -128,9 +128,12 @@ index e0a9d48249f..8260a90f0d6 100644
 -
 -   for (i = 0u; i < count; i++) {
 -      for (p = 0; p < ARRAY_SIZE(prio_supported_mods); p++) {
--         if (prio_supported_mods[p] == modifiers[i]) {
--            if (top_mod_slot > p) top_mod_slot = p;
--            break;
+-         if (prio_supported_mods[p] != DRM_FORMAT_MOD_INVALID) {
+-            if (modifiers[i] == DRM_FORMAT_MOD_INVALID ||
+-                prio_supported_mods[p] == modifiers[i]) {
+-               if (top_mod_slot > p) top_mod_slot = p;
+-               break;
+-            }
 -         }
 -      }
 -   }
diff --git a/mesa.spec b/mesa.spec
index c759023..a876975 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -53,7 +53,7 @@
 
 Name:           mesa
 Summary:        Mesa graphics libraries
-%global ver 22.2.1
+%global ver 22.2.2
 Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
 Release:        %autorelease
 License:        MIT
diff --git a/sources b/sources
index 91c0ebb..73f68b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mesa-22.2.1.tar.xz) = cb69c808453474f77aad68afae7cdb427e6720e1d2259f7b911a5476a03144bbe8adfbe040f9bed3954d92805eea302757b76fd29f03f692f725c0fd2295df7e
+SHA512 (mesa-22.2.2.tar.xz) = a1eb67e1ae4880c79b1fdc570f4389baba0b8ba796da7e695c9af19a7d92b6c06b95570e6c796548b61355989025fb7efbf9acac74cbd695f7e297dc913b933c