For the series:
Reviewed-by: Nicolai Hähnle <nicolai.haeh...@amd.com>
On 02.11.2016 19:07, Marek Olšák wrote:
From: Marek Olšák <marek.ol...@amd.com>
I need the definition of PUBLIC.
Cc: 12.0 13.0 <mesa-sta...@lists.freedesktop.org>
---
src/egl/drivers/dri2/egl_dri2.h | 2 --
src/egl/main/egldefines.h | 5 ++---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h
index 85d4b85..0020a5b 100644
--- a/src/egl/drivers/dri2/egl_dri2.h
+++ b/src/egl/drivers/dri2/egl_dri2.h
@@ -73,22 +73,20 @@
#include "eglconfig.h"
#include "eglcontext.h"
#include "egldisplay.h"
#include "egldriver.h"
#include "eglcurrent.h"
#include "egllog.h"
#include "eglsurface.h"
#include "eglimage.h"
#include "eglsync.h"
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-
struct wl_buffer;
struct dri2_egl_driver
{
_EGLDriver base;
void *handle;
_EGLProc (*get_proc_address)(const char *procname);
void (*glFlush)(void);
};
diff --git a/src/egl/main/egldefines.h b/src/egl/main/egldefines.h
index 13a7563..e8157da 100644
--- a/src/egl/main/egldefines.h
+++ b/src/egl/main/egldefines.h
@@ -31,28 +31,27 @@
*/
#ifndef EGLDEFINES_INCLUDED
#define EGLDEFINES_INCLUDED
#ifdef __cplusplus
extern "C" {
#endif
+#include "util/macros.h"
+
#define _EGL_MAX_EXTENSIONS_LEN 1000
/* Hardcoded, conservative default for EGL_LARGEST_PBUFFER,
* this is used to implement EGL_LARGEST_PBUFFER.
*/
#define _EGL_MAX_PBUFFER_WIDTH 4096
#define _EGL_MAX_PBUFFER_HEIGHT 4096
#define _EGL_VENDOR_STRING "Mesa Project"
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-#define MIN2(A, B) (((A) < (B)) ? (A) : (B))
-
#ifdef __cplusplus
}
#endif
#endif /* EGLDEFINES_INCLUDED */
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
