Module: Mesa
Branch: master
Commit: f9bf9133ccc3764dc38f6359a26004e12b888af3
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9bf9133ccc3764dc38f6359a26004e12b888af3

Author: Emil Velikov <[email protected]>
Date:   Mon May 11 23:43:47 2015 +0100

egl: fix the EGL_MESA_image_dma_buf_export header declarations

Similar to other EGL extensions - guard the function prototypes by
EGL_EGLEXT_PROTOTYPES as the libEGL library does (should) not provide
the symbols statically.

Instead users should call eglGetProcAddress, which returns the function
pointer. The latter of which was missing the type declaration (typedef).

Cc: Dave Airlie <[email protected]>
Cc: Marc-André Lureau <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Chad Versace <[email protected]>

---

 include/EGL/eglmesaext.h |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/include/EGL/eglmesaext.h b/include/EGL/eglmesaext.h
index 27cf7eb..40a60ec 100644
--- a/include/EGL/eglmesaext.h
+++ b/include/EGL/eglmesaext.h
@@ -127,10 +127,16 @@ typedef EGLBoolean (EGLAPIENTRYP 
PFNEGLSWAPBUFFERSREGIONNOK) (EGLDisplay dpy, EG
 #if KHRONOS_SUPPORT_INT64
 #ifndef EGL_MESA_image_dma_buf_export
 #define EGL_MESA_image_dma_buf_export 1
+#ifdef EGL_EGLEXT_PROTOTYPES
 EGLAPI EGLBoolean EGLAPIENTRY eglExportDMABUFImageQueryMESA (EGLDisplay dpy, 
EGLImageKHR image, EGLint *fourcc, EGLint *nplanes, EGLuint64KHR *modifiers);
 EGLAPI EGLBoolean EGLAPIENTRY eglExportDMABUFImageMESA (EGLDisplay dpy, 
EGLImageKHR image, int *fds, EGLint *strides, EGLint *offsets);
 #endif
 #endif
+
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDMABUFIMAGEQUERYMESA) (EGLDisplay 
dpy, EGLImageKHR image, EGLint *fourcc, EGLint *nplanes, EGLuint64KHR 
*modifiers);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDMABUFIMAGEMESA) (EGLDisplay dpy, 
EGLImageKHR image, int *fds, EGLint *strides, EGLint *offsets);
+
+#endif
 #ifdef __cplusplus
 }
 #endif

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to