diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-15 16:50:35 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-15 16:50:35 +0200 |
| commit | 54db46582aba2252d544fa3956522f9ef06b49cb (patch) | |
| tree | e3692fa2c3864c2bd13089d80bbaccb86b5d4825 /xorg-server/hw/xwin | |
| parent | 8223fb176264123c86c0d3eb845973d00fd62cc2 (diff) | |
| download | vcxsrv-54db46582aba2252d544fa3956522f9ef06b49cb.tar.gz vcxsrv-54db46582aba2252d544fa3956522f9ef06b49cb.tar.bz2 vcxsrv-54db46582aba2252d544fa3956522f9ef06b49cb.zip | |
xserver mesa pixman git update 15 oct 2012
xserver: a69429a17bf4630f6e26f61630a1c2b287202627
pixman: d5f2f39319fc358cccda60abe0bc927bd27131c1
mesa: 4004620d34a580c8fdb965d9b640e97453fc8b28
Diffstat (limited to 'xorg-server/hw/xwin')
| -rw-r--r-- | xorg-server/hw/xwin/InitOutput.c | 5 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/Makefile.am | 3 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/glx/Makefile.am | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c index 37cd8b357..1cf0f02eb 100644 --- a/xorg-server/hw/xwin/InitOutput.c +++ b/xorg-server/hw/xwin/InitOutput.c @@ -164,7 +164,7 @@ void XwinExtensionInit(void) int i; #ifdef XWIN_GLX_WINDOWS - if ((g_fNativeGl) && (serverGeneration == 1)) { + if (g_fNativeGl) { /* install the native GL provider */ glxWinPushNativeProvider(); } @@ -901,7 +901,8 @@ InitOutput(ScreenInfo * screenInfo, int argc, char *argv[]) { int i; - XwinExtensionInit(); + if (serverGeneration == 1) + XwinExtensionInit(); /* Log the command line */ winLogCommandLine(argc, argv); diff --git a/xorg-server/hw/xwin/Makefile.am b/xorg-server/hw/xwin/Makefile.am index 4c2f04ef0..33729a906 100644 --- a/xorg-server/hw/xwin/Makefile.am +++ b/xorg-server/hw/xwin/Makefile.am @@ -109,13 +109,16 @@ SRCS = InitInput.c \ winclipboard.h \ winconfig.h \ win.h \ + winglobals.h \ winkeybd.h \ winkeynames.h \ winlayouts.h \ winmessages.h \ + winmonitors.h \ winmsg.h \ winms.h \ winmultiwindowclass.h \ + winmultiwindowicons.h \ winprefs.h \ winresource.h \ winwindow.h \ diff --git a/xorg-server/hw/xwin/glx/Makefile.am b/xorg-server/hw/xwin/glx/Makefile.am index 7222a9f21..59f6879a7 100644 --- a/xorg-server/hw/xwin/glx/Makefile.am +++ b/xorg-server/hw/xwin/glx/Makefile.am @@ -6,7 +6,8 @@ libXwinGLX_la_SOURCES = \ glwindows.h \ glwrap.c \ indirect.c \ - wgl_ext_api.c + wgl_ext_api.c \ + wgl_ext_api.h if XWIN_MULTIWINDOW DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW |