From: Nanley Chery Date: Sat, 12 Mar 2016 00:25:02 +0000 (-0800) Subject: Revert "anv/meta: Prefix anv_ to meta_emit_blit()" X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1a0c63b8804812081d660642539bb411dc560992;p=mesa.git Revert "anv/meta: Prefix anv_ to meta_emit_blit()" This reverts commit 514c0557178b0325c59a28d68b0f250f0eeaddf5. Signed-off-by: Nanley Chery Reviewed-by: Jason Ekstrand --- diff --git a/src/intel/vulkan/anv_meta.h b/src/intel/vulkan/anv_meta.h index 98888aea87f..5616252b5a4 100644 --- a/src/intel/vulkan/anv_meta.h +++ b/src/intel/vulkan/anv_meta.h @@ -109,7 +109,7 @@ anv_meta_end_blit2d(struct anv_cmd_buffer *cmd_buffer, struct anv_meta_saved_state *save); void -anv_meta_emit_blit(struct anv_cmd_buffer *cmd_buffer, +meta_emit_blit(struct anv_cmd_buffer *cmd_buffer, struct anv_image *src_image, struct anv_image_view *src_iview, VkOffset3D src_offset, diff --git a/src/intel/vulkan/anv_meta_blit.c b/src/intel/vulkan/anv_meta_blit.c index 2c3c91733a7..7bddc6b2d42 100644 --- a/src/intel/vulkan/anv_meta_blit.c +++ b/src/intel/vulkan/anv_meta_blit.c @@ -120,7 +120,7 @@ meta_prepare_blit(struct anv_cmd_buffer *cmd_buffer, } void -anv_meta_emit_blit(struct anv_cmd_buffer *cmd_buffer, +meta_emit_blit(struct anv_cmd_buffer *cmd_buffer, struct anv_image *src_image, struct anv_image_view *src_iview, VkOffset3D src_offset, @@ -438,7 +438,7 @@ void anv_CmdBlitImage( }, cmd_buffer, 0, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); - anv_meta_emit_blit(cmd_buffer, + meta_emit_blit(cmd_buffer, src_image, &src_iview, pRegions[r].srcOffsets[0], src_extent, dest_image, &dest_iview,