layers: Fix circular make depency
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 26838f0..121f583 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -4548,6 +4548,27 @@
return skip;
}
+// Print readable FlagBits in FlagMask
+std::string string_VkAccessFlags(VkAccessFlags accessMask)
+{
+ std::string result;
+ std::string separator;
+
+ if (accessMask == 0) {
+ result = "[None]";
+ } else {
+ result = "[";
+ for (auto i = 0; i < 32; i++) {
+ if (accessMask & (1 << i)) {
+ result = result + separator + string_VkAccessFlagBits((VkAccessFlagBits)(1 << i));
+ separator = " | ";
+ }
+ }
+ result = result + "]";
+ }
+ return result;
+}
+
// AccessFlags MUST have 'required_bit' set, and may have one or more of 'optional_bits' set.
// If required_bit is zero, accessMask must have at least one of 'optional_bits' set
VkBool32 ValidateMaskBits(const layer_data* my_data, VkCommandBuffer cmdBuffer, const VkAccessFlags& accessMask, const VkImageLayout& layout,
diff --git a/layers/vk_layer_utils.cpp b/layers/vk_layer_utils.cpp
index 568d3b0..36e3904 100644
--- a/layers/vk_layer_utils.cpp
+++ b/layers/vk_layer_utils.cpp
@@ -577,24 +577,3 @@
{
return vk_format_table[format].channel_count;
}
-
-// Print readable FlagBits in FlagMask
-std::string string_VkAccessFlags(VkAccessFlags accessMask)
-{
- std::string result;
- std::string separator;
-
- if (accessMask == 0) {
- result = "[None]";
- } else {
- result = "[";
- for (auto i = 0; i < 32; i++) {
- if (accessMask & (1 << i)) {
- result = result + separator + string_VkAccessFlagBits((VkAccessFlagBits)(1 << i));
- separator = " | ";
- }
- }
- result = result + "]";
- }
- return result;
-}
diff --git a/layers/vk_layer_utils.h b/layers/vk_layer_utils.h
index 62b1c3d..52a615f 100644
--- a/layers/vk_layer_utils.h
+++ b/layers/vk_layer_utils.h
@@ -59,8 +59,6 @@
bool vk_format_is_srgb(VkFormat format);
bool vk_format_is_compressed(VkFormat format);
size_t vk_format_get_size(VkFormat format);
-std::string string_VkAccessFlags(VkAccessFlags accessMask);
-
static inline int u_ffs(int val)
{