From e9034ed875b7b370319241c623a811da0292811a Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Wed, 8 Jul 2015 12:46:35 -0700 Subject: [PATCH] vk/0.130: Update vkCmdBlitImage signature Add VkTexFilter param. Ignored for now. --- include/vulkan/vulkan.h | 5 +++-- src/vulkan/meta.c | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index 2c45b201e15..eee665d1dac 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -1983,7 +1983,7 @@ typedef void (VKAPI *PFN_vkCmdDispatch)(VkCmdBuffer cmdBuffer, uint32_t x, uint3 typedef void (VKAPI *PFN_vkCmdDispatchIndirect)(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset); typedef void (VKAPI *PFN_vkCmdCopyBuffer)(VkCmdBuffer cmdBuffer, VkBuffer srcBuffer, VkBuffer destBuffer, uint32_t regionCount, const VkBufferCopy* pRegions); typedef void (VKAPI *PFN_vkCmdCopyImage)(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkImageCopy* pRegions); -typedef void (VKAPI *PFN_vkCmdBlitImage)(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkImageBlit* pRegions); +typedef void (VKAPI *PFN_vkCmdBlitImage)(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkTexFilter filter); typedef void (VKAPI *PFN_vkCmdCopyBufferToImage)(VkCmdBuffer cmdBuffer, VkBuffer srcBuffer, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkBufferImageCopy* pRegions); typedef void (VKAPI *PFN_vkCmdCopyImageToBuffer)(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer destBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions); typedef void (VKAPI *PFN_vkCmdUpdateBuffer)(VkCmdBuffer cmdBuffer, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize dataSize, const uint32_t* pData); @@ -2480,7 +2480,8 @@ void VKAPI vkCmdBlitImage( VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, - const VkImageBlit* pRegions); + const VkImageBlit* pRegions, + VkTexFilter filter); void VKAPI vkCmdCopyBufferToImage( VkCmdBuffer cmdBuffer, diff --git a/src/vulkan/meta.c b/src/vulkan/meta.c index b759510e992..d28468ff173 100644 --- a/src/vulkan/meta.c +++ b/src/vulkan/meta.c @@ -920,13 +920,17 @@ void anv_CmdBlitImage( VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, - const VkImageBlit* pRegions) + const VkImageBlit* pRegions, + VkTexFilter filter) + { struct anv_cmd_buffer *cmd_buffer = (struct anv_cmd_buffer *)cmdBuffer; struct anv_image *src_image = (struct anv_image *)srcImage; struct anv_image *dest_image = (struct anv_image *)destImage; struct anv_saved_state saved_state; + anv_finishme("respect VkTexFilter"); + meta_prepare_blit(cmd_buffer, &saved_state); for (unsigned r = 0; r < regionCount; r++) { -- 2.30.2