From a08b9c1ebf117348db655cc4a0997afd01766bde Mon Sep 17 00:00:00 2001
From: Jan Palus <atler@pld-linux.org>
Date: Fri, 17 Jun 2022 18:17:08 +0200
Subject: [PATCH] up to 22.1.2

---
 Mesa.spec      |  4 ++--
 zink_x32.patch | 27 ---------------------------
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/Mesa.spec b/Mesa.spec
index 0013978..a9330ee 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -71,14 +71,14 @@
 Summary:	Free OpenGL implementation
 Summary(pl.UTF-8):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
-Version:	22.1.1
+Version:	22.1.2
 Release:	1
 License:	MIT (core) and others - see license.html file
 Group:		X11/Libraries
 #Source0:	ftp://ftp.freedesktop.org/pub/mesa/mesa-%{version}.tar.xz
 ## Source0-md5:	7c61a801311fb8d2f7b3cceb7b5cf308
 Source0:	https://gitlab.freedesktop.org/mesa/mesa/-/archive/mesa-%{version}/mesa-mesa-%{version}.tar.bz2
-# Source0-md5:	f58085cc7a23f1c2620bf313031e2ae4
+# Source0-md5:	46b448a90a3ea1009e12ff75b41d01d6
 Patch0:		zink_x32.patch
 Patch1:		powervr_uint64.patch
 URL:		https://www.mesa3d.org/
diff --git a/zink_x32.patch b/zink_x32.patch
index b9c38c5..449e4dd 100644
--- a/zink_x32.patch
+++ b/zink_x32.patch
@@ -1,32 +1,5 @@
 --- mesa-mesa-21.3.0/src/gallium/drivers/zink/zink_framebuffer.c.orig	2021-11-17 21:16:20.000000000 +0100
 +++ mesa-mesa-21.3.0/src/gallium/drivers/zink/zink_framebuffer.c	2021-11-17 22:27:05.031355842 +0100
-@@ -37,7 +37,7 @@
-                          struct zink_framebuffer *fb)
- {
-    hash_table_foreach(&fb->objects, he) {
--#if defined(_WIN64) || defined(__x86_64__)
-+#if defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__))
-       VKSCR(DestroyFramebuffer)(screen->dev, he->data, NULL);
- #else
-       VkFramebuffer *ptr = he->data;
-@@ -60,7 +60,7 @@
- 
-    struct hash_entry *he = _mesa_hash_table_search_pre_hashed(&fb->objects, hash, rp);
-    if (he) {
--#if defined(_WIN64) || defined(__x86_64__)
-+#if defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__))
-       ret = (VkFramebuffer)he->data;
- #else
-       VkFramebuffer *ptr = he->data;
-@@ -90,7 +90,7 @@
- 
-    if (VKSCR(CreateFramebuffer)(screen->dev, &fci, NULL, &ret) != VK_SUCCESS)
-       return;
--#if defined(_WIN64) || defined(__x86_64__)
-+#if defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__))
-    _mesa_hash_table_insert_pre_hashed(&fb->objects, hash, rp, ret);
- #else
-    VkFramebuffer *ptr = ralloc(fb, VkFramebuffer);
 @@ -207,7 +207,7 @@
  
     struct hash_entry *he = _mesa_hash_table_search_pre_hashed(&fb->objects, hash, rp);
-- 
2.44.0