diff options
| author | Jonathan Gray <jsg@jsg.id.au> | 2015-04-15 21:29:58 +1000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2015-05-12 09:38:58 -0700 |
| commit | 00f79416b19f0cde68291aced44ab07b9b76f7b8 (patch) | |
| tree | a8668b60a16a05ea26db6b6bc82ae1566157784b | |
| parent | 7c609c911a3a33b7e4ddad46b8fc42878a073ee7 (diff) | |
glamor: fix build when DRI3 is not defined
Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | glamor/glamor_egl.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index 6033780f8..dc5456118 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_egl.c @@ -595,6 +595,7 @@ glamor_egl_close_screen(ScreenPtr screen) return screen->CloseScreen(screen); } +#ifdef DRI3 static int glamor_dri3_open_client(ClientPtr client, ScreenPtr screen, @@ -651,12 +652,12 @@ static dri3_screen_info_rec glamor_dri3_info = { .pixmap_from_fd = glamor_pixmap_from_fd, .fd_from_pixmap = glamor_fd_from_pixmap, }; +#endif /* DRI3 */ void glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx) { ScrnInfoPtr scrn = xf86ScreenToScrn(screen); - glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); struct glamor_egl_screen_private *glamor_egl = glamor_egl_get_screen_private(scrn); @@ -668,7 +669,9 @@ glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx) glamor_ctx->make_current = glamor_egl_make_current; +#ifdef DRI3 if (glamor_egl->dri3_capable) { + glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); /* Tell the core that we have the interfaces for import/export * of pixmaps. */ @@ -691,6 +694,7 @@ glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx) } } } +#endif } static void |