]>
Commit | Line | Data |
---|---|---|
1 | --- mesa-mesa-21.3.0/src/gallium/drivers/zink/zink_framebuffer.c.orig 2021-11-17 21:16:20.000000000 +0100 | |
2 | +++ mesa-mesa-21.3.0/src/gallium/drivers/zink/zink_framebuffer.c 2021-11-17 22:27:05.031355842 +0100 | |
3 | @@ -37,7 +37,7 @@ | |
4 | struct zink_framebuffer *fb) | |
5 | { | |
6 | hash_table_foreach(&fb->objects, he) { | |
7 | -#if defined(_WIN64) || defined(__x86_64__) | |
8 | +#if defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) | |
9 | VKSCR(DestroyFramebuffer)(screen->dev, he->data, NULL); | |
10 | #else | |
11 | VkFramebuffer *ptr = he->data; | |
12 | @@ -60,7 +60,7 @@ | |
13 | ||
14 | struct hash_entry *he = _mesa_hash_table_search_pre_hashed(&fb->objects, hash, rp); | |
15 | if (he) { | |
16 | -#if defined(_WIN64) || defined(__x86_64__) | |
17 | +#if defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) | |
18 | ret = (VkFramebuffer)he->data; | |
19 | #else | |
20 | VkFramebuffer *ptr = he->data; | |
21 | @@ -90,7 +90,7 @@ | |
22 | ||
23 | if (VKSCR(CreateFramebuffer)(screen->dev, &fci, NULL, &ret) != VK_SUCCESS) | |
24 | return; | |
25 | -#if defined(_WIN64) || defined(__x86_64__) | |
26 | +#if defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) | |
27 | _mesa_hash_table_insert_pre_hashed(&fb->objects, hash, rp, ret); | |
28 | #else | |
29 | VkFramebuffer *ptr = ralloc(fb, VkFramebuffer); | |
30 | @@ -207,7 +207,7 @@ | |
31 | ||
32 | struct hash_entry *he = _mesa_hash_table_search_pre_hashed(&fb->objects, hash, rp); | |
33 | if (he) { | |
34 | -#if defined(_WIN64) || defined(__x86_64__) | |
35 | +#if defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) | |
36 | ret = (VkFramebuffer)he->data; | |
37 | #else | |
38 | VkFramebuffer *ptr = he->data; | |
39 | @@ -229,7 +229,7 @@ | |
40 | ||
41 | if (VKSCR(CreateFramebuffer)(screen->dev, &fci, NULL, &ret) != VK_SUCCESS) | |
42 | return; | |
43 | -#if defined(_WIN64) || defined(__x86_64__) | |
44 | +#if defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) | |
45 | _mesa_hash_table_insert_pre_hashed(&fb->objects, hash, rp, ret); | |
46 | #else | |
47 | VkFramebuffer *ptr = ralloc(fb, VkFramebuffer); |