projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa/textureview: move error checks up higher
[mesa.git]
/
include
/
EGL
/
eglplatform.h
diff --git
a/include/EGL/eglplatform.h
b/include/EGL/eglplatform.h
index 8d3f72f24b308458872b13e6cbae8ccaaf5dd98b..b376e642822dc063d3bcb0b2e41fa791b82f864d 100644
(file)
--- a/
include/EGL/eglplatform.h
+++ b/
include/EGL/eglplatform.h
@@
-2,7
+2,7
@@
#define __eglplatform_h_
/*
#define __eglplatform_h_
/*
-** Copyright (c) 2007-20
09
The Khronos Group Inc.
+** Copyright (c) 2007-20
13
The Khronos Group Inc.
**
** Permission is hereby granted, free of charge, to any person obtaining a
** copy of this software and/or associated documentation files (the
**
** Permission is hereby granted, free of charge, to any person obtaining a
** copy of this software and/or associated documentation files (the
@@
-25,7
+25,7
@@
*/
/* Platform-specific types and definitions for egl.h
*/
/* Platform-specific types and definitions for egl.h
- * $Revision:
9724 $ on $Date: 2009-12-02 02:05:33 -0800 (Wed, 02 Dec 2009
) $
+ * $Revision:
30994 $ on $Date: 2015-04-30 13:36:48 -0700 (Thu, 30 Apr 2015
) $
*
* Adopters may modify khrplatform.h and this file to suit their platform.
* You are encouraged to submit all modifications to the Khronos group so that
*
* Adopters may modify khrplatform.h and this file to suit their platform.
* You are encouraged to submit all modifications to the Khronos group so that
@@
-60,6
+60,11
@@
* Windows Device Context. They must be defined in platform-specific
* code below. The EGL-prefixed versions of Native*Type are the same
* types, renamed in EGL 1.3 so all types in the API start with "EGL".
* Windows Device Context. They must be defined in platform-specific
* code below. The EGL-prefixed versions of Native*Type are the same
* types, renamed in EGL 1.3 so all types in the API start with "EGL".
+ *
+ * Khronos STRONGLY RECOMMENDS that you use the default definitions
+ * provided below, since these changes affect both binary and source
+ * portability of applications using EGL running on different EGL
+ * implementations.
*/
#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */
*/
#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */
@@
-90,22
+95,23
@@
typedef struct gbm_device *EGLNativeDisplayType;
typedef struct gbm_bo *EGLNativePixmapType;
typedef void *EGLNativeWindowType;
typedef struct gbm_bo *EGLNativePixmapType;
typedef void *EGLNativeWindowType;
-#elif defined(ANDROID) /* Android */
+#elif defined(__ANDROID__) || defined(ANDROID)
+
+#include <android/native_window.h>
-struct ANativeWindow;
struct egl_native_pixmap_t;
struct egl_native_pixmap_t;
-typedef struct ANativeWindow
*
EGLNativeWindowType;
-typedef struct egl_native_pixmap_t
*
EGLNativePixmapType;
-typedef void
*
EGLNativeDisplayType;
+typedef struct ANativeWindow
*
EGLNativeWindowType;
+typedef struct egl_native_pixmap_t
*
EGLNativePixmapType;
+typedef void
*
EGLNativeDisplayType;
-#elif defined(__unix__) || defined(__
unix
)
+#elif defined(__unix__) || defined(__
APPLE__
)
-#if
def MESA_EGL_NO_X11_HEADERS
+#if
defined(MESA_EGL_NO_X11_HEADERS)
typedef void *EGLNativeDisplayType;
typedef void *EGLNativeDisplayType;
-typedef khronos_uint
32
_t EGLNativePixmapType;
-typedef khronos_uint
32
_t EGLNativeWindowType;
+typedef khronos_uint
ptr
_t EGLNativePixmapType;
+typedef khronos_uint
ptr
_t EGLNativeWindowType;
#else
#else
@@
-119,6
+125,12
@@
typedef Window EGLNativeWindowType;
#endif /* MESA_EGL_NO_X11_HEADERS */
#endif /* MESA_EGL_NO_X11_HEADERS */
+#elif __HAIKU__
+#include <kernel/image.h>
+typedef void *EGLNativeDisplayType;
+typedef khronos_uintptr_t EGLNativePixmapType;
+typedef khronos_uintptr_t EGLNativeWindowType;
+
#else
#error "Platform not recognized"
#endif
#else
#error "Platform not recognized"
#endif