From afa7ca0f7764a049b0ff870fb6964207393be533 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 3 Aug 2016 11:37:24 -0700 Subject: [PATCH] anv/clear: Make cmd_clear_image take an actual VkClearValue Signed-off-by: Jason Ekstrand Reviewed-by: Nanley Chery Cc: "12.0" --- src/intel/vulkan/anv_meta_clear.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/intel/vulkan/anv_meta_clear.c b/src/intel/vulkan/anv_meta_clear.c index e399498..fa07ec1 100644 --- a/src/intel/vulkan/anv_meta_clear.c +++ b/src/intel/vulkan/anv_meta_clear.c @@ -754,7 +754,7 @@ static void anv_cmd_clear_image(struct anv_cmd_buffer *cmd_buffer, struct anv_image *image, VkImageLayout image_layout, - const VkClearValue *clear_value, + VkClearValue clear_value, uint32_t range_count, const VkImageSubresourceRange *ranges) { @@ -864,7 +864,7 @@ anv_cmd_clear_image(struct anv_cmd_buffer *cmd_buffer, VkClearAttachment clear_att = { .aspectMask = range->aspectMask, .colorAttachment = 0, - .clearValue = *clear_value, + .clearValue = clear_value, }; VkClearRect clear_rect = { @@ -903,7 +903,7 @@ void anv_CmdClearColorImage( meta_clear_begin(&saved_state, cmd_buffer); anv_cmd_clear_image(cmd_buffer, image, imageLayout, - (const VkClearValue *) pColor, + (VkClearValue) { .color = *pColor }, rangeCount, pRanges); meta_clear_end(&saved_state, cmd_buffer); @@ -924,7 +924,7 @@ void anv_CmdClearDepthStencilImage( meta_clear_begin(&saved_state, cmd_buffer); anv_cmd_clear_image(cmd_buffer, image, imageLayout, - (const VkClearValue *) pDepthStencil, + (VkClearValue) { .depthStencil = *pDepthStencil }, rangeCount, pRanges); meta_clear_end(&saved_state, cmd_buffer); @@ -1005,7 +1005,7 @@ do_buffer_fill(struct anv_cmd_buffer *cmd_buffer, anv_cmd_clear_image(cmd_buffer, anv_image_from_handle(dest_image), VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, - &clear_value, 1, &range); + clear_value, 1, &range); } void anv_CmdFillBuffer( -- 2.7.4