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 <nanley.g.chery@intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>

diff --git a/src/intel/vulkan/anv_meta.h b/src/intel/vulkan/anv_meta.h
index 5616252b5a4b58b62b63c84d0b04978d83bef048..6bd5c1dfba233d0173962df9670212c0cfd05e34 100644 (file)
--- 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 7bddc6b2d4267b59d494ed491d52926f2c65a144..09e2dbb29185fc110d1ca66383772d9b55b72cea 100644 (file)
--- 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,