diff options
| author | Eric Anholt <eric@anholt.net> | 2013-12-30 18:33:09 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-03-17 14:30:49 -0700 |
| commit | 4e21b7ee49bc8f33c6211411d80aa70b16998adc (patch) | |
| tree | bcfc217df4df3916274eb85a0f4381f8f78d534b | |
| parent | 92e2125c5219c7b270785f063fe2560583b2baff (diff) | |
glamor: Drop the body of the function for enabling DRI3 extensions.
The flag is already being set at glamor_egl_screen_init() time, so no
need for the driver to separately call this. That said, leave the
function around to keep the ABI compatibility.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
| -rw-r--r-- | glamor/glamor.h | 8 | ||||
| -rw-r--r-- | glamor/glamor_egl.c | 7 |
2 files changed, 1 insertions, 14 deletions
diff --git a/glamor/glamor.h b/glamor/glamor.h index 9cda46d2b..be46a5251 100644 --- a/glamor/glamor.h +++ b/glamor/glamor.h @@ -247,14 +247,6 @@ extern _X_EXPORT PixmapPtr glamor_pixmap_from_fd(ScreenPtr screen, * */ extern _X_EXPORT Bool glamor_egl_init(ScrnInfoPtr scrn, int fd); -/* @glamor_egl_init_textured_pixmap: Initialization for textured pixmap allocation. - * - * @screen: Current screen pointer. - * - * This function must be called before any textured pixmap's creation including - * the screen pixmap. Could be called from DDX's screenInit function after the calling - * to glamor_init.. - */ extern _X_EXPORT Bool glamor_egl_init_textured_pixmap(ScreenPtr screen); /* @glamor_egl_create_textured_screen: Create textured screen pixmap. diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index f24cb28a5..f3835afa2 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_egl.c @@ -831,14 +831,9 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd) return TRUE; } +/** Stub to retain compatibility with pre-server-1.16 ABI. */ Bool glamor_egl_init_textured_pixmap(ScreenPtr screen) { - ScrnInfoPtr scrn = xf86ScreenToScrn(screen); - struct glamor_egl_screen_private *glamor_egl = - glamor_egl_get_screen_private(scrn); - - if (glamor_egl->dri3_capable) - glamor_enable_dri3(screen); return TRUE; } |