From e20b3ce6c7895f355fd1bad81b45341d98b5ee76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20H=C3=B6glund?= Date: Tue, 11 Feb 2014 20:49:58 +0100 Subject: [PATCH] Fix EGLDisplay parameters in epoxy functions EGLDisplay is typedefed as a pointer. --- include/epoxy/egl.h | 4 ++-- src/dispatch_egl.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/epoxy/egl.h b/include/epoxy/egl.h index 5771ccd..f1c3f56 100644 --- a/include/epoxy/egl.h +++ b/include/epoxy/egl.h @@ -45,8 +45,8 @@ extern "C" { #include "epoxy/egl_generated.h" -bool epoxy_has_egl_extension(EGLDisplay *dpy, const char *extension); -int epoxy_egl_version(EGLDisplay *dpy); +bool epoxy_has_egl_extension(EGLDisplay dpy, const char *extension); +int epoxy_egl_version(EGLDisplay dpy); #ifdef __cplusplus } /* extern "C" */ diff --git a/src/dispatch_egl.c b/src/dispatch_egl.c index 09eae00..8e13798 100644 --- a/src/dispatch_egl.c +++ b/src/dispatch_egl.c @@ -30,7 +30,7 @@ PUBLIC int epoxy_conservative_egl_version(void) { - EGLDisplay *dpy = eglGetCurrentDisplay(); + EGLDisplay dpy = eglGetCurrentDisplay(); if (!dpy) return 14; @@ -39,7 +39,7 @@ epoxy_conservative_egl_version(void) } PUBLIC int -epoxy_egl_version(EGLDisplay *dpy) +epoxy_egl_version(EGLDisplay dpy) { int major, minor; const char *version_string; @@ -54,7 +54,7 @@ epoxy_egl_version(EGLDisplay *dpy) bool epoxy_conservative_has_egl_extension(const char *ext) { - EGLDisplay *dpy = eglGetCurrentDisplay(); + EGLDisplay dpy = eglGetCurrentDisplay(); if (!dpy) return true; @@ -63,7 +63,7 @@ epoxy_conservative_has_egl_extension(const char *ext) } PUBLIC bool -epoxy_has_egl_extension(EGLDisplay *dpy, const char *ext) +epoxy_has_egl_extension(EGLDisplay dpy, const char *ext) { return epoxy_extension_in_string(eglQueryString(dpy, EGL_EXTENSIONS), ext); }