Module: Mesa
Branch: vulkan
Commit: b487acc489afc277a7611f14e7319bc7340e7777
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b487acc489afc277a7611f14e7319bc7340e7777
Author: Nanley Chery <nanley.g.ch...@intel.com>
Date: Fri Mar 11 16:26:28 2016 -0800
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.ch...@intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstr...@intel.com>
---
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 5616252..6bd5c1d 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 7bddc6b..09e2dbb 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,
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
