diff options
author | Dave Airlie <airlied@redhat.com> | 2015-05-05 09:10:34 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-05-05 12:19:40 +1000 |
commit | b5045e29917a783be74becee5e72566e2b0e3535 (patch) | |
tree | eb0a9b8612751bd76e05d66c5d8237ec6ba92bb4 /src/egl | |
parent | 1c5a57aee109ef513df0d281aadc69db293cc3d8 (diff) | |
download | external_mesa3d-b5045e29917a783be74becee5e72566e2b0e3535.zip external_mesa3d-b5045e29917a783be74becee5e72566e2b0e3535.tar.gz external_mesa3d-b5045e29917a783be74becee5e72566e2b0e3535.tar.bz2 |
egl: image_dma_buf_export - use KHR 64-bit type
After talking to Jon Leech he suggested this should be fine.
update spec to the version in the registry.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/egl')
-rw-r--r-- | src/egl/drivers/dri2/egl_dri2.c | 2 | ||||
-rw-r--r-- | src/egl/main/eglapi.c | 2 | ||||
-rw-r--r-- | src/egl/main/eglapi.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 34d6bfe..1e843ed 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -1996,7 +1996,7 @@ static EGLBoolean dri2_export_dma_buf_image_query_mesa(_EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img, EGLint *fourcc, EGLint *nplanes, - EGLuint64MESA *modifiers) + EGLuint64KHR *modifiers) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_image *dri2_img = dri2_egl_image(img); diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index ec41aa3..ba1d0dd 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -2013,7 +2013,7 @@ eglGetSyncValuesCHROMIUM(EGLDisplay display, EGLSurface surface, EGLBoolean EGLAPIENTRY eglExportDMABUFImageQueryMESA(EGLDisplay dpy, EGLImageKHR image, EGLint *fourcc, EGLint *nplanes, - EGLuint64MESA *modifiers) + EGLuint64KHR *modifiers) { _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLImage *img = _eglLookupImage(image, disp); diff --git a/src/egl/main/eglapi.h b/src/egl/main/eglapi.h index 5226886..068d4ef 100644 --- a/src/egl/main/eglapi.h +++ b/src/egl/main/eglapi.h @@ -142,7 +142,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 *nplanes, EGLuint64MESA *modifiers); +typedef EGLBoolean (*ExportDMABUFImageQueryMESA_t)(_EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img, EGLint *fourcc, EGLint *nplanes, EGLuint64KHR *modifiers); typedef EGLBoolean (*ExportDMABUFImageMESA_t)(_EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img, EGLint *fds, EGLint *strides, EGLint *offsets); #endif |