fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

anv: drop local MIN/MAX macros.

Browse source 
Use the ones from mesa, most places already did.

Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2016-10-14 13:12:08 +10:00
parent c6f1077e0d
commit 2c6d8bff03
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/intel/vulkan/anv_image.c
View file

@ -112,7 +112,7 @@ add_surface(struct anv_image *image, struct anv_surface *surf)
surf->offset = align_u32(image->size, surf->isl.alignment);
image->size = surf->offset + surf->isl.size;
image->alignment = MAX(image->alignment, surf->isl.alignment);
image->alignment = MAX2(image->alignment, surf->isl.alignment);
}
/**

5
src/intel/vulkan/anv_private.h
View file

@ -82,9 +82,6 @@ extern "C" {
#define anv_noreturn __attribute__((__noreturn__))
#define anv_printflike(a, b) __attribute__((__format__(__printf__, a, b)))
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#define MAX(a, b) ((a) > (b) ? (a) : (b))
static inline uint32_t
align_down_npot_u32(uint32_t v, uint32_t a)
{
@ -126,7 +123,7 @@ anv_minify(uint32_t n, uint32_t levels)
if (unlikely(n == 0))
return 0;
else
return MAX(n >> levels, 1);
return MAX2(n >> levels, 1);
}
static inline float