From 78351a69dfc6e3aca0490c4de282dc84d66db382 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Fri, 10 Apr 2015 08:34:15 -0600 Subject: vulkan: beautification changes TODO: verify vk-layer-generate.py TODO: need to rename object tracker generator v2: fix "python3 vulkan.py" fix dead cod in tri introduced by rebase beautify wsi_null.c (olv) --- icd/common/icd-format.c | 20 ++++++++++---------- icd/common/icd-format.h | 30 +++++++++++++++--------------- icd/common/icd-instance.c | 20 ++++++++++---------- icd/common/icd-instance.h | 18 +++++++++--------- 4 files changed, 44 insertions(+), 44 deletions(-) (limited to 'icd/common') diff --git a/icd/common/icd-format.c b/icd/common/icd-format.c index dff3638c..c326cbdc 100644 --- a/icd/common/icd-format.c +++ b/icd/common/icd-format.c @@ -205,7 +205,7 @@ static const struct icd_format_info { [VK_FMT_B10G10R10A2_SINT] = { 4, 4 }, }; -bool icd_format_is_ds(VK_FORMAT format) +bool icd_format_is_ds(VkFormat format) { bool is_ds = false; @@ -226,7 +226,7 @@ bool icd_format_is_ds(VK_FORMAT format) return is_ds; } -bool icd_format_is_norm(VK_FORMAT format) +bool icd_format_is_norm(VkFormat format) { bool is_norm = false; @@ -298,7 +298,7 @@ bool icd_format_is_norm(VK_FORMAT format) return is_norm; }; -bool icd_format_is_int(VK_FORMAT format) +bool icd_format_is_int(VkFormat format) { bool is_int = false; @@ -344,7 +344,7 @@ bool icd_format_is_int(VK_FORMAT format) return is_int; } -bool icd_format_is_float(VK_FORMAT format) +bool icd_format_is_float(VkFormat format) { bool is_float = false; @@ -374,7 +374,7 @@ bool icd_format_is_float(VK_FORMAT format) return is_float; } -bool icd_format_is_srgb(VK_FORMAT format) +bool icd_format_is_srgb(VkFormat format) { bool is_srgb = false; @@ -412,7 +412,7 @@ bool icd_format_is_srgb(VK_FORMAT format) return is_srgb; } -bool icd_format_is_compressed(VK_FORMAT format) +bool icd_format_is_compressed(VkFormat format) { switch (format) { case VK_FMT_BC1_RGB_UNORM: @@ -470,12 +470,12 @@ bool icd_format_is_compressed(VK_FORMAT format) } } -size_t icd_format_get_size(VK_FORMAT format) +size_t icd_format_get_size(VkFormat format) { return icd_format_table[format].size; } -VK_IMAGE_FORMAT_CLASS icd_format_get_class(VK_FORMAT format) +VkImageFormatClass icd_format_get_class(VkFormat format) { if (icd_format_is_undef(format)) assert(!"undefined format"); @@ -541,7 +541,7 @@ VK_IMAGE_FORMAT_CLASS icd_format_get_class(VK_FORMAT format) } } -unsigned int icd_format_get_channel_count(VK_FORMAT format) +unsigned int icd_format_get_channel_count(VkFormat format) { return icd_format_table[format].channel_count; } @@ -550,7 +550,7 @@ unsigned int icd_format_get_channel_count(VK_FORMAT format) * Convert a raw RGBA color to a raw value. \p value must have at least * icd_format_get_size(format) bytes. */ -void icd_format_get_raw_value(VK_FORMAT format, +void icd_format_get_raw_value(VkFormat format, const uint32_t color[4], void *value) { diff --git a/icd/common/icd-format.h b/icd/common/icd-format.h index ea227c13..5a7d1f07 100644 --- a/icd/common/icd-format.h +++ b/icd/common/icd-format.h @@ -31,35 +31,35 @@ #include #include "icd.h" -static inline bool icd_format_is_undef(VK_FORMAT format) +static inline bool icd_format_is_undef(VkFormat format) { return (format == VK_FMT_UNDEFINED); } -bool icd_format_is_ds(VK_FORMAT format); +bool icd_format_is_ds(VkFormat format); -static inline bool icd_format_is_color(VK_FORMAT format) +static inline bool icd_format_is_color(VkFormat format) { return !(icd_format_is_undef(format) || icd_format_is_ds(format)); } -bool icd_format_is_norm(VK_FORMAT format); +bool icd_format_is_norm(VkFormat format); -bool icd_format_is_int(VK_FORMAT format); +bool icd_format_is_int(VkFormat format); -bool icd_format_is_float(VK_FORMAT format); +bool icd_format_is_float(VkFormat format); -bool icd_format_is_srgb(VK_FORMAT format); +bool icd_format_is_srgb(VkFormat format); -bool icd_format_is_compressed(VK_FORMAT format); +bool icd_format_is_compressed(VkFormat format); -static inline int icd_format_get_block_width(VK_FORMAT format) +static inline int icd_format_get_block_width(VkFormat format) { /* all compressed formats use 4x4 blocks */ return (icd_format_is_compressed(format)) ? 4 : 1; } -static inline bool icd_blend_mode_is_dual_src(VK_BLEND mode) +static inline bool icd_blend_mode_is_dual_src(VkBlend mode) { return (mode == VK_BLEND_SRC1_COLOR) || (mode == VK_BLEND_SRC1_ALPHA) || @@ -67,7 +67,7 @@ static inline bool icd_blend_mode_is_dual_src(VK_BLEND mode) (mode == VK_BLEND_ONE_MINUS_SRC1_ALPHA); } -static inline bool icd_pipeline_cb_att_needs_dual_source_blending(const VK_PIPELINE_CB_ATTACHMENT_STATE *att) +static inline bool icd_pipeline_cb_att_needs_dual_source_blending(const VkPipelineCbAttachmentState *att) { if (icd_blend_mode_is_dual_src(att->srcBlendColor) || icd_blend_mode_is_dual_src(att->srcBlendAlpha) || @@ -78,13 +78,13 @@ static inline bool icd_pipeline_cb_att_needs_dual_source_blending(const VK_PIPEL return false; } -size_t icd_format_get_size(VK_FORMAT format); +size_t icd_format_get_size(VkFormat format); -VK_IMAGE_FORMAT_CLASS icd_format_get_class(VK_FORMAT format); +VkImageFormatClass icd_format_get_class(VkFormat format); -unsigned int icd_format_get_channel_count(VK_FORMAT format); +unsigned int icd_format_get_channel_count(VkFormat format); -void icd_format_get_raw_value(VK_FORMAT format, +void icd_format_get_raw_value(VkFormat format, const uint32_t color[4], void *value); diff --git a/icd/common/icd-instance.c b/icd/common/icd-instance.c index fed138e7..6d6c2cf4 100644 --- a/icd/common/icd-instance.c +++ b/icd/common/icd-instance.c @@ -33,7 +33,7 @@ static void * VKAPI default_alloc(void *user_data, size_t size, size_t alignment, - VK_SYSTEM_ALLOC_TYPE allocType) + VkSystemAllocType allocType) { if (alignment <= 1) { return malloc(size); @@ -61,10 +61,10 @@ static void VKAPI default_free(void *user_data, void *ptr) free(ptr); } -struct icd_instance *icd_instance_create(const VK_APPLICATION_INFO *app_info, - const VK_ALLOC_CALLBACKS *alloc_cb) +struct icd_instance *icd_instance_create(const VkApplicationInfo *app_info, + const VkAllocCallbacks *alloc_cb) { - static const VK_ALLOC_CALLBACKS default_alloc_cb = { + static const VkAllocCallbacks default_alloc_cb = { .pfnAlloc = default_alloc, .pfnFree = default_free, }; @@ -114,10 +114,10 @@ void icd_instance_destroy(struct icd_instance *instance) icd_instance_free(instance, instance); } -VK_RESULT icd_instance_set_bool(struct icd_instance *instance, +VkResult icd_instance_set_bool(struct icd_instance *instance, VK_DBG_GLOBAL_OPTION option, bool yes) { - VK_RESULT res = VK_SUCCESS; + VkResult res = VK_SUCCESS; switch (option) { case VK_DBG_OPTION_DEBUG_ECHO_ENABLE: @@ -137,7 +137,7 @@ VK_RESULT icd_instance_set_bool(struct icd_instance *instance, return res; } -VK_RESULT icd_instance_add_logger(struct icd_instance *instance, +VkResult icd_instance_add_logger(struct icd_instance *instance, VK_DBG_MSG_CALLBACK_FUNCTION func, void *user_data) { @@ -164,7 +164,7 @@ VK_RESULT icd_instance_add_logger(struct icd_instance *instance, return VK_SUCCESS; } -VK_RESULT icd_instance_remove_logger(struct icd_instance *instance, +VkResult icd_instance_remove_logger(struct icd_instance *instance, VK_DBG_MSG_CALLBACK_FUNCTION func) { struct icd_instance_logger *logger, *prev; @@ -190,8 +190,8 @@ VK_RESULT icd_instance_remove_logger(struct icd_instance *instance, void icd_instance_log(const struct icd_instance *instance, VK_DBG_MSG_TYPE msg_type, - VK_VALIDATION_LEVEL validation_level, - VK_BASE_OBJECT src_object, + VkValidationLevel validation_level, + VkBaseObject src_object, size_t location, int32_t msg_code, const char *msg) { diff --git a/icd/common/icd-instance.h b/icd/common/icd-instance.h index 9b7093cf..13a146ba 100644 --- a/icd/common/icd-instance.h +++ b/icd/common/icd-instance.h @@ -49,21 +49,21 @@ struct icd_instance { bool break_on_error; bool break_on_warning; - VK_ALLOC_CALLBACKS alloc_cb; + VkAllocCallbacks alloc_cb; struct icd_instance_logger *loggers; }; -struct icd_instance *icd_instance_create(const VK_APPLICATION_INFO *app_info, - const VK_ALLOC_CALLBACKS *alloc_cb); +struct icd_instance *icd_instance_create(const VkApplicationInfo *app_info, + const VkAllocCallbacks *alloc_cb); void icd_instance_destroy(struct icd_instance *instance); -VK_RESULT icd_instance_set_bool(struct icd_instance *instance, +VkResult icd_instance_set_bool(struct icd_instance *instance, VK_DBG_GLOBAL_OPTION option, bool yes); static inline void *icd_instance_alloc(const struct icd_instance *instance, size_t size, size_t alignment, - VK_SYSTEM_ALLOC_TYPE type) + VkSystemAllocType type) { return instance->alloc_cb.pfnAlloc(instance->alloc_cb.pUserData, size, alignment, type); @@ -75,16 +75,16 @@ static inline void icd_instance_free(const struct icd_instance *instance, instance->alloc_cb.pfnFree(instance->alloc_cb.pUserData, ptr); } -VK_RESULT icd_instance_add_logger(struct icd_instance *instance, +VkResult icd_instance_add_logger(struct icd_instance *instance, VK_DBG_MSG_CALLBACK_FUNCTION func, void *user_data); -VK_RESULT icd_instance_remove_logger(struct icd_instance *instance, +VkResult icd_instance_remove_logger(struct icd_instance *instance, VK_DBG_MSG_CALLBACK_FUNCTION func); void icd_instance_log(const struct icd_instance *instance, VK_DBG_MSG_TYPE msg_type, - VK_VALIDATION_LEVEL validation_level, - VK_BASE_OBJECT src_object, + VkValidationLevel validation_level, + VkBaseObject src_object, size_t location, int32_t msg_code, const char *msg); -- cgit v1.2.3