vulkan: Fixes to the SDK-0.9->0.10 patch stack
Change-Id: I08374f21103f807722615313f0250afd7b842949
(cherry picked from commit c0f080e191bdf34ac6455d132724b47892c630f6)
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0001-vulkan-Update-from-version-0.172.2-to-0.174.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0001-vulkan-Update-from-version-0.172.2-to-0.174.0.patch
index b4845c3..05b7021 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0001-vulkan-Update-from-version-0.172.2-to-0.174.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0001-vulkan-Update-from-version-0.172.2-to-0.174.0.patch
@@ -1,4 +1,4 @@
-From 72fe8189a53dfd3a54dc22d33b3ffe67bab93090 Mon Sep 17 00:00:00 2001
+From 18896311f868ab1b2b8a9a6ca34de4c0de6cf0d7 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Thu, 19 Nov 2015 21:32:50 -0800
Subject: [PATCH 01/30] vulkan: Update from version 0.172.2 to 0.174.0
@@ -501,5 +501,5 @@
{"vkCmdCopyBuffer", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkCmdCopyBuffer>(CmdCopyBuffer))},
{"vkCmdCopyBufferToImage", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkCmdCopyBufferToImage>(CmdCopyBufferToImage))},
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0002-vulkan-Update-from-version-0.174.0-to-0.177.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0002-vulkan-Update-from-version-0.174.0-to-0.177.0.patch
index 1dba313..66b2a55 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0002-vulkan-Update-from-version-0.174.0-to-0.177.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0002-vulkan-Update-from-version-0.174.0-to-0.177.0.patch
@@ -1,4 +1,4 @@
-From 8ce9e519e5af3e2310765825115ffc3a65af818c Mon Sep 17 00:00:00 2001
+From 5804cbcdb3c6444c7bb6904578ed339d9339de83 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Thu, 19 Nov 2015 21:51:33 -0800
Subject: [PATCH 02/30] vulkan: Update from version 0.174.0 to 0.177.0
@@ -202,5 +202,5 @@
}
}
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0003-vulkan-Update-from-version-0.177.0-to-0.179.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0003-vulkan-Update-from-version-0.177.0-to-0.179.0.patch
index b447e96..1b85722 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0003-vulkan-Update-from-version-0.177.0-to-0.179.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0003-vulkan-Update-from-version-0.177.0-to-0.179.0.patch
@@ -1,4 +1,4 @@
-From 88b01c7acbc82f42d074c4484954388167f03add Mon Sep 17 00:00:00 2001
+From daf915168b0aea3a47401a838448d737e955c154 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Thu, 19 Nov 2015 22:17:28 -0800
Subject: [PATCH 03/30] vulkan: Update from version 0.177.0 to 0.179.0
@@ -1088,5 +1088,5 @@
const VkQueueFamilyProperties& qprops = queue_family_properties[family];
const char* sep = "";
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0004-vulkan-Update-from-version-0.179.0-to-0.180.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0004-vulkan-Update-from-version-0.179.0-to-0.180.0.patch
index f1bb009..e49eca6 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0004-vulkan-Update-from-version-0.179.0-to-0.180.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0004-vulkan-Update-from-version-0.179.0-to-0.180.0.patch
@@ -1,4 +1,4 @@
-From 167ad20ec48e513fc70447a517d807f082bce6eb Mon Sep 17 00:00:00 2001
+From 2b2221bd4c5cbc2580bf7b4e487bffe36fd25c4a Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Thu, 19 Nov 2015 22:30:07 -0800
Subject: [PATCH 04/30] vulkan: Update from version 0.179.0 to 0.180.0
@@ -182,5 +182,5 @@
VkResult DeviceWaitIdle(VkDevice device);
VkResult AllocMemory(VkDevice device, const VkMemoryAllocInfo* pAllocInfo, VkDeviceMemory* pMem);
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0005-vulkan-Update-from-version-0.180.0-to-0.181.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0005-vulkan-Update-from-version-0.180.0-to-0.181.0.patch
index b2c5693..a3eddf0 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0005-vulkan-Update-from-version-0.180.0-to-0.181.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0005-vulkan-Update-from-version-0.180.0-to-0.181.0.patch
@@ -1,4 +1,4 @@
-From 5a0357fbe23928c47bb3e817bd3bb6635f2f1f08 Mon Sep 17 00:00:00 2001
+From 2c3539bab4b81b6e55d690c5e113d3421cc15021 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Thu, 19 Nov 2015 22:48:02 -0800
Subject: [PATCH 05/30] vulkan: Update from version 0.180.0 to 0.181.0
@@ -610,5 +610,5 @@
case VK_TIMEOUT: result_str = "VK_TIMEOUT"; break;
case VK_EVENT_SET: result_str = "VK_EVENT_SET"; break;
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0006-vulkan-Update-from-version-0.181.0-to-0.183.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0006-vulkan-Update-from-version-0.181.0-to-0.183.0.patch
index 7d7da37..b3ac293 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0006-vulkan-Update-from-version-0.181.0-to-0.183.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0006-vulkan-Update-from-version-0.181.0-to-0.183.0.patch
@@ -1,4 +1,4 @@
-From 727d614d172fd03c033739b9a76873f9d46f8f5e Mon Sep 17 00:00:00 2001
+From 85009ebe92a71d3c707efad6387118b186cca0c9 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Fri, 20 Nov 2015 14:17:03 -0800
Subject: [PATCH 06/30] vulkan: Update from version 0.181.0 to 0.183.0
@@ -956,5 +956,5 @@
{"vkFreeMemory", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkFreeMemory>(FreeMemory))},
{"vkGetBufferMemoryRequirements", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkGetBufferMemoryRequirements>(GetBufferMemoryRequirements))},
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0007-vulkan-Implement-VkSurfaceKHR-and-use-vulkanext.h.patch b/vulkan/patches/frameworks_native-sdk_0.10/0007-vulkan-Implement-VkSurfaceKHR-and-use-vulkanext.h.patch
index b6bc011..0cf393c 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0007-vulkan-Implement-VkSurfaceKHR-and-use-vulkanext.h.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0007-vulkan-Implement-VkSurfaceKHR-and-use-vulkanext.h.patch
@@ -1,4 +1,4 @@
-From 8e7c3261d591b7df086683fb7877e188aee7c1f8 Mon Sep 17 00:00:00 2001
+From 957a59a48a8d2e81ca3bb52aacd8d08b1b43dc74 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Mon, 23 Nov 2015 17:24:58 -0800
Subject: [PATCH 07/30] vulkan: Implement VkSurfaceKHR and use vulkanext.h
@@ -2414,5 +2414,5 @@
// TODO(jessehall): What now? We should probably cancel the buffer,
// I guess?
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0008-vulkan-Update-from-version-0.183.0-to-0.184.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0008-vulkan-Update-from-version-0.183.0-to-0.184.0.patch
index dc01c44..1ca53c2 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0008-vulkan-Update-from-version-0.183.0-to-0.184.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0008-vulkan-Update-from-version-0.183.0-to-0.184.0.patch
@@ -1,4 +1,4 @@
-From 7b91a4939779638ae33ce117e52fc58f911644d2 Mon Sep 17 00:00:00 2001
+From 821c3aebdbac594a9b977e8183a863bed7419132 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Sat, 21 Nov 2015 19:31:56 -0800
Subject: [PATCH 08/30] vulkan: Update from version 0.183.0 to 0.184.0
@@ -529,5 +529,5 @@
{"vkGetRenderAreaGranularity", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkGetRenderAreaGranularity>(GetRenderAreaGranularity))},
{"vkInvalidateMappedMemoryRanges", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkInvalidateMappedMemoryRanges>(InvalidateMappedMemoryRanges))},
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0009-vulkan.api-Distinguish-Vk-Flags-from-Vk-FlagBits.patch b/vulkan/patches/frameworks_native-sdk_0.10/0009-vulkan.api-Distinguish-Vk-Flags-from-Vk-FlagBits.patch
index 6a8b56a..84cc9f2 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0009-vulkan.api-Distinguish-Vk-Flags-from-Vk-FlagBits.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0009-vulkan.api-Distinguish-Vk-Flags-from-Vk-FlagBits.patch
@@ -1,4 +1,4 @@
-From d8e4b9a6523599305b93655a1b6cfbcc28530cf6 Mon Sep 17 00:00:00 2001
+From 9f9678461ec3fdefa9c29e84c329cbdd243d7f80 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Tue, 24 Nov 2015 10:24:18 -0800
Subject: [PATCH 09/30] vulkan.api: Distinguish Vk*Flags from Vk*FlagBits
@@ -731,5 +731,5 @@
+ return as!VkQueueFlags(as!u32(flags) | as!u32(bit))
+}
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0010-vulkan-Update-from-version-0.184.0-to-0.185.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0010-vulkan-Update-from-version-0.184.0-to-0.185.0.patch
index 037bb33..4b3aea1 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0010-vulkan-Update-from-version-0.184.0-to-0.185.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0010-vulkan-Update-from-version-0.184.0-to-0.185.0.patch
@@ -1,4 +1,4 @@
-From e17cd31aef5ad14e28324af3262c79333cceb5bf Mon Sep 17 00:00:00 2001
+From 8b07f118b46ae01f709e7bfd92e29c6f6df5d7c0 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Tue, 24 Nov 2015 11:08:36 -0800
Subject: [PATCH 10/30] vulkan: Update from version 0.184.0 to 0.185.0
@@ -320,5 +320,5 @@
{"vkResetCommandPool", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkResetCommandPool>(ResetCommandPool))},
{"vkResetDescriptorPool", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkResetDescriptorPool>(ResetDescriptorPool))},
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0011-vulkan-Update-from-version-0.185.0-to-0.186.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0011-vulkan-Update-from-version-0.185.0-to-0.186.0.patch
index 940c4eb..3559098 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0011-vulkan-Update-from-version-0.185.0-to-0.186.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0011-vulkan-Update-from-version-0.185.0-to-0.186.0.patch
@@ -1,4 +1,4 @@
-From 8fd54acc60cb43569c1960a1a7516089379c01a7 Mon Sep 17 00:00:00 2001
+From 9148de67a84540aa7d70ae72fbf587e26cbd0891 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Tue, 24 Nov 2015 11:37:23 -0800
Subject: [PATCH 11/30] vulkan: Update from version 0.185.0 to 0.186.0
@@ -380,5 +380,5 @@
}
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0012-vulkan-Update-from-version-0.186.0-to-0.188.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0012-vulkan-Update-from-version-0.186.0-to-0.188.0.patch
index 9f3e477..c39aa8b 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0012-vulkan-Update-from-version-0.186.0-to-0.188.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0012-vulkan-Update-from-version-0.186.0-to-0.188.0.patch
@@ -1,4 +1,4 @@
-From d36b1d2be736d90e71e428b73537cb8d8dea2309 Mon Sep 17 00:00:00 2001
+From 2ca0449bdeecd0257c7473f663896b00d0082def Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Tue, 24 Nov 2015 12:44:21 -0800
Subject: [PATCH 12/30] vulkan: Update from version 0.186.0 to 0.188.0
@@ -8,13 +8,13 @@
vulkan/api/vulkan.api | 314 ++++++++++++++++++------------
vulkan/include/vulkan/vulkan.h | 421 ++++++++++++++++++++++++-----------------
vulkan/libvulkan/entry.cpp | 256 ++++++++++++-------------
- vulkan/libvulkan/loader.cpp | 145 +++++++++-----
+ vulkan/libvulkan/loader.cpp | 149 ++++++++++-----
vulkan/libvulkan/loader.h | 7 +-
vulkan/libvulkan/swapchain.cpp | 30 ++-
vulkan/nulldrv/null_driver.cpp | 211 +++++++++++++--------
vulkan/nulldrv/null_driver.h | 88 ++++-----
vulkan/tools/vkinfo.cpp | 9 +-
- 9 files changed, 882 insertions(+), 599 deletions(-)
+ 9 files changed, 886 insertions(+), 599 deletions(-)
diff --git a/vulkan/api/vulkan.api b/vulkan/api/vulkan.api
index bbf9cfe..b95c96e 100644
@@ -2652,7 +2652,7 @@
__attribute__((visibility("default")))
diff --git a/vulkan/libvulkan/loader.cpp b/vulkan/libvulkan/loader.cpp
-index a44026f..d5795d7 100644
+index a44026f..10877c5 100644
--- a/vulkan/libvulkan/loader.cpp
+++ b/vulkan/libvulkan/loader.cpp
@@ -22,8 +22,8 @@
@@ -2689,7 +2689,7 @@
return static_cast<T*>(mem);
}
-@@ -208,8 +214,39 @@ inline const DeviceVtbl* GetVtbl(VkQueue queue) {
+@@ -208,8 +214,43 @@ inline const DeviceVtbl* GetVtbl(VkQueue queue) {
return *reinterpret_cast<DeviceVtbl**>(queue);
}
@@ -2697,7 +2697,11 @@
- return memalign(alignment, size);
+void* DefaultAlloc(void*, size_t size, size_t alignment, VkSystemAllocScope) {
+ void* ptr = nullptr;
-+ return posix_memalign(&ptr, alignment, size) == 0 ? ptr : nullptr;
++ // Vulkan requires 'alignment' to be a power of two, but posix_memalign
++ // additionally requires that it be at least sizeof(void*).
++ return posix_memalign(&ptr, std::max(alignment, sizeof(void*)), size) == 0
++ ? ptr
++ : nullptr;
+}
+
+void* DefaultRealloc(void*,
@@ -2731,7 +2735,7 @@
}
void DefaultFree(void*, void* pMem) {
-@@ -219,6 +256,7 @@ void DefaultFree(void*, void* pMem) {
+@@ -219,6 +260,7 @@ void DefaultFree(void*, void* pMem) {
const VkAllocCallbacks kDefaultAllocCallbacks = {
.pUserData = nullptr,
.pfnAlloc = DefaultAlloc,
@@ -2739,7 +2743,7 @@
.pfnFree = DefaultFree,
};
-@@ -418,7 +456,7 @@ VkResult ActivateAllLayers(TInfo create_info, Instance* instance, TObject* objec
+@@ -418,7 +460,7 @@ VkResult ActivateAllLayers(TInfo create_info, Instance* instance, TObject* objec
}
}
// Load app layers
@@ -2748,7 +2752,7 @@
String layer_name(create_info->ppEnabledLayerNames[i],
string_allocator);
auto element = instance->layers.find(layer_name);
-@@ -439,17 +477,18 @@ template <class TCreateInfo>
+@@ -439,17 +481,18 @@ template <class TCreateInfo>
bool AddExtensionToCreateInfo(TCreateInfo& local_create_info,
const char* extension_name,
const VkAllocCallbacks* alloc) {
@@ -2772,7 +2776,7 @@
if (mem) {
const char** enabled_extensions = static_cast<const char**>(mem);
for (uint32_t i = 0; i < extension_count; ++i) {
-@@ -461,7 +500,7 @@ bool AddExtensionToCreateInfo(TCreateInfo& local_create_info,
+@@ -461,7 +504,7 @@ bool AddExtensionToCreateInfo(TCreateInfo& local_create_info,
} else {
ALOGW("%s extension cannot be enabled: memory allocation failed",
extension_name);
@@ -2781,7 +2785,7 @@
return false;
}
return true;
-@@ -537,12 +576,14 @@ PFN_vkVoidFunction GetLayerDeviceProcAddr(VkDevice device, const char* name) {
+@@ -537,12 +580,14 @@ PFN_vkVoidFunction GetLayerDeviceProcAddr(VkDevice device, const char* name) {
// "Bottom" functions. These are called at the end of the instance dispatch
// chain.
@@ -2798,7 +2802,7 @@
}
if (instance->message) {
PFN_vkDbgDestroyMsgCallback DebugDestroyMessageCallback;
-@@ -561,21 +602,22 @@ void DestroyInstanceBottom(VkInstance instance) {
+@@ -561,21 +606,22 @@ void DestroyInstanceBottom(VkInstance instance) {
}
VkResult CreateInstanceBottom(const VkInstanceCreateInfo* create_info,
@@ -2825,7 +2829,7 @@
return VK_ERROR_INITIALIZATION_FAILED;
}
-@@ -587,7 +629,7 @@ VkResult CreateInstanceBottom(const VkInstanceCreateInfo* create_info,
+@@ -587,7 +633,7 @@ VkResult CreateInstanceBottom(const VkInstanceCreateInfo* create_info,
"vkGetDeviceProcAddr"));
if (!instance->drv.GetDeviceProcAddr) {
ALOGE("missing instance proc: \"%s\"", "vkGetDeviceProcAddr");
@@ -2834,7 +2838,7 @@
return VK_ERROR_INITIALIZATION_FAILED;
}
-@@ -600,7 +642,7 @@ VkResult CreateInstanceBottom(const VkInstanceCreateInfo* create_info,
+@@ -600,7 +646,7 @@ VkResult CreateInstanceBottom(const VkInstanceCreateInfo* create_info,
} else {
ALOGE("invalid VkInstance dispatch magic: 0x%" PRIxPTR,
dispatch->magic);
@@ -2843,7 +2847,7 @@
return VK_ERROR_INITIALIZATION_FAILED;
}
-@@ -608,7 +650,7 @@ VkResult CreateInstanceBottom(const VkInstanceCreateInfo* create_info,
+@@ -608,7 +654,7 @@ VkResult CreateInstanceBottom(const VkInstanceCreateInfo* create_info,
result = instance->drv.vtbl.EnumeratePhysicalDevices(
instance->drv.vtbl.instance, &num_physical_devices, nullptr);
if (result != VK_SUCCESS) {
@@ -2852,7 +2856,7 @@
return VK_ERROR_INITIALIZATION_FAILED;
}
num_physical_devices = std::min(num_physical_devices, kMaxPhysicalDevices);
-@@ -616,7 +658,7 @@ VkResult CreateInstanceBottom(const VkInstanceCreateInfo* create_info,
+@@ -616,7 +662,7 @@ VkResult CreateInstanceBottom(const VkInstanceCreateInfo* create_info,
instance->drv.vtbl.instance, &num_physical_devices,
instance->physical_devices);
if (result != VK_SUCCESS) {
@@ -2861,7 +2865,7 @@
return VK_ERROR_INITIALIZATION_FAILED;
}
for (uint32_t i = 0; i < num_physical_devices; i++) {
-@@ -625,7 +667,7 @@ VkResult CreateInstanceBottom(const VkInstanceCreateInfo* create_info,
+@@ -625,7 +671,7 @@ VkResult CreateInstanceBottom(const VkInstanceCreateInfo* create_info,
if (dispatch->magic != HWVULKAN_DISPATCH_MAGIC) {
ALOGE("invalid VkPhysicalDevice dispatch magic: 0x%" PRIxPTR,
dispatch->magic);
@@ -2870,7 +2874,7 @@
return VK_ERROR_INITIALIZATION_FAILED;
}
dispatch->vtbl = instance->vtbl;
-@@ -696,13 +738,21 @@ void GetPhysicalDeviceMemoryPropertiesBottom(
+@@ -696,13 +742,21 @@ void GetPhysicalDeviceMemoryPropertiesBottom(
VkResult CreateDeviceBottom(VkPhysicalDevice pdev,
const VkDeviceCreateInfo* create_info,
@@ -2895,7 +2899,7 @@
if (!mem)
return VK_ERROR_OUT_OF_HOST_MEMORY;
Device* device = new (mem) Device(&instance);
-@@ -714,7 +764,8 @@ VkResult CreateDeviceBottom(VkPhysicalDevice pdev,
+@@ -714,7 +768,8 @@ VkResult CreateDeviceBottom(VkPhysicalDevice pdev,
}
VkDevice drv_device;
@@ -2905,7 +2909,7 @@
if (result != VK_SUCCESS) {
DestroyDevice(device);
return result;
-@@ -727,7 +778,7 @@ VkResult CreateDeviceBottom(VkPhysicalDevice pdev,
+@@ -727,7 +782,7 @@ VkResult CreateDeviceBottom(VkPhysicalDevice pdev,
PFN_vkDestroyDevice destroy_device =
reinterpret_cast<PFN_vkDestroyDevice>(
instance.drv.GetDeviceProcAddr(drv_device, "vkDestroyDevice"));
@@ -2914,7 +2918,7 @@
DestroyDevice(device);
return VK_ERROR_INITIALIZATION_FAILED;
}
-@@ -778,7 +829,7 @@ VkResult CreateDeviceBottom(VkPhysicalDevice pdev,
+@@ -778,7 +833,7 @@ VkResult CreateDeviceBottom(VkPhysicalDevice pdev,
reinterpret_cast<PFN_vkCreateDevice>(
device->vtbl_storage.GetDeviceProcAddr(drv_device,
"vkCreateDevice"));
@@ -2923,7 +2927,7 @@
// TODO(mlentine) : This is needed to use WSI layer validation. Remove this
// when new version of layer initialization exits.
-@@ -896,23 +947,25 @@ VkResult EnumerateInstanceLayerProperties(uint32_t* count,
+@@ -896,23 +951,25 @@ VkResult EnumerateInstanceLayerProperties(uint32_t* count,
}
VkResult CreateInstance(const VkInstanceCreateInfo* create_info,
@@ -2955,7 +2959,7 @@
instance->vtbl_storage = kBottomInstanceFunctions;
instance->vtbl_storage.instance = instance;
-@@ -930,7 +983,7 @@ VkResult CreateInstance(const VkInstanceCreateInfo* create_info,
+@@ -930,7 +987,7 @@ VkResult CreateInstance(const VkInstanceCreateInfo* create_info,
result = ActivateAllLayers(create_info, instance, instance);
if (result != VK_SUCCESS) {
@@ -2964,7 +2968,7 @@
return result;
}
-@@ -973,7 +1026,7 @@ VkResult CreateInstance(const VkInstanceCreateInfo* create_info,
+@@ -973,7 +1030,7 @@ VkResult CreateInstance(const VkInstanceCreateInfo* create_info,
if (!LoadInstanceVtbl(static_cast<VkInstance>(base_object),
static_cast<VkInstance>(next_object),
next_get_proc_addr, instance->vtbl_storage)) {
@@ -2973,7 +2977,7 @@
return VK_ERROR_INITIALIZATION_FAILED;
}
-@@ -988,7 +1041,8 @@ VkResult CreateInstance(const VkInstanceCreateInfo* create_info,
+@@ -988,7 +1045,8 @@ VkResult CreateInstance(const VkInstanceCreateInfo* create_info,
}
*out_instance = instance;
@@ -2983,7 +2987,7 @@
if (enable_callback)
FreeAllocatedCreateInfo(local_create_info, instance->alloc);
if (result <= 0) {
-@@ -1079,7 +1133,7 @@ VkResult AllocCommandBuffers(VkDevice device,
+@@ -1079,7 +1137,7 @@ VkResult AllocCommandBuffers(VkDevice device,
VkResult result = vtbl->AllocCommandBuffers(device, alloc_info, cmdbuffers);
if (result != VK_SUCCESS)
return result;
@@ -2992,7 +2996,7 @@
hwvulkan_dispatch_t* dispatch =
reinterpret_cast<hwvulkan_dispatch_t*>(cmdbuffers[i]);
ALOGE_IF(dispatch->magic != HWVULKAN_DISPATCH_MAGIC,
-@@ -1090,14 +1144,15 @@ VkResult AllocCommandBuffers(VkDevice device,
+@@ -1090,14 +1148,15 @@ VkResult AllocCommandBuffers(VkDevice device,
return VK_SUCCESS;
}
@@ -3010,7 +3014,7 @@
DestroyDevice(device);
return VK_SUCCESS;
}
-@@ -1105,9 +1160,9 @@ VkResult DestroyDevice(VkDevice drv_device) {
+@@ -1105,9 +1164,9 @@ VkResult DestroyDevice(VkDevice drv_device) {
void* AllocMem(VkInstance instance,
size_t size,
size_t align,
@@ -3022,7 +3026,7 @@
}
void FreeMem(VkInstance instance, void* ptr) {
-@@ -1118,10 +1173,10 @@ void FreeMem(VkInstance instance, void* ptr) {
+@@ -1118,10 +1177,10 @@ void FreeMem(VkInstance instance, void* ptr) {
void* AllocMem(VkDevice device,
size_t size,
size_t align,
@@ -3903,5 +3907,5 @@
return 0;
}
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0013-vulkan-Update-from-version-0.188.0-to-0.189.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0013-vulkan-Update-from-version-0.188.0-to-0.189.0.patch
index 67d99fd..3ebeee3 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0013-vulkan-Update-from-version-0.188.0-to-0.189.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0013-vulkan-Update-from-version-0.188.0-to-0.189.0.patch
@@ -1,4 +1,4 @@
-From 5dd913c12f8eccf523b4588806711e3b45ed8b79 Mon Sep 17 00:00:00 2001
+From 48c1928e091dd7eb6ca4fc6564e0be072028c38a Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Sun, 29 Nov 2015 14:36:39 -0800
Subject: [PATCH 13/30] vulkan: Update from version 0.188.0 to 0.189.0
@@ -241,5 +241,5 @@
void CmdCopyImageToBuffer(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer destBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions);
void CmdUpdateBuffer(VkCmdBuffer cmdBuffer, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize dataSize, const uint32_t* pData);
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0014-vulkan-Update-from-version-0.189.0-to-0.190.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0014-vulkan-Update-from-version-0.189.0-to-0.190.0.patch
index d23327b..1e09c07 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0014-vulkan-Update-from-version-0.189.0-to-0.190.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0014-vulkan-Update-from-version-0.189.0-to-0.190.0.patch
@@ -1,4 +1,4 @@
-From ef949b4f570c963e3d4e8362b3a6a3d41f3ce4b8 Mon Sep 17 00:00:00 2001
+From 888efcf06fdbfa02587ffbfaa8fe6ca8e1b6e58a Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Sun, 29 Nov 2015 18:59:42 -0800
Subject: [PATCH 14/30] vulkan: Update from version 0.189.0 to 0.190.0
@@ -2048,5 +2048,5 @@
{"vkQueueWaitIdle", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkQueueWaitIdle>(QueueWaitIdle))},
{"vkResetCommandBuffer", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkResetCommandBuffer>(ResetCommandBuffer))},
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0015-vulkan-Update-from-version-0.190.0-to-0.192.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0015-vulkan-Update-from-version-0.190.0-to-0.192.0.patch
index 63065c0..63bb3f9 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0015-vulkan-Update-from-version-0.190.0-to-0.192.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0015-vulkan-Update-from-version-0.190.0-to-0.192.0.patch
@@ -1,4 +1,4 @@
-From f31710155f9bfdd726bc95f648a821d84de55b69 Mon Sep 17 00:00:00 2001
+From c10af6dde1e91deb70ef055838f1b51240fc66f2 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Sun, 29 Nov 2015 19:12:15 -0800
Subject: [PATCH 15/30] vulkan: Update from version 0.190.0 to 0.192.0
@@ -242,5 +242,5 @@
void CmdEndQuery(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t slot);
void CmdResetQueryPool(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount);
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0016-vulkan-Update-from-version-0.192.0-to-0.193.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0016-vulkan-Update-from-version-0.192.0-to-0.193.0.patch
index 5496741..3b1936d 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0016-vulkan-Update-from-version-0.192.0-to-0.193.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0016-vulkan-Update-from-version-0.192.0-to-0.193.0.patch
@@ -1,4 +1,4 @@
-From 45aa1055a77ee030591c989f737ff7c4f635a46b Mon Sep 17 00:00:00 2001
+From d0534c33c98e8f0c844b37df7c764c9dbd6bbaa3 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Sun, 29 Nov 2015 19:46:20 -0800
Subject: [PATCH 16/30] vulkan: Update from version 0.192.0 to 0.193.0
@@ -893,10 +893,10 @@
if (UNLIKELY(!vtbl.CreateSwapchainKHR)) {
ALOGE("missing device proc: %s", "vkCreateSwapchainKHR");
diff --git a/vulkan/libvulkan/loader.cpp b/vulkan/libvulkan/loader.cpp
-index d5795d7..4e68f88 100644
+index 10877c5..03265ef 100644
--- a/vulkan/libvulkan/loader.cpp
+++ b/vulkan/libvulkan/loader.cpp
-@@ -542,15 +542,6 @@ PFN_vkVoidFunction GetLayerDeviceProcAddr(VkDevice device, const char* name) {
+@@ -546,15 +546,6 @@ PFN_vkVoidFunction GetLayerDeviceProcAddr(VkDevice device, const char* name) {
return reinterpret_cast<PFN_vkVoidFunction>(Noop);
}
// WSI extensions are not in the driver so return the loader functions
@@ -912,7 +912,7 @@
if (strcmp(name, "vkCreateSwapchainKHR") == 0) {
return reinterpret_cast<PFN_vkVoidFunction>(CreateSwapchainKHR);
}
-@@ -896,6 +887,9 @@ const InstanceVtbl kBottomInstanceFunctions = {
+@@ -900,6 +891,9 @@ const InstanceVtbl kBottomInstanceFunctions = {
.EnumerateDeviceLayerProperties = EnumerateDeviceLayerPropertiesBottom,
.GetPhysicalDeviceSparseImageFormatProperties = GetPhysicalDeviceSparseImageFormatPropertiesBottom,
.GetPhysicalDeviceSurfaceSupportKHR = GetPhysicalDeviceSurfaceSupportKHR,
@@ -1091,5 +1091,5 @@
}
}
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0017-vulkan-Update-from-version-0.193.0-to-0.194.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0017-vulkan-Update-from-version-0.193.0-to-0.194.0.patch
index fffd40c..ced3746 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0017-vulkan-Update-from-version-0.193.0-to-0.194.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0017-vulkan-Update-from-version-0.193.0-to-0.194.0.patch
@@ -1,4 +1,4 @@
-From 3b2e2ef030d38b5c2a6e200a4d5ccdaea36ec906 Mon Sep 17 00:00:00 2001
+From 83c7f0486d495e9e7ab6f901ddeed931fff9ebad Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Sun, 29 Nov 2015 21:05:26 -0800
Subject: [PATCH 17/30] vulkan: Update from version 0.193.0 to 0.194.0
@@ -609,5 +609,5 @@
uint32_t destSubpass;
VkPipelineStageFlags srcStageMask;
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0018-vulkan-Update-from-version-0.194.0-to-0.196.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0018-vulkan-Update-from-version-0.194.0-to-0.196.0.patch
index eab1cd7..7c8ca30 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0018-vulkan-Update-from-version-0.194.0-to-0.196.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0018-vulkan-Update-from-version-0.194.0-to-0.196.0.patch
@@ -1,4 +1,4 @@
-From 8d00e63b01003f7269fd31c82698427641eca3bf Mon Sep 17 00:00:00 2001
+From 48e9a8af39134fc2e995867668e113e56931167b Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Sun, 29 Nov 2015 22:10:52 -0800
Subject: [PATCH 18/30] vulkan: Update from version 0.194.0 to 0.196.0
@@ -5572,7 +5572,7 @@
}
vtbl.FreeCommandBuffers = reinterpret_cast<PFN_vkFreeCommandBuffers>(get_proc_addr(device, "vkFreeCommandBuffers"));
diff --git a/vulkan/libvulkan/loader.cpp b/vulkan/libvulkan/loader.cpp
-index 4e68f88..246c37d 100644
+index 03265ef..d1b369e 100644
--- a/vulkan/libvulkan/loader.cpp
+++ b/vulkan/libvulkan/loader.cpp
@@ -58,10 +58,10 @@ typedef struct VkLayerLinkedListElem_ {
@@ -5636,7 +5636,7 @@
uint32_t num_physical_devices;
VkPhysicalDevice physical_devices[kMaxPhysicalDevices];
-@@ -214,16 +215,19 @@ inline const DeviceVtbl* GetVtbl(VkQueue queue) {
+@@ -214,7 +215,10 @@ inline const DeviceVtbl* GetVtbl(VkQueue queue) {
return *reinterpret_cast<DeviceVtbl**>(queue);
}
@@ -5646,7 +5646,10 @@
+ size_t alignment,
+ VkSystemAllocationScope) {
void* ptr = nullptr;
- return posix_memalign(&ptr, alignment, size) == 0 ? ptr : nullptr;
+ // Vulkan requires 'alignment' to be a power of two, but posix_memalign
+ // additionally requires that it be at least sizeof(void*).
+@@ -223,11 +227,11 @@ void* DefaultAlloc(void*, size_t size, size_t alignment, VkSystemAllocScope) {
+ : nullptr;
}
-void* DefaultRealloc(void*,
@@ -5662,7 +5665,7 @@
if (size == 0) {
free(ptr);
return nullptr;
-@@ -253,10 +257,10 @@ void DefaultFree(void*, void* pMem) {
+@@ -257,10 +261,10 @@ void DefaultFree(void*, void* pMem) {
free(pMem);
}
@@ -5676,7 +5679,7 @@
.pfnFree = DefaultFree,
};
-@@ -289,7 +293,7 @@ bool EnsureInitialized() {
+@@ -293,7 +297,7 @@ bool EnsureInitialized() {
}
void DestroyDevice(Device* device) {
@@ -5685,7 +5688,7 @@
device->~Device();
alloc->pfnFree(alloc->pUserData, device);
}
-@@ -476,7 +480,7 @@ VkResult ActivateAllLayers(TInfo create_info, Instance* instance, TObject* objec
+@@ -480,7 +484,7 @@ VkResult ActivateAllLayers(TInfo create_info, Instance* instance, TObject* objec
template <class TCreateInfo>
bool AddExtensionToCreateInfo(TCreateInfo& local_create_info,
const char* extension_name,
@@ -5694,7 +5697,7 @@
for (uint32_t i = 0; i < local_create_info.enabledExtensionNameCount; ++i) {
if (!strcmp(extension_name,
local_create_info.ppEnabledExtensionNames[i])) {
-@@ -485,10 +489,10 @@ bool AddExtensionToCreateInfo(TCreateInfo& local_create_info,
+@@ -489,10 +493,10 @@ bool AddExtensionToCreateInfo(TCreateInfo& local_create_info,
}
uint32_t extension_count = local_create_info.enabledExtensionNameCount;
local_create_info.enabledExtensionNameCount++;
@@ -5707,7 +5710,7 @@
if (mem) {
const char** enabled_extensions = static_cast<const char**>(mem);
for (uint32_t i = 0; i < extension_count; ++i) {
-@@ -508,7 +512,7 @@ bool AddExtensionToCreateInfo(TCreateInfo& local_create_info,
+@@ -512,7 +516,7 @@ bool AddExtensionToCreateInfo(TCreateInfo& local_create_info,
template <class T>
void FreeAllocatedCreateInfo(T& local_create_info,
@@ -5716,7 +5719,7 @@
alloc->pfnFree(
alloc->pUserData,
const_cast<char**>(local_create_info.ppEnabledExtensionNames));
-@@ -568,7 +572,7 @@ PFN_vkVoidFunction GetLayerDeviceProcAddr(VkDevice device, const char* name) {
+@@ -572,7 +576,7 @@ PFN_vkVoidFunction GetLayerDeviceProcAddr(VkDevice device, const char* name) {
// chain.
void DestroyInstanceBottom(VkInstance instance,
@@ -5725,7 +5728,7 @@
// These checks allow us to call DestroyInstanceBottom from any error path
// in CreateInstanceBottom, before the driver instance is fully initialized.
if (instance->drv.vtbl.instance != VK_NULL_HANDLE &&
-@@ -587,13 +591,13 @@ void DestroyInstanceBottom(VkInstance instance,
+@@ -591,13 +595,13 @@ void DestroyInstanceBottom(VkInstance instance,
it != instance->active_layers.end(); ++it) {
DeactivateLayer(instance, it);
}
@@ -5741,7 +5744,7 @@
VkInstance* instance_ptr) {
Instance* instance = *instance_ptr;
VkResult result;
-@@ -729,7 +733,7 @@ void GetPhysicalDeviceMemoryPropertiesBottom(
+@@ -733,7 +737,7 @@ void GetPhysicalDeviceMemoryPropertiesBottom(
VkResult CreateDeviceBottom(VkPhysicalDevice pdev,
const VkDeviceCreateInfo* create_info,
@@ -5750,7 +5753,7 @@
VkDevice* out_device) {
Instance& instance = *static_cast<Instance*>(GetVtbl(pdev)->instance);
VkResult result;
-@@ -741,9 +745,9 @@ VkResult CreateDeviceBottom(VkPhysicalDevice pdev,
+@@ -745,9 +749,9 @@ VkResult CreateDeviceBottom(VkPhysicalDevice pdev,
allocator = &kDefaultAllocCallbacks;
}
@@ -5763,7 +5766,7 @@
if (!mem)
return VK_ERROR_OUT_OF_HOST_MEMORY;
Device* device = new (mem) Device(&instance);
-@@ -941,7 +945,7 @@ VkResult EnumerateInstanceLayerProperties(uint32_t* count,
+@@ -945,7 +949,7 @@ VkResult EnumerateInstanceLayerProperties(uint32_t* count,
}
VkResult CreateInstance(const VkInstanceCreateInfo* create_info,
@@ -5772,7 +5775,7 @@
VkInstance* out_instance) {
VkResult result;
-@@ -954,9 +958,9 @@ VkResult CreateInstance(const VkInstanceCreateInfo* create_info,
+@@ -958,9 +962,9 @@ VkResult CreateInstance(const VkInstanceCreateInfo* create_info,
VkInstanceCreateInfo local_create_info = *create_info;
create_info = &local_create_info;
@@ -5785,7 +5788,7 @@
if (!instance_mem)
return VK_ERROR_OUT_OF_HOST_MEMORY;
Instance* instance = new (instance_mem) Instance(allocator);
-@@ -1121,17 +1125,17 @@ void GetDeviceQueue(VkDevice drv_device,
+@@ -1125,17 +1129,17 @@ void GetDeviceQueue(VkDevice drv_device,
}
VkResult AllocCommandBuffers(VkDevice device,
@@ -5808,7 +5811,7 @@
dispatch->magic);
dispatch->vtbl = vtbl;
}
-@@ -1139,7 +1143,7 @@ VkResult AllocCommandBuffers(VkDevice device,
+@@ -1143,7 +1147,7 @@ VkResult AllocCommandBuffers(VkDevice device,
}
VkResult DestroyDevice(VkDevice drv_device,
@@ -5817,7 +5820,7 @@
const DeviceVtbl* vtbl = GetVtbl(drv_device);
Device* device = static_cast<Device*>(vtbl->device);
for (auto it = device->active_layers.begin();
-@@ -1154,27 +1158,27 @@ VkResult DestroyDevice(VkDevice drv_device,
+@@ -1158,27 +1162,27 @@ VkResult DestroyDevice(VkDevice drv_device,
void* AllocMem(VkInstance instance,
size_t size,
size_t align,
@@ -6989,5 +6992,5 @@
.ppEnabledLayerNames = nullptr,
.enabledExtensionNameCount = 0,
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0019-vulkan-Update-from-version-0.196.0-to-0.197.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0019-vulkan-Update-from-version-0.196.0-to-0.197.0.patch
index 5269766..df2cc50 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0019-vulkan-Update-from-version-0.196.0-to-0.197.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0019-vulkan-Update-from-version-0.196.0-to-0.197.0.patch
@@ -1,4 +1,4 @@
-From 28e4f6d9fdb6ac3fec47d7cb12a7b90caa737394 Mon Sep 17 00:00:00 2001
+From bef4966ad22d7690626b3dc048c59cb9e9eab870 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Sun, 29 Nov 2015 23:50:38 -0800
Subject: [PATCH 19/30] vulkan: Update from version 0.196.0 to 0.197.0
@@ -216,5 +216,5 @@
strbuf << " LAZILY_ALLOCATED";
printf(" Type %u: %s\n", type, strbuf.str().c_str());
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0020-vulkan-Update-from-version-0.197.0-to-0.198.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0020-vulkan-Update-from-version-0.197.0-to-0.198.0.patch
index 09e7224..2b8fdd0 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0020-vulkan-Update-from-version-0.197.0-to-0.198.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0020-vulkan-Update-from-version-0.197.0-to-0.198.0.patch
@@ -1,4 +1,4 @@
-From 16dcb975a508d8c23006200f42e00c23d0376511 Mon Sep 17 00:00:00 2001
+From ef5b7de781a9d803be4fba7ba243e6e96dd61851 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Mon, 30 Nov 2015 00:07:16 -0800
Subject: [PATCH 20/30] vulkan: Update from version 0.197.0 to 0.198.0
@@ -1418,5 +1418,5 @@
VkPhysicalDeviceMemoryProperties mem_props;
vkGetPhysicalDeviceMemoryProperties(pdev, &mem_props);
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0021-vulkan-Update-from-version-0.198.0-to-0.200.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0021-vulkan-Update-from-version-0.198.0-to-0.200.0.patch
index e416675..b1d45f3a 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0021-vulkan-Update-from-version-0.198.0-to-0.200.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0021-vulkan-Update-from-version-0.198.0-to-0.200.0.patch
@@ -1,4 +1,4 @@
-From 2afbe83fe000204ab6f44e11b55bbad700dac27a Mon Sep 17 00:00:00 2001
+From 9568691bea351152b340c0cbb3d31e5246ac469b Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Mon, 30 Nov 2015 00:42:57 -0800
Subject: [PATCH 21/30] vulkan: Update from version 0.198.0 to 0.200.0
@@ -3345,5 +3345,5 @@
{"vkDeviceWaitIdle", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkDeviceWaitIdle>(DeviceWaitIdle))},
{"vkEndCommandBuffer", reinterpret_cast<PFN_vkVoidFunction>(static_cast<PFN_vkEndCommandBuffer>(EndCommandBuffer))},
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0022-vulkan-Update-from-version-0.200.0-to-0.202.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0022-vulkan-Update-from-version-0.200.0-to-0.202.0.patch
index e73e345..6011ee7 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0022-vulkan-Update-from-version-0.200.0-to-0.202.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0022-vulkan-Update-from-version-0.200.0-to-0.202.0.patch
@@ -1,4 +1,4 @@
-From 579a86538c32f14824b80de1d27382e85a4f24f2 Mon Sep 17 00:00:00 2001
+From 5b9c3a1af7088351d49431a496ef9f7fd078e9f6 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Mon, 30 Nov 2015 00:55:29 -0800
Subject: [PATCH 22/30] vulkan: Update from version 0.200.0 to 0.202.0
@@ -441,10 +441,10 @@
}
diff --git a/vulkan/libvulkan/loader.cpp b/vulkan/libvulkan/loader.cpp
-index 246c37d..e0eddba 100644
+index d1b369e..9d0166b 100644
--- a/vulkan/libvulkan/loader.cpp
+++ b/vulkan/libvulkan/loader.cpp
-@@ -860,7 +860,7 @@ void GetPhysicalDeviceSparseImageFormatPropertiesBottom(
+@@ -864,7 +864,7 @@ void GetPhysicalDeviceSparseImageFormatPropertiesBottom(
VkPhysicalDevice pdev,
VkFormat format,
VkImageType type,
@@ -493,5 +493,5 @@
VkResult CreateFence(VkDevice device, const VkFenceCreateInfo* pCreateInfo, const VkAllocationCallbacks* allocator, VkFence* pFence);
void DestroyFence(VkDevice device, VkFence fence, const VkAllocationCallbacks* allocator);
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0023-vulkan-Update-from-version-0.202.0-to-0.203.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0023-vulkan-Update-from-version-0.202.0-to-0.203.0.patch
index d05a728..34e6f76 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0023-vulkan-Update-from-version-0.202.0-to-0.203.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0023-vulkan-Update-from-version-0.202.0-to-0.203.0.patch
@@ -1,4 +1,4 @@
-From 8fb824bebd02ae132ac846abbd225fde366f4798 Mon Sep 17 00:00:00 2001
+From 5f1b8406c88d20f23e77426d4d786caca659540b Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Mon, 30 Nov 2015 01:03:10 -0800
Subject: [PATCH 23/30] vulkan: Update from version 0.202.0 to 0.203.0
@@ -211,10 +211,10 @@
__attribute__((visibility("default")))
diff --git a/vulkan/libvulkan/loader.cpp b/vulkan/libvulkan/loader.cpp
-index e0eddba..135f06d 100644
+index 9d0166b..a5bbc3a 100644
--- a/vulkan/libvulkan/loader.cpp
+++ b/vulkan/libvulkan/loader.cpp
-@@ -698,7 +698,7 @@ void GetPhysicalDeviceFormatPropertiesBottom(VkPhysicalDevice pdev,
+@@ -702,7 +702,7 @@ void GetPhysicalDeviceFormatPropertiesBottom(VkPhysicalDevice pdev,
pdev, format, properties);
}
@@ -223,7 +223,7 @@
VkPhysicalDevice pdev,
VkFormat format,
VkImageType type,
-@@ -706,8 +706,9 @@ void GetPhysicalDeviceImageFormatPropertiesBottom(
+@@ -710,8 +710,9 @@ void GetPhysicalDeviceImageFormatPropertiesBottom(
VkImageUsageFlags usage,
VkImageCreateFlags flags,
VkImageFormatProperties* properties) {
@@ -296,5 +296,5 @@
void GetPhysicalDeviceQueueFamilyProperties(VkPhysicalDevice physicalDevice, uint32_t* pCount, VkQueueFamilyProperties* pQueueFamilyProperties);
void GetPhysicalDeviceMemoryProperties(VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties* pMemoryProperties);
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0024-vulkan-Update-from-version-0.203.0-to-0.204.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0024-vulkan-Update-from-version-0.203.0-to-0.204.0.patch
index 541cc49..900296c 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0024-vulkan-Update-from-version-0.203.0-to-0.204.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0024-vulkan-Update-from-version-0.203.0-to-0.204.0.patch
@@ -1,4 +1,4 @@
-From 5b17dda5e7ca170fd8743ae19152b1766c506436 Mon Sep 17 00:00:00 2001
+From 79c20c98e47ce5a7d0608cda59b19d153455cbae Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Mon, 30 Nov 2015 11:27:32 -0800
Subject: [PATCH 24/30] vulkan: Update from version 0.203.0 to 0.204.0
@@ -2680,10 +2680,10 @@
{{Macro "Dispatch" $}}{{TrimPrefix "vk" $.Name}}({{Macro "Arguments" $}});
}
diff --git a/vulkan/libvulkan/loader.cpp b/vulkan/libvulkan/loader.cpp
-index 135f06d..c24ef86 100644
+index a5bbc3a..2d45558 100644
--- a/vulkan/libvulkan/loader.cpp
+++ b/vulkan/libvulkan/loader.cpp
-@@ -215,19 +215,19 @@ inline const DeviceVtbl* GetVtbl(VkQueue queue) {
+@@ -215,10 +215,10 @@ inline const DeviceVtbl* GetVtbl(VkQueue queue) {
return *reinterpret_cast<DeviceVtbl**>(queue);
}
@@ -2696,7 +2696,10 @@
+ size_t alignment,
+ VkSystemAllocationScope) {
void* ptr = nullptr;
- return posix_memalign(&ptr, alignment, size) == 0 ? ptr : nullptr;
+ // Vulkan requires 'alignment' to be a power of two, but posix_memalign
+ // additionally requires that it be at least sizeof(void*).
+@@ -227,11 +227,11 @@ void* DefaultAllocate(void*,
+ : nullptr;
}
-void* DefaultReallocate(void*,
@@ -2712,7 +2715,7 @@
if (size == 0) {
free(ptr);
return nullptr;
-@@ -253,7 +253,7 @@ void* DefaultReallocate(void*,
+@@ -257,7 +257,7 @@ void* DefaultReallocate(void*,
return new_ptr;
}
@@ -2721,7 +2724,7 @@
free(pMem);
}
-@@ -518,6 +518,7 @@ void FreeAllocatedCreateInfo(T& local_create_info,
+@@ -522,6 +522,7 @@ void FreeAllocatedCreateInfo(T& local_create_info,
const_cast<char**>(local_create_info.ppEnabledExtensionNames));
}
@@ -2729,7 +2732,7 @@
VkBool32 LogDebugMessageCallback(VkFlags message_flags,
VkDbgObjectType /*obj_type*/,
uint64_t /*src_object*/,
-@@ -538,7 +539,8 @@ VkResult Noop(...) {
+@@ -542,7 +543,8 @@ VkResult Noop(...) {
return VK_SUCCESS;
}
@@ -2739,7 +2742,7 @@
if (strcmp(name, "vkGetDeviceProcAddr") == 0) {
return reinterpret_cast<PFN_vkVoidFunction>(GetLayerDeviceProcAddr);
}
-@@ -571,6 +573,7 @@ PFN_vkVoidFunction GetLayerDeviceProcAddr(VkDevice device, const char* name) {
+@@ -575,6 +577,7 @@ PFN_vkVoidFunction GetLayerDeviceProcAddr(VkDevice device, const char* name) {
// "Bottom" functions. These are called at the end of the instance dispatch
// chain.
@@ -2747,7 +2750,7 @@
void DestroyInstanceBottom(VkInstance instance,
const VkAllocationCallbacks* allocator) {
// These checks allow us to call DestroyInstanceBottom from any error path
-@@ -596,6 +599,7 @@ void DestroyInstanceBottom(VkInstance instance,
+@@ -600,6 +603,7 @@ void DestroyInstanceBottom(VkInstance instance,
alloc->pfnFree(alloc->pUserData, instance);
}
@@ -2755,7 +2758,7 @@
VkResult CreateInstanceBottom(const VkInstanceCreateInfo* create_info,
const VkAllocationCallbacks* allocator,
VkInstance* instance_ptr) {
-@@ -673,6 +677,7 @@ VkResult CreateInstanceBottom(const VkInstanceCreateInfo* create_info,
+@@ -677,6 +681,7 @@ VkResult CreateInstanceBottom(const VkInstanceCreateInfo* create_info,
return VK_SUCCESS;
}
@@ -2763,7 +2766,7 @@
VkResult EnumeratePhysicalDevicesBottom(VkInstance instance,
uint32_t* pdev_count,
VkPhysicalDevice* pdevs) {
-@@ -686,11 +691,13 @@ VkResult EnumeratePhysicalDevicesBottom(VkInstance instance,
+@@ -690,11 +695,13 @@ VkResult EnumeratePhysicalDevicesBottom(VkInstance instance,
return VK_SUCCESS;
}
@@ -2777,7 +2780,7 @@
void GetPhysicalDeviceFormatPropertiesBottom(VkPhysicalDevice pdev,
VkFormat format,
VkFormatProperties* properties) {
-@@ -698,6 +705,7 @@ void GetPhysicalDeviceFormatPropertiesBottom(VkPhysicalDevice pdev,
+@@ -702,6 +709,7 @@ void GetPhysicalDeviceFormatPropertiesBottom(VkPhysicalDevice pdev,
pdev, format, properties);
}
@@ -2785,7 +2788,7 @@
VkResult GetPhysicalDeviceImageFormatPropertiesBottom(
VkPhysicalDevice pdev,
VkFormat format,
-@@ -711,12 +719,14 @@ VkResult GetPhysicalDeviceImageFormatPropertiesBottom(
+@@ -715,12 +723,14 @@ VkResult GetPhysicalDeviceImageFormatPropertiesBottom(
pdev, format, type, tiling, usage, flags, properties);
}
@@ -2800,7 +2803,7 @@
void GetPhysicalDeviceQueueFamilyPropertiesBottom(
VkPhysicalDevice pdev,
uint32_t* pCount,
-@@ -725,6 +735,7 @@ void GetPhysicalDeviceQueueFamilyPropertiesBottom(
+@@ -729,6 +739,7 @@ void GetPhysicalDeviceQueueFamilyPropertiesBottom(
pdev, pCount, properties);
}
@@ -2808,7 +2811,7 @@
void GetPhysicalDeviceMemoryPropertiesBottom(
VkPhysicalDevice pdev,
VkPhysicalDeviceMemoryProperties* properties) {
-@@ -732,6 +743,7 @@ void GetPhysicalDeviceMemoryPropertiesBottom(
+@@ -736,6 +747,7 @@ void GetPhysicalDeviceMemoryPropertiesBottom(
pdev, properties);
}
@@ -2816,7 +2819,7 @@
VkResult CreateDeviceBottom(VkPhysicalDevice pdev,
const VkDeviceCreateInfo* create_info,
const VkAllocationCallbacks* allocator,
-@@ -840,6 +852,7 @@ VkResult CreateDeviceBottom(VkPhysicalDevice pdev,
+@@ -844,6 +856,7 @@ VkResult CreateDeviceBottom(VkPhysicalDevice pdev,
return VK_SUCCESS;
}
@@ -2824,7 +2827,7 @@
VkResult EnumerateDeviceExtensionPropertiesBottom(
VkPhysicalDevice pdev,
const char* layer_name,
-@@ -850,6 +863,7 @@ VkResult EnumerateDeviceExtensionPropertiesBottom(
+@@ -854,6 +867,7 @@ VkResult EnumerateDeviceExtensionPropertiesBottom(
pdev, layer_name, properties_count, properties);
}
@@ -2832,7 +2835,7 @@
VkResult EnumerateDeviceLayerPropertiesBottom(VkPhysicalDevice pdev,
uint32_t* properties_count,
VkLayerProperties* properties) {
-@@ -857,6 +871,7 @@ VkResult EnumerateDeviceLayerPropertiesBottom(VkPhysicalDevice pdev,
+@@ -861,6 +875,7 @@ VkResult EnumerateDeviceLayerPropertiesBottom(VkPhysicalDevice pdev,
pdev, properties_count, properties);
}
@@ -2840,7 +2843,7 @@
void GetPhysicalDeviceSparseImageFormatPropertiesBottom(
VkPhysicalDevice pdev,
VkFormat format,
-@@ -872,7 +887,8 @@ void GetPhysicalDeviceSparseImageFormatPropertiesBottom(
+@@ -876,7 +891,8 @@ void GetPhysicalDeviceSparseImageFormatPropertiesBottom(
properties);
}
@@ -2850,7 +2853,7 @@
const InstanceVtbl kBottomInstanceFunctions = {
// clang-format off
-@@ -898,6 +914,7 @@ const InstanceVtbl kBottomInstanceFunctions = {
+@@ -902,6 +918,7 @@ const InstanceVtbl kBottomInstanceFunctions = {
// clang-format on
};
@@ -3361,5 +3364,5 @@
} // namespace null_driver
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0025-vulkan-Update-from-version-0.204.0-to-0.205.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0025-vulkan-Update-from-version-0.204.0-to-0.205.0.patch
index 6174a64..6448aa1 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0025-vulkan-Update-from-version-0.204.0-to-0.205.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0025-vulkan-Update-from-version-0.204.0-to-0.205.0.patch
@@ -1,4 +1,4 @@
-From 091923b2022e23b128e8de404cef2b7f70e80b8e Mon Sep 17 00:00:00 2001
+From 052ac57d4c70d934d76fb5cd94278c326e623963 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Mon, 30 Nov 2015 11:37:59 -0800
Subject: [PATCH 25/30] vulkan: Update from version 0.204.0 to 0.205.0
@@ -577,5 +577,5 @@
Swapchain* swapchain = SwapchainFromHandle(swapchain_handle);
const std::shared_ptr<ANativeWindow>& window = swapchain->surface.window;
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0026-vulkan-Update-from-version-0.205.0-to-0.206.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0026-vulkan-Update-from-version-0.205.0-to-0.206.0.patch
index f79ee4e..747aee8 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0026-vulkan-Update-from-version-0.205.0-to-0.206.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0026-vulkan-Update-from-version-0.205.0-to-0.206.0.patch
@@ -1,4 +1,4 @@
-From 63b94206122e3a7e1175471be20ee22d445ee201 Mon Sep 17 00:00:00 2001
+From c7d7dcfffafda197458d6c4afebb486bd64e0d53 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Mon, 30 Nov 2015 14:25:46 -0800
Subject: [PATCH 26/30] vulkan: Update from version 0.205.0 to 0.206.0
@@ -288,5 +288,5 @@
frameworks/native/vulkan/include
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0027-vulkan-Update-from-version-0.206.0-to-0.209.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0027-vulkan-Update-from-version-0.206.0-to-0.209.0.patch
index fe01c4f..085393a 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0027-vulkan-Update-from-version-0.206.0-to-0.209.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0027-vulkan-Update-from-version-0.206.0-to-0.209.0.patch
@@ -1,4 +1,4 @@
-From 6b46fedd72f5168b95519afeeeb74c92c663affe Mon Sep 17 00:00:00 2001
+From 91b3c3599ea5095388c4bdeb14f09529f3fbb9cc Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Mon, 30 Nov 2015 16:04:55 -0800
Subject: [PATCH 27/30] vulkan: Update from version 0.206.0 to 0.209.0
@@ -1437,5 +1437,5 @@
VkResult result;
int err;
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0028-vulkan-Update-from-version-0.209.0-to-0.210.0.patch b/vulkan/patches/frameworks_native-sdk_0.10/0028-vulkan-Update-from-version-0.209.0-to-0.210.0.patch
index b42fc0b..ee898f6 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0028-vulkan-Update-from-version-0.209.0-to-0.210.0.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0028-vulkan-Update-from-version-0.209.0-to-0.210.0.patch
@@ -1,4 +1,4 @@
-From 9b545cb7b82a038b6da6355b742da425cbfd05fb Mon Sep 17 00:00:00 2001
+From 5fa30181e473f9055884404545e7345c75440e64 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Mon, 30 Nov 2015 16:22:16 -0800
Subject: [PATCH 28/30] vulkan: Update from version 0.209.0 to 0.210.0
@@ -287,5 +287,5 @@
reinterpret_cast<{{Macro "FunctionPtrName" $f}}>(§
get_proc_addr(device, "{{Macro "FunctionName" $f}}"));
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0029-vulkan-Assign-enums-to-the-correct-extension.patch b/vulkan/patches/frameworks_native-sdk_0.10/0029-vulkan-Assign-enums-to-the-correct-extension.patch
index 9113680..9020e94 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0029-vulkan-Assign-enums-to-the-correct-extension.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0029-vulkan-Assign-enums-to-the-correct-extension.patch
@@ -1,15 +1,15 @@
-From f0429ae266f2738835c80808a3ae4133165bcff5 Mon Sep 17 00:00:00 2001
+From 727391c1b5b3de78128cd204373d14ecdab34801 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Mon, 30 Nov 2015 21:12:55 -0800
Subject: [PATCH 29/30] vulkan: Assign enums to the correct extension
Change-Id: I9ba61b9bfe349f7079833de89d66aa4a2e993e2f
---
- vulkan/api/vulkan.api | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ vulkan/api/vulkan.api | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/vulkan/api/vulkan.api b/vulkan/api/vulkan.api
-index 243951d..63188d5 100644
+index 243951d..45a5eb6 100644
--- a/vulkan/api/vulkan.api
+++ b/vulkan/api/vulkan.api
@@ -690,7 +690,7 @@ enum VkDynamicState {
@@ -30,15 +30,18 @@
enum VkColorSpaceKHR {
VK_COLORSPACE_SRGB_NONLINEAR_KHR = 0x00000000,
}
-@@ -1142,7 +1142,7 @@ bitfield VkCullModeFlagBits {
+@@ -1142,9 +1142,9 @@ bitfield VkCullModeFlagBits {
VK_CULL_MODE_FRONT_AND_BACK = 0x00000003,
}
-@extension("VK_KHR_swapchain")
+@extension("VK_KHR_surface")
type VkFlags VkSurfaceTransformFlagsKHR
- @extension("VK_KHR_swapchain")
+-@extension("VK_KHR_swapchain")
++@extension("VK_KHR_surface")
bitfield VkSurfaceTransformFlagBitsKHR {
+ VK_SURFACE_TRANSFORM_NONE_BIT_KHR = 0x00000001,
+ VK_SURFACE_TRANSFORM_ROTATE_90_BIT_KHR = 0x00000002,
@@ -1157,9 +1157,9 @@ bitfield VkSurfaceTransformFlagBitsKHR {
VK_SURFACE_TRANSFORM_INHERIT_BIT_KHR = 0x00000100,
}
@@ -51,6 +54,15 @@
bitfield VkCompositeAlphaFlagBitsKHR {
VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR = 0x00000001,
VK_COMPOSITE_ALPHA_PRE_MULTIPLIED_BIT_KHR = 0x00000002,
+@@ -4870,7 +4870,7 @@ cmd VkResult vkCreateXCBSurfaceKHR(
+ return ?
+ }
+
+-@extension("VK_KHR_xlib_surface")
++@extension("VK_KHR_xcb_surface")
+ cmd VkBool32 vkGetPhysicalDeviceXcbPresentationSupportKHR(
+ VkPhysicalDevice physicalDevice,
+ u32 queueFamilyIndex,
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0
diff --git a/vulkan/patches/frameworks_native-sdk_0.10/0030-vulkan-Update-from-version-0.210.0-to-0.210.1.patch b/vulkan/patches/frameworks_native-sdk_0.10/0030-vulkan-Update-from-version-0.210.0-to-0.210.1.patch
index a5c11b5..cff9edd 100644
--- a/vulkan/patches/frameworks_native-sdk_0.10/0030-vulkan-Update-from-version-0.210.0-to-0.210.1.patch
+++ b/vulkan/patches/frameworks_native-sdk_0.10/0030-vulkan-Update-from-version-0.210.0-to-0.210.1.patch
@@ -1,4 +1,4 @@
-From 1bed42cafc4ee646dd964d99749dabd45399667a Mon Sep 17 00:00:00 2001
+From 871aab516eafee2ede88b095dad6670b06ab6f8a Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Mon, 30 Nov 2015 21:44:14 -0800
Subject: [PATCH 30/30] vulkan: Update from version 0.210.0 to 0.210.1
@@ -12,7 +12,7 @@
4 files changed, 42 insertions(+), 49 deletions(-)
diff --git a/vulkan/api/vulkan.api b/vulkan/api/vulkan.api
-index 63188d5..b31e6a2 100644
+index 45a5eb6..0d56145 100644
--- a/vulkan/api/vulkan.api
+++ b/vulkan/api/vulkan.api
@@ -28,7 +28,7 @@ import platform "platform.api"
@@ -208,5 +208,5 @@
frameworks/native/vulkan/include
--
-2.4.0
+2.6.0.rc2.230.g3dd15c0