diff options
| author | Sven Gothel <[email protected]> | 2010-11-06 06:32:10 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-11-06 06:32:10 +0100 |
| commit | cb4da94bf947f2a3b3f0ceb9a5bbae39ee34d275 (patch) | |
| tree | 35ef981641620eab5ae3791c8450ad6d1890dfb2 /make | |
| parent | 3e7eed35ba0e63f93fbe45d7bb14abb0c1ff956f (diff) | |
EGL: Fix gluegen usage, use khronos 64bit typedefs
Diffstat (limited to 'make')
| -rw-r--r-- | make/stub_includes/egl/EGL/eglext.h | 16 | ||||
| -rw-r--r-- | make/stub_includes/egl/egl-64bit-types.h | 11 |
2 files changed, 20 insertions, 7 deletions
diff --git a/make/stub_includes/egl/EGL/eglext.h b/make/stub_includes/egl/EGL/eglext.h index 36a07ae88..972becf81 100644 --- a/make/stub_includes/egl/EGL/eglext.h +++ b/make/stub_includes/egl/EGL/eglext.h @@ -136,7 +136,7 @@ typedef khronos_utime_nanoseconds_t EGLTimeKHR; #define EGL_SYNC_REUSABLE_KHR 0x30FA #define EGL_SYNC_FLUSH_COMMANDS_BIT_KHR 0x0001 /* eglClientWaitSyncKHR <flags> bitfield */ #define EGL_FOREVER_KHR 0xFFFFFFFFFFFFFFFFull -#define EGL_NO_SYNC_KHR ((EGLSyncKHR)0) +/* Manual: #define EGL_NO_SYNC_KHR ((EGLSyncKHR)0) */ #ifdef EGL_EGLEXT_PROTOTYPES EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateSyncKHR(EGLDisplay dpy, EGLenum type, const EGLint *attrib_list); EGLAPI EGLBoolean EGLAPIENTRY eglDestroySyncKHR(EGLDisplay dpy, EGLSyncKHR sync); @@ -243,13 +243,13 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBNVPROC) (EGLSyncNV sync, EGL * Structure representing a client pixmap * (pixmap's data is in client-space memory). */ -struct EGLClientPixmapHI +typedef struct EGLClientPixmapHI { void* pData; EGLint iWidth; EGLint iHeight; EGLint iStride; -}; +} EGLClientPixmapHI; #ifdef EGL_EGLEXT_PROTOTYPES EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurfaceHI(EGLDisplay dpy, EGLConfig config, struct EGLClientPixmapHI* pixmap); @@ -296,14 +296,16 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDRMIMAGEMESAPROC) (EGLDisplay dpy, #define EGL_TEXTURE_RECTANGLE_NV 0x20A2 #endif +#include "egl-64bit-types.h" + #ifndef EGL_NV_system_time #define EGL_NV_system_time 1 #ifdef EGL_EGLEXT_PROTOTYPES -EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeFrequencyNV(void); -EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV(void); +EGLAPI EGLuint64 EGLAPIENTRY eglGetSystemTimeFrequencyNV(void); +EGLAPI EGLuint64 EGLAPIENTRY eglGetSystemTimeNV(void); #endif -typedef EGLuint64NV (EGLAPIENTRYP PFNEGLGETSYSTEMTIMEFREQUENCYNVPROC)(void); -typedef EGLuint64NV (EGLAPIENTRYP PFNEGLGETSYSTEMTIMENVPROC)(void); +typedef EGLuint64 (EGLAPIENTRYP PFNEGLGETSYSTEMTIMEFREQUENCYNVPROC)(void); +typedef EGLuint64 (EGLAPIENTRYP PFNEGLGETSYSTEMTIMENVPROC)(void); #endif /* EGL_NV_omx_il_sink diff --git a/make/stub_includes/egl/egl-64bit-types.h b/make/stub_includes/egl/egl-64bit-types.h new file mode 100644 index 000000000..9e9c7756a --- /dev/null +++ b/make/stub_includes/egl/egl-64bit-types.h @@ -0,0 +1,11 @@ +#ifndef __egl_64bit_types_h_ +#define __egl_64bit_types_h_ + +#include <KHR/khrplatform.h> + +#ifdef KHRONOS_SUPPORT_INT64 + typedef khronos_int64_t EGLint64; + typedef khronos_uint64_t EGLuint64; +#endif /* KHRONOS_SUPPORT_INT64 */ + +#endif /* __egl_64bit_types_h_ */ |