diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-10-14 13:11:20 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-10-19 09:05:25 +1000 |
| commit | c6f1077e0d96400c89ad577e841b1851ab9e3349 (patch) | |
| tree | 50bac83ae182fc1983d492e02e3d2f9caa40aef7 /src/amd/vulkan/radv_private.h | |
| parent | 78bce52f9a57ea020ef7b9386216efe151be9542 (diff) | |
| download | external_mesa3d-c6f1077e0d96400c89ad577e841b1851ab9e3349.zip external_mesa3d-c6f1077e0d96400c89ad577e841b1851ab9e3349.tar.gz external_mesa3d-c6f1077e0d96400c89ad577e841b1851ab9e3349.tar.bz2 | |
radv: drop local MIN/MAX macros.
Use the ones in macros.h instead.
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/amd/vulkan/radv_private.h')
| -rw-r--r-- | src/amd/vulkan/radv_private.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index 1f5af62..8dddf70 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -85,9 +85,6 @@ typedef uint32_t xcb_window_t; #define radv_noreturn __attribute__((__noreturn__)) #define radv_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_u32(uint32_t v, uint32_t a) { @@ -141,7 +138,7 @@ radv_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 radv_clamp_f(float f, float min, float max) |