fix typo in C: version; rel 3

[packages/Mesa.git] / zink_x32.patch

diff --git a/zink_x32.patch b/zink_x32.patch
index 1de334dfa4205f26869d279bc5a7a9a6c54e4619..b9c38c5286be590ba4dd4cc17c0ccef2a6abe453 100644 (file)
--- a/zink_x32.patch
+++ b/zink_x32.patch
@@ -1,15 +1,15 @@
---- mesa-mesa-21.1.0/src/gallium/drivers/zink/zink_framebuffer.c.orig  2021-05-05 19:05:43.000000000 +0200
-+++ mesa-mesa-21.1.0/src/gallium/drivers/zink/zink_framebuffer.c       2021-05-08 11:40:04.291968475 +0200
-@@ -64,7 +64,7 @@
+--- 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__))
-       vkDestroyFramebuffer(screen->dev, he->data, NULL);
+       VKSCR(DestroyFramebuffer)(screen->dev, he->data, NULL);
  #else
        VkFramebuffer *ptr = he->data;
-@@ -89,7 +89,7 @@
+@@ -60,7 +60,7 @@
  
     struct hash_entry *he = _mesa_hash_table_search_pre_hashed(&fb->objects, hash, rp);
     if (he) {
@@ -18,9 +18,27 @@
        ret = (VkFramebuffer)he->data;
  #else
        VkFramebuffer *ptr = he->data;
-@@ -109,7 +109,7 @@
+@@ -90,7 +90,7 @@
  
-    if (vkCreateFramebuffer(screen->dev, &fci, NULL, &ret) != VK_SUCCESS)
+    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);
+    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;
+@@ -229,7 +229,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__))