diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2010-06-04 14:28:59 -0400 | 
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2010-08-25 09:17:47 -0400 | 
| commit | b7a8893a2413adfddf4dc836676a19463fb6ffd7 (patch) | |
| tree | ea03799b61f31600f49601c27bbe40ce8a18d9b1 /src | |
| parent | 29bcbf5e797a18430285c75abb8a9300c8defe1d (diff) | |
egl: Add EGL_MESA_drm_image extension
Create EGLImages from DRM buffer handles.
Diffstat (limited to 'src')
| -rw-r--r-- | src/egl/main/eglapi.c | 43 | ||||
| -rw-r--r-- | src/egl/main/eglapi.h | 10 | ||||
| -rw-r--r-- | src/egl/main/egldisplay.h | 1 | ||||
| -rw-r--r-- | src/egl/main/eglmisc.c | 1 | 
4 files changed, 55 insertions, 0 deletions
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index c62459ec6f..31c5419bbc 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -894,6 +894,10 @@ eglGetProcAddress(const char *procname)  #ifdef EGL_NOK_swap_region        { "eglSwapBuffersRegionNOK", (_EGLProc) eglSwapBuffersRegionNOK },  #endif +#ifdef EGL_MESA_drm_image +      { "eglCreateDRMImageMESA", (_EGLProc) eglCreateDRMImageMESA }, +      { "eglExportDRMImageMESA", (_EGLProc) eglExportDRMImageMESA }, +#endif        { NULL, NULL }     };     EGLint i; @@ -1416,3 +1420,42 @@ eglSwapBuffersRegionNOK(EGLDisplay dpy, EGLSurface surface,  }  #endif /* EGL_NOK_swap_region */ + + +#ifdef EGL_MESA_drm_image + +EGLImageKHR EGLAPIENTRY +eglCreateDRMImageMESA(EGLDisplay dpy, const EGLint *attr_list) +{ +   _EGLDisplay *disp = _eglLockDisplay(dpy); +   _EGLDriver *drv; +   _EGLImage *img; +   EGLImageKHR ret; + +   _EGL_CHECK_DISPLAY(disp, EGL_NO_IMAGE_KHR, drv); + +   img = drv->API.CreateDRMImageMESA(drv, disp, attr_list); +   ret = (img) ? _eglLinkImage(img, disp) : EGL_NO_IMAGE_KHR; + +   RETURN_EGL_EVAL(disp, ret); +} + +EGLBoolean EGLAPIENTRY +eglExportDRMImageMESA(EGLDisplay dpy, EGLImageKHR image, +		      EGLint *name, EGLint *handle, EGLint *stride) +{ +   _EGLDisplay *disp = _eglLockDisplay(dpy); +   _EGLImage *img = _eglLookupImage(image, disp); +   _EGLDriver *drv; +   EGLBoolean ret; + +   _EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv); +   if (!img) +      RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE); + +   ret = drv->API.ExportDRMImageMESA(drv, disp, img, name, handle, stride); + +   RETURN_EGL_EVAL(disp, ret); +} + +#endif diff --git a/src/egl/main/eglapi.h b/src/egl/main/eglapi.h index 5045a9a272..127becc9ac 100644 --- a/src/egl/main/eglapi.h +++ b/src/egl/main/eglapi.h @@ -90,6 +90,11 @@ typedef EGLBoolean (*GetSyncAttribKHR_t)(_EGLDriver *drv, _EGLDisplay *dpy, _EGL  typedef EGLBoolean (*SwapBuffersRegionNOK_t)(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint numRects, const EGLint *rects);  #endif +#ifdef EGL_MESA_drm_image +typedef _EGLImage *(*CreateDRMImageMESA_t)(_EGLDriver *drv, _EGLDisplay *disp, const EGLint *attr_list); +typedef EGLBoolean (*ExportDRMImageMESA_t)(_EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img, EGLint *name, EGLint *handle, EGLint *stride); +#endif +  /**   * The API dispatcher jumps through these functions   */ @@ -159,6 +164,11 @@ struct _egl_api  #ifdef EGL_NOK_swap_region     SwapBuffersRegionNOK_t SwapBuffersRegionNOK;  #endif + +#ifdef EGL_MESA_drm_image +   CreateDRMImageMESA_t CreateDRMImageMESA; +   ExportDRMImageMESA_t ExportDRMImageMESA; +#endif  };  #endif /* EGLAPI_INCLUDED */ diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h index 97c9d196ec..3863cce010 100644 --- a/src/egl/main/egldisplay.h +++ b/src/egl/main/egldisplay.h @@ -54,6 +54,7 @@ struct _egl_extensions     EGLBoolean MESA_screen_surface;     EGLBoolean MESA_copy_context;     EGLBoolean MESA_drm_display; +   EGLBoolean MESA_drm_image;     EGLBoolean KHR_image_base;     EGLBoolean KHR_image_pixmap; diff --git a/src/egl/main/eglmisc.c b/src/egl/main/eglmisc.c index b10783bcb9..eb3dde1fb4 100644 --- a/src/egl/main/eglmisc.c +++ b/src/egl/main/eglmisc.c @@ -85,6 +85,7 @@ _eglUpdateExtensionsString(_EGLDisplay *dpy)     _EGL_CHECK_EXTENSION(MESA_screen_surface);     _EGL_CHECK_EXTENSION(MESA_copy_context);     _EGL_CHECK_EXTENSION(MESA_drm_display); +   _EGL_CHECK_EXTENSION(MESA_drm_image);     _EGL_CHECK_EXTENSION(KHR_image_base);     _EGL_CHECK_EXTENSION(KHR_image_pixmap);  | 
