From beb0e253275d320e11657f725c1bf6c1d4ffc5dd Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 1 Jul 2015 16:44:10 -0700 Subject: [PATCH] vk: Roll back to API v90 This is what version 0.1 of the Vulkan SDK is built against. --- include/vulkan/vulkan.h | 6 +++--- src/vulkan/meta.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index e5be978c6d3..3e729963e7c 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -33,7 +33,7 @@ #include "vk_platform.h" // Vulkan API version supported by this file -#define VK_API_VERSION VK_MAKE_VERSION(0, 91, 0) +#define VK_API_VERSION VK_MAKE_VERSION(0, 90, 0) #ifdef __cplusplus extern "C" @@ -2220,7 +2220,7 @@ typedef void (VKAPI *PFN_vkCmdCopyImageToBuffer)(VkCmdBuffer cmdBuffer, VkIm typedef void (VKAPI *PFN_vkCmdCloneImageData)(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout); typedef void (VKAPI *PFN_vkCmdUpdateBuffer)(VkCmdBuffer cmdBuffer, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize dataSize, const uint32_t* pData); typedef void (VKAPI *PFN_vkCmdFillBuffer)(VkCmdBuffer cmdBuffer, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize fillSize, uint32_t data); -typedef void (VKAPI *PFN_vkCmdClearColorImage)(VkCmdBuffer cmdBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColor* color, uint32_t rangeCount, const VkImageSubresourceRange* pRanges); +typedef void (VKAPI *PFN_vkCmdClearColorImage)(VkCmdBuffer cmdBuffer, VkImage image, VkImageLayout imageLayout, VkClearColor color, uint32_t rangeCount, const VkImageSubresourceRange* pRanges); typedef void (VKAPI *PFN_vkCmdClearDepthStencil)(VkCmdBuffer cmdBuffer, VkImage image, VkImageLayout imageLayout, float depth, uint32_t stencil, uint32_t rangeCount, const VkImageSubresourceRange* pRanges); typedef void (VKAPI *PFN_vkCmdResolveImage)(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkImageResolve* pRegions); typedef void (VKAPI *PFN_vkCmdSetEvent)(VkCmdBuffer cmdBuffer, VkEvent event, VkPipeEvent pipeEvent); @@ -2853,7 +2853,7 @@ void VKAPI vkCmdClearColorImage( VkCmdBuffer cmdBuffer, VkImage image, VkImageLayout imageLayout, - const VkClearColor* color, + VkClearColor color, uint32_t rangeCount, const VkImageSubresourceRange* pRanges); diff --git a/src/vulkan/meta.c b/src/vulkan/meta.c index 2167d29da6a..afda3bcd4a6 100644 --- a/src/vulkan/meta.c +++ b/src/vulkan/meta.c @@ -1191,7 +1191,7 @@ void anv_CmdClearColorImage( VkCmdBuffer cmdBuffer, VkImage image, VkImageLayout imageLayout, - const VkClearColor* color, + VkClearColor color, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) { -- 2.30.2