From: Chad Versace <chad.versace@intel.com>
Date: Tue, 14 Jul 2015 17:08:04 +0000 (-0700)
Subject: vk/0.132: Add vkDestroyImage()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dd67c134ade2fe7ee7b4a4db7a68f6d89560f37e;p=mesa.git

vk/0.132: Add vkDestroyImage()

We only need to add it to vulkan.h because Jason defined the function
earlier in image.c.
---

diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index d4a0469aa30..c4ab8c7da2a 100644
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -2030,6 +2030,7 @@ typedef VkResult (VKAPI *PFN_vkCreateBuffer)(VkDevice device, const VkBufferCrea
 typedef VkResult (VKAPI *PFN_vkDestroyBuffer)(VkDevice device, VkBuffer buffer);
 typedef VkResult (VKAPI *PFN_vkCreateBufferView)(VkDevice device, const VkBufferViewCreateInfo* pCreateInfo, VkBufferView* pView);
 typedef VkResult (VKAPI *PFN_vkCreateImage)(VkDevice device, const VkImageCreateInfo* pCreateInfo, VkImage* pImage);
+typedef VkResult (VKAPI *PFN_vkDestroyImage)(VkDevice device, VkImage image);
 typedef VkResult (VKAPI *PFN_vkGetImageSubresourceLayout)(VkDevice device, VkImage image, const VkImageSubresource* pSubresource, VkSubresourceLayout* pLayout);
 typedef VkResult (VKAPI *PFN_vkCreateImageView)(VkDevice device, const VkImageViewCreateInfo* pCreateInfo, VkImageView* pView);
 typedef VkResult (VKAPI *PFN_vkCreateColorAttachmentView)(VkDevice device, const VkColorAttachmentViewCreateInfo* pCreateInfo, VkColorAttachmentView* pView);
@@ -2361,6 +2362,10 @@ VkResult VKAPI vkCreateImage(
     const VkImageCreateInfo*                    pCreateInfo,
     VkImage*                                    pImage);
 
+VkResult VKAPI vkDestroyImage(
+    VkDevice                                    device,
+    VkImage                                     image);
+
 VkResult VKAPI vkGetImageSubresourceLayout(
     VkDevice                                    device,
     VkImage                                     image,
diff --git a/src/vulkan/private.h b/src/vulkan/private.h
index c853a0f5f58..6b0576440b5 100644
--- a/src/vulkan/private.h
+++ b/src/vulkan/private.h
@@ -944,7 +944,6 @@ anv_cmd_buffer_clear(struct anv_cmd_buffer *cmd_buffer,
 void *
 anv_lookup_entrypoint(const char *name);
 
-VkResult anv_DestroyImage(VkDevice device, VkImage image);
 VkResult anv_DestroyImageView(VkDevice device, VkImageView imageView);
 VkResult anv_DestroyBufferView(VkDevice device, VkBufferView bufferView);
 VkResult anv_DestroyColorAttachmentView(VkDevice device,