diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2014-04-08 09:17:51 -0700 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2014-04-21 11:15:21 -0700 |
| commit | 552d40b26a082df6f1816bb461793b8fa8b553c6 (patch) | |
| tree | a56b025150455c028b1bb629846757c282151b0a | |
| parent | c7011249d2abe6cc7af82ee4b79d8f6873444707 (diff) | |
xwayland: Build without GLX extension
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
| -rw-r--r-- | hw/xwayland/xwayland.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c index c2c6481af..5cecefd3a 100644 --- a/hw/xwayland/xwayland.c +++ b/hw/xwayland/xwayland.c @@ -616,8 +616,10 @@ xwl_log_handler(const char *format, va_list args) FatalError("%s", msg); } -static const ExtensionModule glx_extension[] = { +static const ExtensionModule xwayland_extensions[] = { +#ifdef GLXEXT { GlxExtensionInit, "GLX", &noGlxExtension }, +#endif }; void @@ -639,7 +641,8 @@ InitOutput(ScreenInfo * screen_info, int argc, char **argv) screen_info->bitmapBitOrder = BITMAP_BIT_ORDER; screen_info->numPixmapFormats = ARRAY_SIZE(depths); - LoadExtensionList(glx_extension, ARRAY_SIZE(glx_extension), FALSE); + LoadExtensionList(xwayland_extensions, + ARRAY_SIZE(xwayland_extensions), FALSE); /* Cast away warning from missing printf annotation for * wl_log_func_t. Wayland 1.5 will have the annotation, so we can |