Module: Mesa Branch: master Commit: 1b8fa8dd794c22aba43b16470e75ecaebf902b11 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b8fa8dd794c22aba43b16470e75ecaebf902b11
Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Fri Mar 24 16:20:18 2017 -0700 anv: Make anv_get_layerCount a macro Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Cc: "13.0 17.0" <mesa-sta...@lists.freedesktop.org> --- src/intel/vulkan/anv_private.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index 27c887c65c..74e80e8d53 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -1828,13 +1828,13 @@ anv_layout_to_aux_usage(const struct gen_device_info * const devinfo, const struct anv_image *image, const VkImageAspectFlags aspects, const VkImageLayout layout); -static inline uint32_t -anv_get_layerCount(const struct anv_image *image, - const VkImageSubresourceRange *range) -{ - return range->layerCount == VK_REMAINING_ARRAY_LAYERS ? - image->array_size - range->baseArrayLayer : range->layerCount; -} + +/* This is defined as a macro so that it works for both + * VkImageSubresourceRange and VkImageSubresourceLayers + */ +#define anv_get_layerCount(_image, _range) \ + ((_range)->layerCount == VK_REMAINING_ARRAY_LAYERS ? \ + (_image)->array_size - (_range)->baseArrayLayer : (_range)->layerCount) static inline uint32_t anv_get_levelCount(const struct anv_image *image, _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit