Module: Mesa
Branch: master
Commit: 2c6d8bff0315716afcdad0156e288bd34eff72bb
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2c6d8bff0315716afcdad0156e288bd34eff72bb
Author: Dave Airlie <airl...@redhat.com>
Date: Fri Oct 14 13:12:08 2016 +1000
anv: drop local MIN/MAX macros.
Use the ones from mesa, most places already did.
Acked-by: Jason Ekstrand <ja...@jlekstrand.net>
Signed-off-by: Dave Airlie <airl...@redhat.com>
---
src/intel/vulkan/anv_image.c | 2 +-
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
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
