xserver: Branch 'master'
Adam Jackson
ajax at kemper.freedesktop.org
Mon Feb 19 17:46:17 UTC 2018
hw/xwin/InitOutput.c | 2 ++
hw/xwin/meson.build | 1 +
2 files changed, 3 insertions(+)
New commits:
commit 6f9d29040cd9f4723a2e6c1e5d2ec8104efc0710
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date: Fri Feb 16 16:44:37 2018 +0000
hw/xwin: Update for glxvnd
- Link with libglxvnd in meson.build
- Call xorgGlxCreateVendor() like all other DDX
Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index ef19f7941..9560c5684 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -1012,6 +1012,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
}
}
+ xorgGlxCreateVendor();
+
/* Generate a cookie used by internal clients for authorization */
if (g_fXdmcpEnabled || g_fAuthEnabled)
winGenerateAuthorization();
diff --git a/hw/xwin/meson.build b/hw/xwin/meson.build
index 87fa6c5cb..bee4a46a4 100644
--- a/hw/xwin/meson.build
+++ b/hw/xwin/meson.build
@@ -149,6 +149,7 @@ executable(
libxserver_fb,
libxserver,
libxserver_glx,
+ libglxvnd,
libxserver_xkb_stubs,
libxserver_miext_shadow,
libxserver_pseudoramix,
More information about the xorg-commit
mailing list