commit 1d2022cfffb1af463ade99f305782e32a46f7eb3
author Dave Houlton <daveh@lunarg.com> Wed Mar 29 11:43:58 2017 -0600
committer Dave Houlton <daveh@lunarg.com> Wed Mar 29 15:07:42 2017 -0600
tree c4119627dac396140ea7b324354d4d051d68e420
parent 3c9fca775d2c61bf511bafc91e8e26e688a45393

layers: Rename format utils, strip Vk

Change-Id: I4d192db22c51d2e9224b74487bfd5d6a58405028

layers/vk_format_utils.h

diff --git a/layers/vk_format_utils.h b/layers/vk_format_utils.h
index a87ae0d..ea393ae 100644
--- a/layers/vk_format_utils.h
+++ b/layers/vk_format_utils.h
@@ -87,45 +87,35 @@
     VK_FORMAT_COMPATIBILITY_CLASS_MAX_ENUM = 45
 } VkFormatCompatibilityClass;
 
-static inline bool VkFormatIsUndef(VkFormat format) { return (format == VK_FORMAT_UNDEFINED); }
+VK_LAYER_EXPORT bool FormatIsDepthOrStencil(VkFormat format);
+VK_LAYER_EXPORT bool FormatIsDepthAndStencil(VkFormat format);
+VK_LAYER_EXPORT bool FormatIsDepthOnly(VkFormat format);
+VK_LAYER_EXPORT bool FormatIsStencilOnly(VkFormat format);
+VK_LAYER_EXPORT bool FormatIsCompressed_ETC2_EAC(VkFormat format);
+VK_LAYER_EXPORT bool FormatIsCompressed_ASTC_LDR(VkFormat format);
+VK_LAYER_EXPORT bool FormatIsCompressed_BC(VkFormat format);
+VK_LAYER_EXPORT bool FormatIsNorm(VkFormat format);
+VK_LAYER_EXPORT bool FormatIsUNorm(VkFormat format);
+VK_LAYER_EXPORT bool FormatIsSNorm(VkFormat format);
+VK_LAYER_EXPORT bool FormatIsInt(VkFormat format);
+VK_LAYER_EXPORT bool FormatIsSInt(VkFormat format);
+VK_LAYER_EXPORT bool FormatIsUInt(VkFormat format);
+VK_LAYER_EXPORT bool FormatIsFloat(VkFormat format);
+VK_LAYER_EXPORT bool FormatIsSRGB(VkFormat format);
+VK_LAYER_EXPORT bool FormatIsUScaled(VkFormat format);
+VK_LAYER_EXPORT bool FormatIsSScaled(VkFormat format);
+VK_LAYER_EXPORT bool FormatIsCompressed(VkFormat format);
 
-VK_LAYER_EXPORT bool VkFormatIsDepthOrStencil(VkFormat format);
-VK_LAYER_EXPORT bool VkFormatIsDepthAndStencil(VkFormat format);
-VK_LAYER_EXPORT bool VkFormatIsDepthOnly(VkFormat format);
-VK_LAYER_EXPORT bool VkFormatIsStencilOnly(VkFormat format);
-VK_LAYER_EXPORT bool VkFormatIsCompressed_ETC2_EAC(VkFormat format);
-VK_LAYER_EXPORT bool VkFormatIsCompressed_ASTC_LDR(VkFormat format);
-VK_LAYER_EXPORT bool VkFormatIsCompressed_BC(VkFormat format);
-VK_LAYER_EXPORT bool VkFormatIsNorm(VkFormat format);
-VK_LAYER_EXPORT bool VkFormatIsUNorm(VkFormat format);
-VK_LAYER_EXPORT bool VkFormatIsSNorm(VkFormat format);
-VK_LAYER_EXPORT bool VkFormatIsInt(VkFormat format);
-VK_LAYER_EXPORT bool VkFormatIsSInt(VkFormat format);
-VK_LAYER_EXPORT bool VkFormatIsUInt(VkFormat format);
-VK_LAYER_EXPORT bool VkFormatIsFloat(VkFormat format);
-VK_LAYER_EXPORT bool VkFormatIsSRGB(VkFormat format);
-VK_LAYER_EXPORT bool VkFormatIsUScaled(VkFormat format);
-VK_LAYER_EXPORT bool VkFormatIsSScaled(VkFormat format);
-VK_LAYER_EXPORT bool VkFormatIsCompressed(VkFormat format);
+static inline bool FormatIsUndef(VkFormat format) { return (format == VK_FORMAT_UNDEFINED); }
+static inline bool FormatIsColor(VkFormat format) { return !(FormatIsUndef(format) || FormatIsDepthOrStencil(format)); }
+static inline bool FormatHasDepth(VkFormat format) { return (FormatIsDepthOnly(format) || FormatIsDepthAndStencil(format)); }
+static inline bool FormatHasStencil(VkFormat format) { return (FormatIsStencilOnly(format) || FormatIsDepthAndStencil(format)); }
 
-static inline bool VkFormatIsColor(VkFormat format) {
-    return !(VkFormatIsUndef(format) || VkFormatIsDepthOrStencil(format));
-}
-
-static inline bool VkFormatHasDepth(VkFormat format) {
-    return (VkFormatIsDepthOnly(format) || VkFormatIsDepthAndStencil(format));
-}
-
-static inline bool VkFormatHasStencil(VkFormat format) {
-    return (VkFormatIsStencilOnly(format) || VkFormatIsDepthAndStencil(format));
-}
-
-VK_LAYER_EXPORT VkExtent3D VkFormatCompressedTexelBlockExtent(VkFormat format);
-VK_LAYER_EXPORT size_t VkFormatGetSize(VkFormat format);
-VK_LAYER_EXPORT unsigned int VkFormatGetChannelCount(VkFormat format);
-VK_LAYER_EXPORT VkFormatCompatibilityClass VkFormatGetCompatibilityClass(VkFormat format);
-
-VK_LAYER_EXPORT VkDeviceSize VkSafeModulo(VkDeviceSize dividend, VkDeviceSize divisor);
+VK_LAYER_EXPORT VkExtent3D FormatCompressedTexelBlockExtent(VkFormat format);
+VK_LAYER_EXPORT size_t FormatSize(VkFormat format);
+VK_LAYER_EXPORT unsigned int FormatChannelCount(VkFormat format);
+VK_LAYER_EXPORT VkFormatCompatibilityClass FormatCompatibilityClass(VkFormat format);
+VK_LAYER_EXPORT VkDeviceSize SafeModulo(VkDeviceSize dividend, VkDeviceSize divisor);
 
 #ifdef __cplusplus
 }