vulkan: Update from version 0.198.0 to 0.200.0
Change-Id: I071a9143332dd8b8c2ef899105073ed8791fc5db
(cherry picked from commit 9568691bea351152b340c0cbb3d31e5246ac469b)
diff --git a/vulkan/libvulkan/entry.cpp b/vulkan/libvulkan/entry.cpp
index 2b7faa9..9037e17 100644
--- a/vulkan/libvulkan/entry.cpp
+++ b/vulkan/libvulkan/entry.cpp
@@ -347,16 +347,6 @@
}
__attribute__((visibility("default")))
-VkResult vkCreateShader(VkDevice device, const VkShaderCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkShader* pShader) {
- return GetVtbl(device).CreateShader(device, pCreateInfo, pAllocator, pShader);
-}
-
-__attribute__((visibility("default")))
-void vkDestroyShader(VkDevice device, VkShader shader, const VkAllocationCallbacks* pAllocator) {
- GetVtbl(device).DestroyShader(device, shader, pAllocator);
-}
-
-__attribute__((visibility("default")))
VkResult vkCreatePipelineCache(VkDevice device, const VkPipelineCacheCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPipelineCache* pPipelineCache) {
return GetVtbl(device).CreatePipelineCache(device, pCreateInfo, pAllocator, pPipelineCache);
}
diff --git a/vulkan/libvulkan/entry.cpp.tmpl b/vulkan/libvulkan/entry.cpp.tmpl
index 5aed3df..712558b 100644
--- a/vulkan/libvulkan/entry.cpp.tmpl
+++ b/vulkan/libvulkan/entry.cpp.tmpl
@@ -94,9 +94,9 @@
{{$ext := GetAnnotation $ "extension"}}
{{if $ext}}
{{$extval := index $ext.Arguments 0}}
- {{if eq $extval "VK_EXT_KHR_surface"}}true
- {{else if eq $extval "VK_EXT_KHR_swapchain"}}true
- {{else if eq $extval "VK_EXT_KHR_android_surface"}}true{{end}}
+ {{if eq $extval "VK_KHR_surface"}}true
+ {{else if eq $extval "VK_KHR_swapchain"}}true
+ {{else if eq $extval "VK_KHR_android_surface"}}true{{end}}
{{else}}true{{end}}
{{end}}
diff --git a/vulkan/libvulkan/get_proc_addr.cpp b/vulkan/libvulkan/get_proc_addr.cpp
index f6a6510..7f1f54e 100644
--- a/vulkan/libvulkan/get_proc_addr.cpp
+++ b/vulkan/libvulkan/get_proc_addr.cpp
@@ -142,7 +142,6 @@
{"vkCreateRenderPass", reinterpret_cast<PFN_vkVoidFunction>(vkCreateRenderPass)},
{"vkCreateSampler", reinterpret_cast<PFN_vkVoidFunction>(vkCreateSampler)},
{"vkCreateSemaphore", reinterpret_cast<PFN_vkVoidFunction>(vkCreateSemaphore)},
- {"vkCreateShader", reinterpret_cast<PFN_vkVoidFunction>(vkCreateShader)},
{"vkCreateShaderModule", reinterpret_cast<PFN_vkVoidFunction>(vkCreateShaderModule)},
{"vkCreateSwapchainKHR", reinterpret_cast<PFN_vkVoidFunction>(vkCreateSwapchainKHR)},
{"vkDestroyBuffer", reinterpret_cast<PFN_vkVoidFunction>(vkDestroyBuffer)},
@@ -163,7 +162,6 @@
{"vkDestroyRenderPass", reinterpret_cast<PFN_vkVoidFunction>(vkDestroyRenderPass)},
{"vkDestroySampler", reinterpret_cast<PFN_vkVoidFunction>(vkDestroySampler)},
{"vkDestroySemaphore", reinterpret_cast<PFN_vkVoidFunction>(vkDestroySemaphore)},
- {"vkDestroyShader", reinterpret_cast<PFN_vkVoidFunction>(vkDestroyShader)},
{"vkDestroyShaderModule", reinterpret_cast<PFN_vkVoidFunction>(vkDestroyShaderModule)},
{"vkDestroySwapchainKHR", reinterpret_cast<PFN_vkVoidFunction>(vkDestroySwapchainKHR)},
{"vkDeviceWaitIdle", reinterpret_cast<PFN_vkVoidFunction>(vkDeviceWaitIdle)},
@@ -299,7 +297,6 @@
{"vkCreateRenderPass", offsetof(DeviceVtbl, CreateRenderPass)},
{"vkCreateSampler", offsetof(DeviceVtbl, CreateSampler)},
{"vkCreateSemaphore", offsetof(DeviceVtbl, CreateSemaphore)},
- {"vkCreateShader", offsetof(DeviceVtbl, CreateShader)},
{"vkCreateShaderModule", offsetof(DeviceVtbl, CreateShaderModule)},
{"vkCreateSwapchainKHR", offsetof(DeviceVtbl, CreateSwapchainKHR)},
{"vkDestroyBuffer", offsetof(DeviceVtbl, DestroyBuffer)},
@@ -320,7 +317,6 @@
{"vkDestroyRenderPass", offsetof(DeviceVtbl, DestroyRenderPass)},
{"vkDestroySampler", offsetof(DeviceVtbl, DestroySampler)},
{"vkDestroySemaphore", offsetof(DeviceVtbl, DestroySemaphore)},
- {"vkDestroyShader", offsetof(DeviceVtbl, DestroyShader)},
{"vkDestroyShaderModule", offsetof(DeviceVtbl, DestroyShaderModule)},
{"vkDestroySwapchainKHR", offsetof(DeviceVtbl, DestroySwapchainKHR)},
{"vkDeviceWaitIdle", offsetof(DeviceVtbl, DeviceWaitIdle)},
@@ -725,16 +721,6 @@
ALOGE("missing device proc: %s", "vkDestroyShaderModule");
success = false;
}
- vtbl.CreateShader = reinterpret_cast<PFN_vkCreateShader>(get_proc_addr(device, "vkCreateShader"));
- if (UNLIKELY(!vtbl.CreateShader)) {
- ALOGE("missing device proc: %s", "vkCreateShader");
- success = false;
- }
- vtbl.DestroyShader = reinterpret_cast<PFN_vkDestroyShader>(get_proc_addr(device, "vkDestroyShader"));
- if (UNLIKELY(!vtbl.DestroyShader)) {
- ALOGE("missing device proc: %s", "vkDestroyShader");
- success = false;
- }
vtbl.CreatePipelineCache = reinterpret_cast<PFN_vkCreatePipelineCache>(get_proc_addr(device, "vkCreatePipelineCache"));
if (UNLIKELY(!vtbl.CreatePipelineCache)) {
ALOGE("missing device proc: %s", "vkCreatePipelineCache");
@@ -1166,7 +1152,7 @@
vtbl.QueueSignalNativeFenceANDROID = reinterpret_cast<PFN_vkQueueSignalNativeFenceANDROID>(get_proc_addr(device, "vkQueueSignalNativeFenceANDROID"));
if (!((!vtbl.AcquireImageANDROID && !vtbl.QueueSignalReleaseImageANDROID && vtbl.ImportNativeFenceANDROID && vtbl.QueueSignalNativeFenceANDROID) ||
(vtbl.AcquireImageANDROID && vtbl.QueueSignalReleaseImageANDROID && !vtbl.ImportNativeFenceANDROID && !vtbl.QueueSignalNativeFenceANDROID))) {
- ALOGE("driver doesn't support exactly one of old- or new-style VK_EXT_ANDROID_native_buffer commands");
+ ALOGE("driver doesn't support exactly one of old- or new-style VK_ANDROID_native_buffer commands");
success = false;
}
// clang-format on
diff --git a/vulkan/libvulkan/get_proc_addr.cpp.tmpl b/vulkan/libvulkan/get_proc_addr.cpp.tmpl
index 217647f..aad177d 100644
--- a/vulkan/libvulkan/get_proc_addr.cpp.tmpl
+++ b/vulkan/libvulkan/get_proc_addr.cpp.tmpl
@@ -255,7 +255,7 @@
vtbl.QueueSignalNativeFenceANDROID = reinterpret_cast<PFN_vkQueueSignalNativeFenceANDROID>(get_proc_addr(device, "vkQueueSignalNativeFenceANDROID"));
if (!((!vtbl.AcquireImageANDROID && !vtbl.QueueSignalReleaseImageANDROID && vtbl.ImportNativeFenceANDROID && vtbl.QueueSignalNativeFenceANDROID) ||
(vtbl.AcquireImageANDROID && vtbl.QueueSignalReleaseImageANDROID && !vtbl.ImportNativeFenceANDROID && !vtbl.QueueSignalNativeFenceANDROID))) {
- ALOGE("driver doesn't support exactly one of old- or new-style VK_EXT_ANDROID_native_buffer commands");
+ ALOGE("driver doesn't support exactly one of old- or new-style VK_ANDROID_native_buffer commands");
success = false;
}
// clang-format on
@@ -277,13 +277,13 @@
*/}}
{{define "IsUnsupportedExtension"}}
{{$ext := index $.Arguments 0}}
- {{ if eq $ext "VK_EXT_KHR_display"}}true
- {{else if eq $ext "VK_EXT_KHR_display_swapchain"}}true
- {{else if eq $ext "VK_EXT_KHR_xlib_surface"}}true
- {{else if eq $ext "VK_EXT_KHR_xcb_surface"}}true
- {{else if eq $ext "VK_EXT_KHR_wayland_surface"}}true
- {{else if eq $ext "VK_EXT_KHR_mir_surface"}}true
- {{else if eq $ext "VK_EXT_KHR_win32_surface"}}true
+ {{ if eq $ext "VK_KHR_display"}}true
+ {{else if eq $ext "VK_KHR_display_swapchain"}}true
+ {{else if eq $ext "VK_KHR_xlib_surface"}}true
+ {{else if eq $ext "VK_KHR_xcb_surface"}}true
+ {{else if eq $ext "VK_KHR_wayland_surface"}}true
+ {{else if eq $ext "VK_KHR_mir_surface"}}true
+ {{else if eq $ext "VK_KHR_win32_surface"}}true
{{end}}
{{end}}
diff --git a/vulkan/libvulkan/loader.h b/vulkan/libvulkan/loader.h
index bf71c8f..5765d65 100644
--- a/vulkan/libvulkan/loader.h
+++ b/vulkan/libvulkan/loader.h
@@ -20,7 +20,7 @@
#define VK_PROTOTYPES
#define VK_USE_PLATFORM_ANDROID_KHR
#include <vulkan/vulkan.h>
-#include <vulkan/vk_ext_android_native_buffer.h>
+#include <vulkan/vk_android_native_buffer.h>
namespace vulkan {
@@ -105,8 +105,6 @@
PFN_vkDestroyImageView DestroyImageView;
PFN_vkCreateShaderModule CreateShaderModule;
PFN_vkDestroyShaderModule DestroyShaderModule;
- PFN_vkCreateShader CreateShader;
- PFN_vkDestroyShader DestroyShader;
PFN_vkCreatePipelineCache CreatePipelineCache;
PFN_vkDestroyPipelineCache DestroyPipelineCache;
PFN_vkGetPipelineCacheData GetPipelineCacheData;