From f2700d665c99c45ab79c3cb42dad24c0c3c13edd Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Wed, 13 Jan 2016 14:09:36 -0800 Subject: [PATCH] anv/meta: Rename emit_load_*_clear funcs The functions will soon handle clears unrelated to VK_ATTACHMENT_LOAD_OP_CLEAR, namely vkCmdClearAttachments. So remove "load" from their name: emit_load_color_clear -> emit_color_clear emit_load_depthstencil_clear -> emit_depthstencil_clear --- src/vulkan/anv_meta_clear.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/vulkan/anv_meta_clear.c b/src/vulkan/anv_meta_clear.c index 43303fbd616..9a572ba984b 100644 --- a/src/vulkan/anv_meta_clear.c +++ b/src/vulkan/anv_meta_clear.c @@ -293,9 +293,9 @@ init_color_pipeline(struct anv_device *device) } static void -emit_load_color_clear(struct anv_cmd_buffer *cmd_buffer, - uint32_t attachment, - VkClearColorValue clear_value) +emit_color_clear(struct anv_cmd_buffer *cmd_buffer, + uint32_t attachment, + VkClearColorValue clear_value) { struct anv_device *device = cmd_buffer->device; VkCommandBuffer cmd_buffer_h = anv_cmd_buffer_to_handle(cmd_buffer); @@ -466,10 +466,10 @@ create_depthstencil_pipeline(struct anv_device *device, } static void -emit_load_depthstencil_clear(struct anv_cmd_buffer *cmd_buffer, - uint32_t attachment, - VkImageAspectFlags aspects, - VkClearDepthStencilValue clear_value) +emit_depthstencil_clear(struct anv_cmd_buffer *cmd_buffer, + uint32_t attachment, + VkImageAspectFlags aspects, + VkClearDepthStencilValue clear_value) { struct anv_device *device = cmd_buffer->device; VkCommandBuffer cmd_buffer_h = anv_cmd_buffer_to_handle(cmd_buffer); @@ -652,12 +652,12 @@ emit_clear(struct anv_cmd_buffer *cmd_buffer, const VkClearValue *value) { if (aspects & VK_IMAGE_ASPECT_COLOR_BIT) { - emit_load_color_clear(cmd_buffer, attachment, value->color); + emit_color_clear(cmd_buffer, attachment, value->color); } else { assert(aspects & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)); - emit_load_depthstencil_clear(cmd_buffer, attachment, aspects, - value->depthStencil); + emit_depthstencil_clear(cmd_buffer, attachment, aspects, + value->depthStencil); } } -- 2.30.2