diff options
| author | Chia-I Wu <olv@lunarg.com> | 2015-10-26 16:49:32 +0800 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-11-02 14:02:05 -0700 |
| commit | 6ef8c3b6c0d67454897467c11d0ff9e102ddde10 (patch) | |
| tree | e47fd6257500907e4b4fb6241a4abb4ee0264db7 /layers/image.cpp | |
| parent | 7dd0e7075d186fe7e503a1a1dd70591a41496cff (diff) | |
| download | usermoji-6ef8c3b6c0d67454897467c11d0ff9e102ddde10.tar.xz | |
bug 14543: rename VkTex* enums to VkTexture* similarly for VK_TEX_* to VK_TEXTURE_* (WIP)
s/VK_TEX_FILTER_/VK_FILTER_/g
s/VkTexFilter/VkFilter/g
s/VK_TEX_MIPMAP_MODE_/VK_SAMPLER_MIPMAP_MODE_/g
s/VkTexMipmapMode/VkSamplerMipmapMode/g
s/VK_TEX_ADDRESS_MODE_/VK_SAMPLER_ADDRESS_MODE_/g
s/VkTexAddressMode/VkSamplerAddressMode/g
s/mipMode/mipmapMode/g
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14543
Diffstat (limited to 'layers/image.cpp')
| -rw-r--r-- | layers/image.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/layers/image.cpp b/layers/image.cpp index c615109a..af8bef49 100644 --- a/layers/image.cpp +++ b/layers/image.cpp @@ -712,7 +712,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdBlitImage( VkImageLayout destImageLayout, uint32_t regionCount, const VkImageBlit *pRegions, - VkTexFilter filter) + VkFilter filter) { VkBool32 skipCall = VK_FALSE; layer_data *device_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); @@ -811,10 +811,10 @@ VK_LAYER_EXPORT void VKAPI vkCmdBlitImage( // Validate filter if (vk_format_is_depth_or_stencil(srcFormat) || vk_format_is_int(srcFormat)) { - if (filter != VK_TEX_FILTER_NEAREST) { + if (filter != VK_FILTER_NEAREST) { std::stringstream ss; ss << "vkCmdBlitImage: If the format of srcImage is a depth, stencil, depth stencil or integer-based format " - << "then filter must be VK_TEX_FILTER_NEAREST."; + << "then filter must be VK_FILTER_NEAREST."; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)cmdBuffer, 0, IMAGE_INVALID_FILTER, "IMAGE", ss.str().c_str()); } |