From: Marc-André Lureau Date: Tue, 28 Apr 2015 10:23:42 +0000 (+0200) Subject: egl: misc fixes for EGL_MESA_image_dma_buf_export X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c66c158e59298fc4183148c466dd4eecb945f87c;p=mesa.git egl: misc fixes for EGL_MESA_image_dma_buf_export Fix define and a function argument name introduced in commit 8f7338f284cdb1fef64c85e3293d2200d0cc6387 Signed-off-by: Dave Airlie --- diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index ea2ee734a21..8b7b9bee7f1 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -1241,7 +1241,7 @@ eglGetProcAddress(const char *procname) { "eglCreatePlatformWindowSurfaceEXT", (_EGLProc) eglCreatePlatformWindowSurfaceEXT }, { "eglCreatePlatformPixmapSurfaceEXT", (_EGLProc) eglCreatePlatformPixmapSurfaceEXT }, { "eglGetSyncValuesCHROMIUM", (_EGLProc) eglGetSyncValuesCHROMIUM }, -#ifdef EGL_MESA_drm_buf_image_export +#ifdef EGL_MESA_dma_buf_image_export { "eglExportDMABUFImageQueryMESA", (_EGLProc) eglExportDMABUFImageQueryMESA }, { "eglExportDMABUFImageMESA", (_EGLProc) eglExportDMABUFImageMESA }, #endif diff --git a/src/egl/main/eglapi.h b/src/egl/main/eglapi.h index eb5f58e6fa9..3245327ae39 100644 --- a/src/egl/main/eglapi.h +++ b/src/egl/main/eglapi.h @@ -141,7 +141,7 @@ typedef EGLBoolean (*SwapBuffersWithDamageEXT_t) (_EGLDriver *drv, _EGLDisplay * typedef EGLBoolean (*GetSyncValuesCHROMIUM_t) (_EGLDisplay *dpy, _EGLSurface *surface, EGLuint64KHR *ust, EGLuint64KHR *msc, EGLuint64KHR *sbc); #ifdef EGL_MESA_image_dma_buf_export -typedef EGLBoolean (*ExportDMABUFImageQueryMESA_t)(_EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img, EGLint *fourcc, EGLint *stride, EGLuint64MESA *modifiers); +typedef EGLBoolean (*ExportDMABUFImageQueryMESA_t)(_EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img, EGLint *fourcc, EGLint *nplanes, EGLuint64MESA *modifiers); typedef EGLBoolean (*ExportDMABUFImageMESA_t)(_EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img, EGLint *fds, EGLint *strides, EGLint *offsets); #endif