diff options
Diffstat (limited to 'recipes-core/libxcam/libxcam/0002-fix-build-with-vulkan-1.2.140.patch')
-rw-r--r-- | recipes-core/libxcam/libxcam/0002-fix-build-with-vulkan-1.2.140.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/recipes-core/libxcam/libxcam/0002-fix-build-with-vulkan-1.2.140.patch b/recipes-core/libxcam/libxcam/0002-fix-build-with-vulkan-1.2.140.patch deleted file mode 100644 index 05c391ab..00000000 --- a/recipes-core/libxcam/libxcam/0002-fix-build-with-vulkan-1.2.140.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | [https://github.com/intel/libxcam/commit/ebd4d0e034c6536b8a365f5a079749041ab6a7b7] | ||
3 | |||
4 | From ebd4d0e034c6536b8a365f5a079749041ab6a7b7 Mon Sep 17 00:00:00 2001 | ||
5 | From: StefanBruens <stefan.bruens@rwth-aachen.de> | ||
6 | Date: Thu, 23 Jul 2020 22:03:06 +0200 | ||
7 | Subject: [PATCH] Fix build with Vulkan 1.2.140 and later | ||
8 | |||
9 | 1.2.140 removed the various _BEGIN_RANGE, _END_RANGE | ||
10 | and _RANGE_SIZE macros, see e.g. | ||
11 | https://gitlab.freedesktop.org/mesa/mesa/-/commit/b0cb38f36085ccee6e71b6e50cb4f094d7f03c58#b04a2be508b96c4286a9f20523ba531cd4f7176a_1050_1032 | ||
12 | --- | ||
13 | modules/vulkan/vk_instance.cpp | 6 +++--- | ||
14 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/modules/vulkan/vk_instance.cpp b/modules/vulkan/vk_instance.cpp | ||
17 | index e856be64..6bc2c38c 100644 | ||
18 | --- a/modules/vulkan/vk_instance.cpp | ||
19 | +++ b/modules/vulkan/vk_instance.cpp | ||
20 | @@ -131,14 +131,14 @@ VKInstance::query_physical_info () | ||
21 | dev_num = XCAM_MIN (dev_num, MAX_DEV_NUM); | ||
22 | vkEnumeratePhysicalDevices (_instance_id, &dev_num, devs); | ||
23 | |||
24 | - VkPhysicalDevice gpu_dev[VK_PHYSICAL_DEVICE_TYPE_RANGE_SIZE] = {}; | ||
25 | + VkPhysicalDevice gpu_dev[VK_PHYSICAL_DEVICE_TYPE_CPU + 1] = {}; | ||
26 | |||
27 | VkPhysicalDeviceProperties dev_prop; | ||
28 | for (uint32_t i = 0; i < dev_num; ++i) { | ||
29 | vkGetPhysicalDeviceProperties (devs[i], &dev_prop); | ||
30 | |||
31 | - if (dev_prop.deviceType < VK_PHYSICAL_DEVICE_TYPE_BEGIN_RANGE || | ||
32 | - dev_prop.deviceType > VK_PHYSICAL_DEVICE_TYPE_END_RANGE) { | ||
33 | + if (dev_prop.deviceType < VK_PHYSICAL_DEVICE_TYPE_OTHER || | ||
34 | + dev_prop.deviceType > VK_PHYSICAL_DEVICE_TYPE_CPU) { | ||
35 | continue; | ||
36 | } | ||
37 | if (gpu_dev[dev_prop.deviceType]) { | ||