diff options
| author | Michal Srb <msrb@suse.com> | 2018-06-06 13:33:37 +0200 |
|---|---|---|
| committer | Michal Srb <msrb@suse.com> | 2018-06-08 11:07:17 +0200 |
| commit | 3a37af39e040b7731df2c3751991b8b413ba8ecf (patch) | |
| tree | 9f84c4c204daad8851e8376c28af99efbf2c0de0 /unix/xserver/hw | |
| parent | 609a9c89e9e0b7869c6537ee882757ca6932efd5 (diff) | |
| download | tigervnc-3a37af39e040b7731df2c3751991b8b413ba8ecf.tar.gz tigervnc-3a37af39e040b7731df2c3751991b8b413ba8ecf.zip | |
Add support for X server 1.20.0.
In-server GLVND requires xorgGlxCreateVendor call from InitOutput.
DPMS functions were moved to another location and no longer need to be faked.
xserver120.patch is a copy of xserver119.patch with refreshed contexts.
Diffstat (limited to 'unix/xserver/hw')
| -rw-r--r-- | unix/xserver/hw/vnc/xorg-version.h | 4 | ||||
| -rw-r--r-- | unix/xserver/hw/vnc/xvnc.c | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h index 9d1c0eb8..16145711 100644 --- a/unix/xserver/hw/vnc/xorg-version.h +++ b/unix/xserver/hw/vnc/xorg-version.h @@ -52,8 +52,10 @@ #define XORG 118 #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (19 * 100000) + (99 * 1000)) #define XORG 119 +#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (20 * 100000) + (99 * 1000)) +#define XORG 120 #else -#error "X.Org newer than 1.19 is not supported" +#error "X.Org newer than 1.20 is not supported" #endif #endif diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c index 57152cd5..9a61b1ef 100644 --- a/unix/xserver/hw/vnc/xvnc.c +++ b/unix/xserver/hw/vnc/xvnc.c @@ -202,6 +202,7 @@ vfbBitsPerPixel(int depth) static void vfbFreeFramebufferMemory(vfbFramebufferInfoPtr pfb); #ifdef DPMSExtension +#if XORG < 120 /* Why support DPMS? Because stupid modern desktop environments such as Unity 2D on Ubuntu 11.10 crashes if DPMS is not available. (DPMSSet is called by dpms.c, but the return value @@ -218,6 +219,7 @@ Bool DPMSSupported(void) return FALSE; } #endif +#endif #if XORG < 111 void ddxGiveUp() @@ -1738,6 +1740,10 @@ InitOutput(ScreenInfo *scrInfo, int argc, char **argv) vncPrintBanner(); +#if XORG >= 120 + xorgGlxCreateVendor(); +#else + #if XORG >= 113 #ifdef GLXEXT if (serverGeneration == 1) @@ -1749,6 +1755,8 @@ InitOutput(ScreenInfo *scrInfo, int argc, char **argv) #endif #endif +#endif + /* initialize pixmap formats */ /* must have a pixmap depth to match every screen depth */ |