From 605dbeb0730baa0527c0866d425ef96302c7993c Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Thu, 23 Apr 2015 17:49:22 -0600 Subject: bug-13751: Update vkCmdClearColorImage color parameter svn ID: 30918 Change the VkCmdClearColroImage color parameter be a pointer. --- demos/cube.c | 2 +- demos/tri.c | 2 +- icd/nulldrv/nulldrv.c | 12 ++++++------ include/vulkan.h | 9 +++++---- layers/draw_state.cpp | 11 ++++++----- layers/glave_snapshot.c | 4 ++-- layers/mem_tracker.cpp | 4 ++-- layers/param_checker.cpp | 4 ++-- vulkan.py | 2 +- 9 files changed, 26 insertions(+), 24 deletions(-) diff --git a/demos/cube.c b/demos/cube.c index 58a265f7..8dc7ac32 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -526,7 +526,7 @@ static void demo_draw_build_cmd(struct demo *demo, VkCmdBuffer cmd_buf) vkCmdClearColorImage(cmd_buf, demo->buffers[demo->current_buffer].image, VK_IMAGE_LAYOUT_CLEAR_OPTIMAL, - clear_color, 1, &clear_range); + &clear_color, 1, &clear_range); clear_range.aspect = VK_IMAGE_ASPECT_DEPTH; vkCmdClearDepthStencil(cmd_buf, demo->depth.image, diff --git a/demos/tri.c b/demos/tri.c index 0a2a435b..0d640620 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -346,7 +346,7 @@ static void demo_draw_build_cmd(struct demo *demo) vkCmdClearColorImage(demo->draw_cmd, demo->buffers[demo->current_buffer].image, VK_IMAGE_LAYOUT_CLEAR_OPTIMAL, - clear_color, 1, &clear_range); + &clear_color, 1, &clear_range); clear_range.aspect = VK_IMAGE_ASPECT_DEPTH; vkCmdClearDepthStencil(demo->draw_cmd, diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c index a0f3b41c..2788c783 100644 --- a/icd/nulldrv/nulldrv.c +++ b/icd/nulldrv/nulldrv.c @@ -1085,12 +1085,12 @@ ICD_EXPORT void VKAPI vkCmdFillBuffer( } ICD_EXPORT void VKAPI vkCmdClearColorImage( - VkCmdBuffer cmdBuffer, - VkImage image, - VkImageLayout imageLayout, - VkClearColor color, - uint32_t rangeCount, - const VkImageSubresourceRange* pRanges) + VkCmdBuffer cmdBuffer, + VkImage image, + VkImageLayout imageLayout, + const VkClearColor *pColor, + uint32_t rangeCount, + const VkImageSubresourceRange* pRanges) { NULLDRV_LOG_FUNC; } diff --git a/include/vulkan.h b/include/vulkan.h index 28f15096..650d348b 100644 --- a/include/vulkan.h +++ b/include/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, 90, 0) +#define VK_API_VERSION VK_MAKE_VERSION(0, 91, 0) #ifdef __cplusplus extern "C" @@ -2132,7 +2132,7 @@ typedef void * (VKAPI *PFN_vkGetProcAddr)(VkPhysicalDevice physicalDevice, con typedef VkResult (VKAPI *PFN_vkCreateDevice)(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, VkDevice* pDevice); typedef VkResult (VKAPI *PFN_vkDestroyDevice)(VkDevice device); typedef VkResult (VKAPI *PFN_vkGetGlobalExtensionInfo)(VkExtensionInfoType infoType, uint32_t extensionIndex, size_t* pDataSize, void* pData); -typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceExtensionInfo)(VkPhysicalDevice gpu, VkExtensionInfoType infoType, uint32_t extensionIndex, size_t* pDataSize, void* pData); +typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceExtensionInfo)(VkPhysicalDevice physicalDevice, VkExtensionInfoType infoType, uint32_t extensionIndex, size_t* pDataSize, void* pData); typedef VkResult (VKAPI *PFN_vkEnumerateLayers)(VkPhysicalDevice physicalDevice, size_t maxStringSize, size_t* pLayerCount, char* const* pOutLayers, void* pReserved); typedef VkResult (VKAPI *PFN_vkGetDeviceQueue)(VkDevice device, uint32_t queueNodeIndex, uint32_t queueIndex, VkQueue* pQueue); typedef VkResult (VKAPI *PFN_vkQueueSubmit)(VkQueue queue, uint32_t cmdBufferCount, const VkCmdBuffer* pCmdBuffers, VkFence fence); @@ -2222,7 +2222,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, VkClearColor color, uint32_t rangeCount, const VkImageSubresourceRange* pRanges); +typedef void (VKAPI *PFN_vkCmdClearColorImage)(VkCmdBuffer cmdBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColor* pColor, 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); @@ -2279,6 +2279,7 @@ VkResult VKAPI vkDestroyDevice( VkDevice device); // Extension discovery functions + VkResult VKAPI vkGetGlobalExtensionInfo( VkExtensionInfoType infoType, uint32_t extensionIndex, @@ -2854,7 +2855,7 @@ void VKAPI vkCmdClearColorImage( VkCmdBuffer cmdBuffer, VkImage image, VkImageLayout imageLayout, - VkClearColor color, + const VkClearColor* pColor, uint32_t rangeCount, const VkImageSubresourceRange* pRanges); diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index 2af9cbc7..f73e533d 100755 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -2344,10 +2344,11 @@ VK_LAYER_EXPORT void VKAPI vkCmdFillBuffer(VkCmdBuffer cmdBuffer, VkBuffer destB nextTable.CmdFillBuffer(cmdBuffer, destBuffer, destOffset, fillSize, data); } -VK_LAYER_EXPORT void VKAPI vkCmdClearColorImage(VkCmdBuffer cmdBuffer, - VkImage image, VkImageLayout imageLayout, - VkClearColor color, - uint32_t rangeCount, const VkImageSubresourceRange* pRanges) +VK_LAYER_EXPORT void VKAPI vkCmdClearColorImage( + VkCmdBuffer cmdBuffer, + VkImage image, VkImageLayout imageLayout, + const VkClearColor *pColor, + uint32_t rangeCount, const VkImageSubresourceRange* pRanges) { GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer); if (pCB) { @@ -2359,7 +2360,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdClearColorImage(VkCmdBuffer cmdBuffer, sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer); layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str); } - nextTable.CmdClearColorImage(cmdBuffer, image, imageLayout, color, rangeCount, pRanges); + nextTable.CmdClearColorImage(cmdBuffer, image, imageLayout, pColor, rangeCount, pRanges); } VK_LAYER_EXPORT void VKAPI vkCmdClearDepthStencil(VkCmdBuffer cmdBuffer, diff --git a/layers/glave_snapshot.c b/layers/glave_snapshot.c index e7afe57a..c924355e 100644 --- a/layers/glave_snapshot.c +++ b/layers/glave_snapshot.c @@ -1431,12 +1431,12 @@ VK_LAYER_EXPORT void VKAPI vkCmdFillBuffer(VkCmdBuffer cmdBuffer, VkBuffer destB nextTable.CmdFillBuffer(cmdBuffer, destBuffer, destOffset, fillSize, data); } -VK_LAYER_EXPORT void VKAPI vkCmdClearColorImage(VkCmdBuffer cmdBuffer, VkImage image, VkImageLayout imageLayout, VkClearColor color, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) +VK_LAYER_EXPORT void VKAPI vkCmdClearColorImage(VkCmdBuffer cmdBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColor* pColor, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) { loader_platform_thread_lock_mutex(&objLock); ll_increment_use_count((void*)cmdBuffer, VK_OBJECT_TYPE_CMD_BUFFER); loader_platform_thread_unlock_mutex(&objLock); - nextTable.CmdClearColorImage(cmdBuffer, image, imageLayout, color, rangeCount, pRanges); + nextTable.CmdClearColorImage(cmdBuffer, image, imageLayout, pColor, rangeCount, pRanges); } VK_LAYER_EXPORT void VKAPI vkCmdClearDepthStencil(VkCmdBuffer cmdBuffer, VkImage image, VkImageLayout imageLayout, float depth, uint32_t stencil, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp index de5ef197..27f69245 100644 --- a/layers/mem_tracker.cpp +++ b/layers/mem_tracker.cpp @@ -2120,7 +2120,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdClearColorImage( VkCmdBuffer cmdBuffer, VkImage image, VkImageLayout imageLayout, - VkClearColor color, + const VkClearColor *pColor, uint32_t rangeCount, const VkImageSubresourceRange *pRanges) { @@ -2133,7 +2133,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdClearColorImage( layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); } loader_platform_thread_unlock_mutex(&globalLock); - nextTable.CmdClearColorImage(cmdBuffer, image, imageLayout, color, rangeCount, pRanges); + nextTable.CmdClearColorImage(cmdBuffer, image, imageLayout, pColor, rangeCount, pRanges); } VK_LAYER_EXPORT void VKAPI vkCmdClearDepthStencil( diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 73a505f1..f7807142 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -1400,7 +1400,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdFillBuffer(VkCmdBuffer cmdBuffer, VkBuffer destB nextTable.CmdFillBuffer(cmdBuffer, destBuffer, destOffset, fillSize, data); } -VK_LAYER_EXPORT void VKAPI vkCmdClearColorImage(VkCmdBuffer cmdBuffer, VkImage image, VkImageLayout imageLayout, VkClearColor color, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) +VK_LAYER_EXPORT void VKAPI vkCmdClearColorImage(VkCmdBuffer cmdBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColor* pColor, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) { char str[1024]; if (!validate_VkImageLayout(imageLayout)) { @@ -1414,7 +1414,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdClearColorImage(VkCmdBuffer cmdBuffer, VkImage i layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, NULL, 0, 1, "PARAMCHECK", str); } } - nextTable.CmdClearColorImage(cmdBuffer, image, imageLayout, color, rangeCount, pRanges); + nextTable.CmdClearColorImage(cmdBuffer, image, imageLayout, pColor, rangeCount, pRanges); } VK_LAYER_EXPORT void VKAPI vkCmdClearDepthStencil(VkCmdBuffer cmdBuffer, VkImage image, VkImageLayout imageLayout, float depth, uint32_t stencil, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) diff --git a/vulkan.py b/vulkan.py index e77a662f..7aad8c93 100755 --- a/vulkan.py +++ b/vulkan.py @@ -777,7 +777,7 @@ core = Extension( [Param("VkCmdBuffer", "cmdBuffer"), Param("VkImage", "image"), Param("VkImageLayout", "imageLayout"), - Param("VkClearColor", "color"), + Param("const VkClearColor*", "pColor"), Param("uint32_t", "rangeCount"), Param("const VkImageSubresourceRange*", "pRanges")]), -- cgit v1.2.3