diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-10-14 13:12:08 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-10-19 09:05:26 +1000 |
| commit | 2c6d8bff0315716afcdad0156e288bd34eff72bb (patch) | |
| tree | 917be1b97d487dfab35ebdac3ee82fcb3d1e3811 | |
| parent | c6f1077e0d96400c89ad577e841b1851ab9e3349 (diff) | |
| download | external_mesa3d-2c6d8bff0315716afcdad0156e288bd34eff72bb.zip external_mesa3d-2c6d8bff0315716afcdad0156e288bd34eff72bb.tar.gz external_mesa3d-2c6d8bff0315716afcdad0156e288bd34eff72bb.tar.bz2 | |
anv: drop local MIN/MAX macros.
Use the ones from mesa, most places already did.
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | src/intel/vulkan/anv_image.c | 2 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_private.h | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index 6237551..1701f50 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -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); } /** diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index b51e954..7efbe01 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -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 |