diff options
| author | Keith Packard <keithp@keithp.com> | 2014-04-04 16:28:43 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-04-08 13:53:58 -0700 |
| commit | 6ec04a75deb1695820e337abbefe1929d5928f15 (patch) | |
| tree | 0903165f7fd9a33057ca57f4ead137c1d7d2b1c6 /glamor/glamor_egl.c | |
| parent | 901fbfbbbd71c0d82080957f8ba09eebbc786f2b (diff) | |
dri3: Fix dri3_open API change by adding new dri3_open_client
Xwayland will eventually need the current client in dri3_open. Simply
changing that API is not an option though as other drivers that
implement DRI3 will not have a matching function signature and will
crash when called.
Add a new dri3_open_client function pointer and bump
DRI3_SCREEN_INFO_VERSION so that drivers can be aware of the new
function which will be used in preference to the old function when
available.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anhole <eric@anholt.net>
Diffstat (limited to 'glamor/glamor_egl.c')
| -rw-r--r-- | glamor/glamor_egl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index e2b6a9226..d37de9b95 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_egl.c @@ -608,10 +608,10 @@ glamor_egl_close_screen(ScreenPtr screen) } static int -glamor_dri3_open(ClientPtr client, - ScreenPtr screen, - RRProviderPtr provider, - int *fdp) +glamor_dri3_open_client(ClientPtr client, + ScreenPtr screen, + RRProviderPtr provider, + int *fdp) { ScrnInfoPtr scrn = xf86ScreenToScrn(screen); struct glamor_egl_screen_private *glamor_egl = @@ -658,8 +658,8 @@ glamor_dri3_open(ClientPtr client, } static dri3_screen_info_rec glamor_dri3_info = { - .version = 0, - .open = glamor_dri3_open, + .version = 1, + .open_client = glamor_dri3_open_client, .pixmap_from_fd = glamor_pixmap_from_fd, .fd_from_pixmap = glamor_fd_from_pixmap, }; |