diff options
author | Kenneth Graunke <[email protected]> | 2017-03-21 22:42:43 -0700 |
---|---|---|
committer | Kenneth Graunke <[email protected]> | 2017-04-10 14:31:24 -0700 |
commit | 68cb0c6d92b82609a4bee97dde3af9db26f8fdf9 (patch) | |
tree | 52447cce56ea58014ad8cc03b1d03369df141065 /src/mesa/drivers/dri/i965/intel_bufmgr_gem.c | |
parent | c5cdb0f40574344f1b606fb6978b3714ac82d52a (diff) |
i965/drm: Use Mesa's macros.h instead of duplicating them.
Replace the duplicated macros imported from libdrm:
ARRAY_SIZE, MAX2, ALIGN, STATIC_ASSERT
and remove unused ROUND_UP_TO and ROUND_UP_TO_MB.
Reviewed-by: Chris Wilson <[email protected]>
Acked-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_bufmgr_gem.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/intel_bufmgr_gem.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c b/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c index d2bc3ed66cb..b981658e920 100644 --- a/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c +++ b/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c @@ -57,6 +57,8 @@ #define ETIME ETIMEDOUT #endif #include "libdrm_macros.h" +#include "main/macros.h" +#include "util/macros.h" #include "util/list.h" #include "brw_bufmgr.h" #include "intel_bufmgr_priv.h" @@ -81,9 +83,6 @@ fprintf(stderr, __VA_ARGS__); \ } while (0) -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) -#define MAX2(A, B) ((A) > (B) ? (A) : (B)) - static inline int atomic_add_unless(int *v, int add, int unless) { |