fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 10:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965/drm: Use Mesa's macros.h instead of duplicating them.

Browse source 
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 <chris@chris-wilson.co.uk>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Kenneth Graunke 2017-03-21 22:42:43 -07:00
parent c5cdb0f405
commit 68cb0c6d92
3 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/mesa/drivers/dri/i965/intel_bufmgr_gem.c
View file

@ -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)
{

4
src/mesa/drivers/dri/i965/intel_bufmgr_priv.h
View file

@ -285,8 +285,4 @@ struct _drm_bacon_context {
struct _drm_bacon_bufmgr *bufmgr;
};
#define ALIGN(value, alignment) ((value + alignment - 1) & ~(alignment - 1))
#define ROUND_UP_TO(x, y) (((x) + (y) - 1) / (y) * (y))
#define ROUND_UP_TO_MB(x) ROUND_UP_TO((x), 1024*1024)
#endif /* INTEL_BUFMGR_PRIV_H */

10
src/mesa/drivers/dri/i965/libdrm_macros.h
View file

@ -23,15 +23,7 @@
#ifndef LIBDRM_LIBDRM_H
#define LIBDRM_LIBDRM_H
/**
* Static (compile-time) assertion.
* Basically, use COND to dimension an array. If COND is false/zero the
* array size will be -1 and we'll get a compilation error.
*/
#define STATIC_ASSERT(COND) \
do { \
(void) sizeof(char [1 - 2*!(COND)]); \
} while (0)
#include "util/macros.h"
#include <sys/mman.h>