From 1e61021a062b1403f7eed948ac9d2ea0c04ea951 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 9 Apr 2012 03:55:57 +0200 Subject: Fix EGL/ES types GLeglImageOES, EGLImageKHR & EGLClientBuffer - and functions: eglCreateImageKHR, eglCreatePbufferFromClientBuffer Unique typedef for: EGLConfig, EGLContext, EGLDisplay, EGLSurface, EGLNativeDisplayType, EGLNativeWindowType, EGLNativePixmapType, EGLImageKHR, GLeglImageOES and EGLSyncKHR allowing to render them individually opaque (long) and keep EGLClientBuffer as NIO buffer. --- make/stub_includes/egl/EGL/egl.h | 8 ++++---- make/stub_includes/egl/EGL/eglext.h | 4 ++-- make/stub_includes/egl/EGL/eglplatform.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'make/stub_includes/egl') diff --git a/make/stub_includes/egl/EGL/egl.h b/make/stub_includes/egl/EGL/egl.h index 1eabe3af2..4c005e8bf 100644 --- a/make/stub_includes/egl/EGL/egl.h +++ b/make/stub_includes/egl/EGL/egl.h @@ -43,10 +43,10 @@ extern "C" { /* EGLint is defined in eglplatform.h */ typedef unsigned int EGLBoolean; typedef unsigned int EGLenum; -typedef void *EGLConfig; -typedef void *EGLContext; -typedef void *EGLDisplay; -typedef void *EGLSurface; +typedef struct __EGLConfig *EGLConfig; +typedef struct __EGLContext *EGLContext; +typedef struct __EGLDisplay *EGLDisplay; +typedef struct __EGLSurface *EGLSurface; typedef void *EGLClientBuffer; /* EGL Versioning */ diff --git a/make/stub_includes/egl/EGL/eglext.h b/make/stub_includes/egl/EGL/eglext.h index d5310df65..763403609 100644 --- a/make/stub_includes/egl/EGL/eglext.h +++ b/make/stub_includes/egl/EGL/eglext.h @@ -78,7 +78,7 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNLOCKSURFACEKHRPROC) (EGLDisplay display #ifndef EGL_KHR_image #define EGL_KHR_image 1 #define EGL_NATIVE_PIXMAP_KHR 0x30B0 /* eglCreateImageKHR target */ -typedef void *EGLImageKHR; +typedef struct __EGLImageKHR *EGLImageKHR; /* Manual: #define EGL_NO_IMAGE_KHR ((EGLImageKHR)0) */ #ifdef EGL_EGLEXT_PROTOTYPES EGLAPI EGLImageKHR EGLAPIENTRY eglCreateImageKHR (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list); @@ -124,7 +124,7 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGL #ifndef EGL_KHR_reusable_sync #define EGL_KHR_reusable_sync 1 -typedef void* EGLSyncKHR; +typedef struct __EGLSyncKHR* EGLSyncKHR; typedef khronos_utime_nanoseconds_t EGLTimeKHR; #define EGL_SYNC_STATUS_KHR 0x30F1 diff --git a/make/stub_includes/egl/EGL/eglplatform.h b/make/stub_includes/egl/EGL/eglplatform.h index a661736c1..b594e394d 100644 --- a/make/stub_includes/egl/EGL/eglplatform.h +++ b/make/stub_includes/egl/EGL/eglplatform.h @@ -97,9 +97,9 @@ typedef Window EGLNativeWindowType; #warning "Info: Using generic void pointer for EGLNativeDisplayType, EGLNativeWindowType and EGLNativePixmapType" -typedef void* EGLNativeDisplayType; -typedef void* EGLNativeWindowType; -typedef void* EGLNativePixmapType; +typedef struct __EGLNativeDisplayType* EGLNativeDisplayType; +typedef struct __EGLNativeWindowType* EGLNativeWindowType; +typedef struct __EGLNativePixmapType* EGLNativePixmapType; #endif -- cgit v1.2.3