From b487acc489afc277a7611f14e7319bc7340e7777 Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Fri, 11 Mar 2016 16:26:28 -0800 Subject: Revert "anv/meta: Make meta_emit_blit() public" This reverts commit f39168392243d6dacefbc8708b764c5978ff24df. Some conflicts had to be resolved in order for this revert to be successful. Signed-off-by: Nanley Chery Reviewed-by: Jason Ekstrand --- src/intel/vulkan/anv_meta.h | 11 ----------- src/intel/vulkan/anv_meta_blit.c | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/intel/vulkan/anv_meta.h b/src/intel/vulkan/anv_meta.h index 5616252b5a4..6bd5c1dfba2 100644 --- a/src/intel/vulkan/anv_meta.h +++ b/src/intel/vulkan/anv_meta.h @@ -108,17 +108,6 @@ void anv_meta_end_blit2d(struct anv_cmd_buffer *cmd_buffer, struct anv_meta_saved_state *save); -void -meta_emit_blit(struct anv_cmd_buffer *cmd_buffer, - struct anv_image *src_image, - struct anv_image_view *src_iview, - VkOffset3D src_offset, - VkExtent3D src_extent, - struct anv_image *dest_image, - struct anv_image_view *dest_iview, - VkOffset3D dest_offset, - VkExtent3D dest_extent, - VkFilter blit_filter); #ifdef __cplusplus } #endif diff --git a/src/intel/vulkan/anv_meta_blit.c b/src/intel/vulkan/anv_meta_blit.c index 7bddc6b2d42..09e2dbb2918 100644 --- a/src/intel/vulkan/anv_meta_blit.c +++ b/src/intel/vulkan/anv_meta_blit.c @@ -119,7 +119,7 @@ meta_prepare_blit(struct anv_cmd_buffer *cmd_buffer, (1 << VK_DYNAMIC_STATE_VIEWPORT)); } -void +static void meta_emit_blit(struct anv_cmd_buffer *cmd_buffer, struct anv_image *src_image, struct anv_image_view *src_iview, -- cgit v1.2.3