Module: Mesa Branch: master Commit: 2ca1ccc18d8e232112d146255ed937597ff93a5f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ca1ccc18d8e232112d146255ed937597ff93a5f
Author: Jonathan Marek <[email protected]> Date: Thu Jul 9 19:23:23 2020 -0400 turnip: remove dead tu_minify/typed_memcpy functions Signed-off-by: Jonathan Marek <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6304> --- src/freedreno/vulkan/tu_image.c | 2 +- src/freedreno/vulkan/tu_private.h | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/freedreno/vulkan/tu_image.c b/src/freedreno/vulkan/tu_image.c index 18c75e9f19f..6f2dc0421d0 100644 --- a/src/freedreno/vulkan/tu_image.c +++ b/src/freedreno/vulkan/tu_image.c @@ -427,7 +427,7 @@ tu_image_view_init(struct tu_image_view *iview, break; case VK_IMAGE_TYPE_3D: assert(range->baseArrayLayer + tu_get_layerCount(image, range) <= - tu_minify(image->extent.depth, range->baseMipLevel)); + u_minify(image->extent.depth, range->baseMipLevel)); break; default: unreachable("bad VkImageType"); diff --git a/src/freedreno/vulkan/tu_private.h b/src/freedreno/vulkan/tu_private.h index 28ba3ec84c1..7470d69b868 100644 --- a/src/freedreno/vulkan/tu_private.h +++ b/src/freedreno/vulkan/tu_private.h @@ -111,25 +111,10 @@ typedef uint32_t xcb_window_t; #define tu_printflike(a, b) __attribute__((__format__(__printf__, a, b))) -static inline uint32_t -tu_minify(uint32_t n, uint32_t levels) -{ - if (unlikely(n == 0)) - return 0; - else - return MAX2(n >> levels, 1); -} - #define for_each_bit(b, dword) \ for (uint32_t __dword = (dword); \ (b) = __builtin_ffs(__dword) - 1, __dword; __dword &= ~(1 << (b))) -#define typed_memcpy(dest, src, count) \ - ({ \ - STATIC_ASSERT(sizeof(*src) == sizeof(*dest)); \ - memcpy((dest), (src), (count) * sizeof(*(src))); \ - }) - #define COND(bool, val) ((bool) ? (val) : 0) #define BIT(bit) (1u << (bit)) _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
