<div dir="ltr"> <div class="gmail_extra"> <div class="gmail_quote">On Fri, Apr 18, 2014 at 3:37 PM, Sarah Sharp <<a href="mailto:sarah.a.sharp@linux.intel.com" target="_blank">sarah.a.sharp@linux.intel.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Chromium defined a new GL extension (that isn't registered with Khronos). </blockquote><div> </div><div>This here is the problem IMO. I'll see next week what we can do about pushing for this to become a registered extension. Intel would be our 2nd implementation, so I think we have enough support at this point. </div><div> </div><div>StÃ©phane</div><div>Â </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> We need to add an EGL extension for it, so we can migrate ChromeOS on Intel systems to use EGL instead of GLX. <a href="http://git.chromium.org/gitweb/?p=chromium/src/third_party/khronos.git;a=commitdiff;h=27cbfdab35c601f70aa150581ad1448d0401f447" target="_blank">http://git.chromium.org/gitweb/?p=chromium/src/third_party/khronos.git;a=commitdiff;h=27cbfdab35c601f70aa150581ad1448d0401f447</a> The extension is similar to the GLX extension OML_sync_control, but only defines one function, eglGetSyncValuesCHROMIUM, which is equivalent to glXGetSyncValuesOML. <a href="http://www.opengl.org/registry/specs/OML/glx_sync_control.txt" target="_blank">http://www.opengl.org/registry/specs/OML/glx_sync_control.txt</a> One open question: I've used the normal (error checked) version of xcb_dri2_get_msc. Â The GLX implementation of glXGetSyncValuesOML uses the unchecked version, but I'm not convinced it's necessary. I talked to Jamey Sharp, and he doesn't understand why most of Mesa calls the unchecked versions of XCB functions. Â He thought most developers would want to use the normal (checked) versions, since the unchecked versions may segfault on errors. Â Mesa can always call the checked version, but ignore the error that's set, so it doesn't have to use the unchecked version. I talked to Kristen HÃ¸gsberg, who added most of the Mesa XCB calls, and he said he copied the style from Chris Wilson. Â If using the unchecked versions isn't required, we should look into moving the XCB calls in Mesa to the normal checked versions. Â Otherwise people will just keep copy-pasting the unchecked versions around. Signed-off-by: Sarah Sharp <<a href="mailto:sarah.a.sharp@linux.intel.com" target="_blank">sarah.a.sharp@linux.intel.com</a>> Cc: Chad Versace <<a href="mailto:chad.versace@linux.intel.com" target="_blank">chad.versace@linux.intel.com</a>> Cc: Kristian HÃ¸gsberg <<a href="mailto:krh@bitplanet.net" target="_blank">krh@bitplanet.net</a>> Cc: Jamey Sharp <<a href="mailto:jamey@minilop.net" target="_blank">jamey@minilop.net</a>> --- Â include/EGL/eglext.h Â Â Â Â Â Â Â Â Â Â Â | 10 ++++++++++ Â src/egl/drivers/dri2/egl_dri2.c Â Â Â Â Â | 15 +++++++++++++++ Â src/egl/drivers/dri2/egl_dri2.h Â Â Â Â Â | Â 4 ++++ Â src/egl/drivers/dri2/egl_dri2_fallbacks.h | Â 8 ++++++++ Â src/egl/drivers/dri2/platform_android.c Â | Â 1 + Â src/egl/drivers/dri2/platform_drm.c Â Â Â | Â 1 + Â src/egl/drivers/dri2/platform_wayland.c Â | Â 1 + Â src/egl/drivers/dri2/platform_x11.c Â Â Â | 27 +++++++++++++++++++++++++++ Â src/egl/main/eglapi.c Â Â Â Â Â Â Â Â Â Â | 27 +++++++++++++++++++++++++++ Â src/egl/main/eglapi.h Â Â Â Â Â Â Â Â Â Â | Â 7 +++++++ Â src/egl/main/egldisplay.h Â Â Â Â Â Â Â Â | Â 1 + Â src/egl/main/eglmisc.c Â Â Â Â Â Â Â Â Â Â | Â 1 + Â 12 files changed, 103 insertions(+) diff --git a/include/EGL/eglext.h b/include/EGL/eglext.h index 243da4a..097ad68 100644 --- a/include/EGL/eglext.h +++ b/include/EGL/eglext.h @@ -588,6 +588,16 @@ EGLAPI EGLBoolean EGLAPIENTRY eglPostSubBufferNV (EGLDisplay dpy, EGLSurface sur Â #endif Â #endif /* EGL_NV_post_sub_buffer */ +#if KHRONOS_SUPPORT_INT64 Â /* EGLSyncControlCHROMIUM requires 64-bit uint support */ +#ifndef EGL_CHROMIUM_sync_control +#define EGL_CHROMIUM_sync_control 1 +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncValuesCHROMIUM(EGLDisplay dpy, EGLSurface surface, EGLuint64KHR *ust, EGLuint64KHR *msc, EGLuint64KHR *sbc); +#endif /* EGL_EGLEXT_PROTOTYPES */ +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCVALUESCHROMIUMPROC)(EGLDisplay dpy, EGLSurface surface, EGLuint64KHR *ust, EGLuint64KHR *msc, EGLuint64KHR *sbc); +#endif +#endif + Â #ifndef EGL_NV_stream_sync Â #define EGL_NV_stream_sync 1 Â #define EGL_SYNC_NEW_FRAME_NV Â Â Â Â Â Â 0x321F diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index dc541ad..df8d9af 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -1386,6 +1386,18 @@ dri2_create_image_wayland_wl_buffer(_EGLDisplay *disp, _EGLContext *ctx, Â } Â #endif +#ifdef EGL_CHROMIUM_sync_control +static EGLBoolean +dri2_get_sync_values_chromium(_EGLDisplay *dpy, _EGLSurface *surf, + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â EGLuint64KHR *ust, EGLuint64KHR *msc, + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â EGLuint64KHR *sbc) +{ + Â struct dri2_egl_display *dri2_dpy = dri2_egl_display(dpy); + Â return dri2_dpy->vtbl->get_sync_values(dpy, surf, ust, msc, sbc); +} +#endif + + Â /** Â * Set the error code after a call to Â * dri2_egl_image::dri_image::createImageFromTexture. @@ -2177,6 +2189,9 @@ _eglBuiltInDriverDRI2(const char *args) Â Â dri2_drv->base.API.UnbindWaylandDisplayWL = dri2_unbind_wayland_display_wl; Â Â dri2_drv->base.API.QueryWaylandBufferWL = dri2_query_wayland_buffer_wl; Â #endif +#ifdef EGL_CHROMIUM_sync_control + Â dri2_drv->base.API.GetSyncValuesCHROMIUM = dri2_get_sync_values_chromium; +#endif Â Â dri2_drv->base.Name = "DRI2"; Â Â dri2_drv->base.Unload = dri2_unload; diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index e62e265..44f26fb 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -138,6 +138,10 @@ struct dri2_egl_display_vtbl { Â Â struct wl_buffer* (*create_wayland_buffer_from_image)( Â Â Â Â Â Â Â Â Â Â Â Â Â _EGLDriver *drv, _EGLDisplay *dpy, _EGLImage *img); + + Â EGLBoolean (*get_sync_values)(_EGLDisplay *display, _EGLSurface *surface, + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â EGLuint64KHR *ust, EGLuint64KHR *msc, + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â EGLuint64KHR *sbc); Â }; Â struct dri2_egl_display diff --git a/src/egl/drivers/dri2/egl_dri2_fallbacks.h b/src/egl/drivers/dri2/egl_dri2_fallbacks.h index a5cf344..9cba001 100644 --- a/src/egl/drivers/dri2/egl_dri2_fallbacks.h +++ b/src/egl/drivers/dri2/egl_dri2_fallbacks.h @@ -98,3 +98,11 @@ dri2_fallback_create_wayland_buffer_from_image(_EGLDriver *drv, Â { Â Â return NULL; Â } + +static inline EGLBoolean +dri2_fallback_get_sync_values(_EGLDisplay *dpy, _EGLSurface *surf, + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â EGLuint64KHR *ust, EGLuint64KHR *msc, + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â EGLuint64KHR *sbc) +{ + Â return EGL_FALSE; +} diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index 7b1db76..71948bd 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -650,6 +650,7 @@ static struct dri2_egl_display_vtbl droid_display_vtbl = { Â Â .copy_buffers = dri2_fallback_copy_buffers, Â Â .query_buffer_age = dri2_fallback_query_buffer_age, Â Â .create_wayland_buffer_from_image = dri2_fallback_create_wayland_buffer_from_image, + Â .get_sync_values = dri2_fallback_get_sync_values, Â }; Â EGLBoolean diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c index 9a7633a..52d8b49 100644 --- a/src/egl/drivers/dri2/platform_drm.c +++ b/src/egl/drivers/dri2/platform_drm.c @@ -472,6 +472,7 @@ static struct dri2_egl_display_vtbl dri2_drm_display_vtbl = { Â Â .copy_buffers = dri2_fallback_copy_buffers, Â Â .query_buffer_age = dri2_drm_query_buffer_age, Â Â .create_wayland_buffer_from_image = dri2_fallback_create_wayland_buffer_from_image, + Â .get_sync_values = dri2_fallback_get_sync_values, Â }; Â EGLBoolean diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index 691f3e1..efc5546 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -964,6 +964,7 @@ static struct dri2_egl_display_vtbl dri2_wl_display_vtbl = { Â Â .copy_buffers = dri2_fallback_copy_buffers, Â Â .query_buffer_age = dri2_wl_query_buffer_age, Â Â .create_wayland_buffer_from_image = dri2_wl_create_wayland_buffer_from_image, + Â .get_sync_values = dri2_fallback_get_sync_values, Â }; Â EGLBoolean diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index 7b585a2..a6b03cc 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -1008,6 +1008,30 @@ dri2_x11_swrast_create_image_khr(_EGLDriver *drv, _EGLDisplay *disp, Â Â return NULL; Â } +static EGLBoolean +dri2_x11_get_sync_values(_EGLDisplay *display, _EGLSurface *surface, + Â Â Â Â Â Â Â Â Â Â Â Â EGLuint64KHR *ust, EGLuint64KHR *msc, + Â Â Â Â Â Â Â Â Â Â Â Â EGLuint64KHR *sbc) +{ + Â struct dri2_egl_display *dri2_dpy = dri2_egl_display(display); + Â struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surface); + Â xcb_dri2_get_msc_cookie_t cookie; + Â xcb_dri2_get_msc_reply_t *reply; + + Â cookie = xcb_dri2_get_msc(dri2_dpy->conn, dri2_surf->drawable); + Â reply = xcb_dri2_get_msc_reply(dri2_dpy->conn, cookie, NULL); + + Â if (!reply) + Â Â Â return EGL_FALSE; + + Â *ust = ((EGLuint64KHR) reply->ust_hi << 32) | reply->ust_lo; + Â *msc = ((EGLuint64KHR) reply->msc_hi << 32) | reply->msc_lo; + Â *sbc = ((EGLuint64KHR) reply->sbc_hi << 32) | reply->sbc_lo; + Â free(reply); + + Â return EGL_TRUE; +} + Â static struct dri2_egl_display_vtbl dri2_x11_swrast_display_vtbl = { Â Â .authenticate = NULL, Â Â .create_window_surface = dri2_x11_create_window_surface, @@ -1022,6 +1046,7 @@ static struct dri2_egl_display_vtbl dri2_x11_swrast_display_vtbl = { Â Â .copy_buffers = dri2_x11_copy_buffers, Â Â .query_buffer_age = dri2_fallback_query_buffer_age, Â Â .create_wayland_buffer_from_image = dri2_fallback_create_wayland_buffer_from_image, + Â .get_sync_values = dri2_fallback_get_sync_values, Â }; Â static struct dri2_egl_display_vtbl dri2_x11_display_vtbl = { @@ -1039,6 +1064,7 @@ static struct dri2_egl_display_vtbl dri2_x11_display_vtbl = { Â Â .copy_buffers = dri2_x11_copy_buffers, Â Â .query_buffer_age = dri2_fallback_query_buffer_age, Â Â .create_wayland_buffer_from_image = dri2_fallback_create_wayland_buffer_from_image, + Â .get_sync_values = dri2_x11_get_sync_values, Â }; Â static EGLBoolean @@ -1243,6 +1269,7 @@ dri2_initialize_x11_dri2(_EGLDriver *drv, _EGLDisplay *disp) Â Â disp->Extensions.NOK_swap_region = EGL_TRUE; Â Â disp->Extensions.NOK_texture_from_pixmap = EGL_TRUE; Â Â disp->Extensions.NV_post_sub_buffer = EGL_TRUE; + Â disp->Extensions.CHROMIUM_get_sync_values = EGL_TRUE; Â #ifdef HAVE_WAYLAND_PLATFORM Â Â disp->Extensions.WL_bind_wayland_display = EGL_TRUE; diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 219d8e6..d876995 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -1086,6 +1086,9 @@ eglGetProcAddress(const char *procname) Â Â Â Â { "eglGetPlatformDisplayEXT", (_EGLProc) eglGetPlatformDisplayEXT }, Â Â Â Â { "eglCreatePlatformWindowSurfaceEXT", (_EGLProc) eglCreatePlatformWindowSurfaceEXT }, Â Â Â Â { "eglCreatePlatformPixmapSurfaceEXT", (_EGLProc) eglCreatePlatformPixmapSurfaceEXT }, +#ifdef EGL_CHROMIUM_sync_control + Â Â Â { "eglGetSyncValuesCHROMIUM", (_EGLProc) eglGetSyncValuesCHROMIUM }, +#endif Â Â Â Â { NULL, NULL } Â Â }; Â Â EGLint i; @@ -1751,3 +1754,27 @@ eglPostSubBufferNV(EGLDisplay dpy, EGLSurface surface, Â Â RETURN_EGL_EVAL(disp, ret); Â } + +#ifdef EGL_CHROMIUM_sync_control +EGLBoolean EGLAPIENTRY +eglGetSyncValuesCHROMIUM(EGLDisplay display, EGLSurface surface, + Â Â Â Â Â Â Â Â Â Â Â Â EGLuint64KHR *ust, EGLuint64KHR *msc, + Â Â Â Â Â Â Â Â Â Â Â Â EGLuint64KHR *sbc) +{ + Â _EGLDisplay *disp = _eglLockDisplay(display); + Â _EGLSurface *surf = _eglLookupSurface(surface, disp); + Â _EGLDriver *drv; + Â EGLBoolean ret; + + Â _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv); + Â if (!disp->Extensions.CHROMIUM_get_sync_values) + Â Â Â RETURN_EGL_EVAL(disp, EGL_FALSE); + + Â if (!ust || !msc || !sbc) + Â Â Â RETURN_EGL_EVAL(disp, EGL_FALSE); + + Â ret = drv->API.GetSyncValuesCHROMIUM(disp, surf, ust, msc, sbc); + + Â RETURN_EGL_EVAL(disp, ret); +} +#endif diff --git a/src/egl/main/eglapi.h b/src/egl/main/eglapi.h index f20ce5b..f176aa3 100644 --- a/src/egl/main/eglapi.h +++ b/src/egl/main/eglapi.h @@ -139,6 +139,10 @@ typedef EGLint (*QueryBufferAge_t)(_EGLDriver *drv, Â typedef EGLBoolean (*SwapBuffersWithDamageEXT_t) (_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surface, const EGLint *rects, EGLint n_rects); Â #endif +#ifdef EGL_CHROMIUM_sync_control +typedef EGLBoolean (*GetSyncValuesCHROMIUM_t) (_EGLDisplay *dpy, _EGLSurface *surface, EGLuint64KHR *ust, EGLuint64KHR *msc, EGLuint64KHR *sbc); +#endif + Â /** Â * The API dispatcher jumps through these functions Â */ @@ -225,6 +229,9 @@ struct _egl_api Â Â PostSubBufferNV_t PostSubBufferNV; Â Â QueryBufferAge_t QueryBufferAge; +#ifdef EGL_CHROMIUM_sync_control + Â GetSyncValuesCHROMIUM_t GetSyncValuesCHROMIUM; +#endif Â }; Â #endif /* EGLAPI_INCLUDED */ diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h index 970c21a..2dec6e4 100644 --- a/src/egl/main/egldisplay.h +++ b/src/egl/main/egldisplay.h @@ -119,6 +119,7 @@ struct _egl_extensions Â Â EGLBoolean EXT_buffer_age; Â Â EGLBoolean EXT_swap_buffers_with_damage; Â Â EGLBoolean EXT_image_dma_buf_import; + Â EGLBoolean CHROMIUM_get_sync_values; Â }; diff --git a/src/egl/main/eglmisc.c b/src/egl/main/eglmisc.c index 65669d8..d867d1f 100644 --- a/src/egl/main/eglmisc.c +++ b/src/egl/main/eglmisc.c @@ -123,6 +123,7 @@ _eglUpdateExtensionsString(_EGLDisplay *dpy) Â Â _EGL_CHECK_EXTENSION(EXT_image_dma_buf_import); Â Â _EGL_CHECK_EXTENSION(NV_post_sub_buffer); + Â _EGL_CHECK_EXTENSION(CHROMIUM_get_sync_values); Â #undef _EGL_CHECK_EXTENSION Â } -- 1.8.3.2 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div></div>