Merge branch 'dri3' of github.com:CendioOssman/tigervnc

TigerVNC · Jun 20, 2024 · 75b4322 · 75b4322
2 parents 4812f13 + b0d6b14
commit 75b4322
Show file tree

Hide file tree

Showing 17 changed files with 1,634 additions and 98 deletions.
diff --git a/contrib/packages/deb/ubuntu-focal/debian/rules b/contrib/packages/deb/ubuntu-focal/debian/rules
@@ -102,7 +102,7 @@ config-stamp: xorg-source-stamp
 		--enable-xdmcp \
 		--enable-xdm-auth-1 \
 		--enable-glx \
-		--disable-dri --enable-dri2 --disable-dri3 \
+		--disable-dri --enable-dri2 --enable-dri3 \
 		--enable-xinerama \
 		--enable-xf86vidmode \
 		--enable-xace \

diff --git a/contrib/packages/deb/ubuntu-jammy/debian/rules b/contrib/packages/deb/ubuntu-jammy/debian/rules
@@ -45,7 +45,7 @@ XORG_SOURCE_ARCHIVE = /usr/src/xorg-server.tar.xz
 
 xorg-source-stamp: $(XORG_SOURCE_ARCHIVE)
 	tar -C unix/xserver -axf $(XORG_SOURCE_ARCHIVE) --strip-components=1
-	cd unix/xserver && patch -p1 < ../xserver21.1.1.patch
+	cd unix/xserver && patch -p1 < ../xserver21.patch
 	patch -p1 < debian/xorg-source-patches/516_tigervnc-xorg-manpages.patch
 	touch xorg-source-stamp
 
@@ -102,7 +102,7 @@ config-stamp: xorg-source-stamp
 		--enable-xdmcp \
 		--enable-xdm-auth-1 \
 		--enable-glx \
-		--disable-dri --enable-dri2 --disable-dri3 \
+		--disable-dri --enable-dri2 --enable-dri3 \
 		--enable-xinerama \
 		--enable-xf86vidmode \
 		--enable-xace \

diff --git a/contrib/packages/deb/ubuntu-noble/debian/rules b/contrib/packages/deb/ubuntu-noble/debian/rules
@@ -45,7 +45,7 @@ XORG_SOURCE_ARCHIVE = /usr/src/xorg-server.tar.xz
 
 xorg-source-stamp: $(XORG_SOURCE_ARCHIVE)
 	tar -C unix/xserver -axf $(XORG_SOURCE_ARCHIVE) --strip-components=1
-	cd unix/xserver && patch -p1 < ../xserver21.1.1.patch
+	cd unix/xserver && patch -p1 < ../xserver21.patch
 	patch -p1 < debian/xorg-source-patches/516_tigervnc-xorg-manpages.patch
 	touch xorg-source-stamp
 
@@ -102,7 +102,7 @@ config-stamp: xorg-source-stamp
 		--enable-xdmcp \
 		--enable-xdm-auth-1 \
 		--enable-glx \
-		--disable-dri --enable-dri2 --disable-dri3 \
+		--disable-dri --enable-dri2 --enable-dri3 \
 		--enable-xinerama \
 		--enable-xf86vidmode \
 		--enable-xace \

diff --git a/contrib/packages/rpm/el7/SPECS/tigervnc.spec b/contrib/packages/rpm/el7/SPECS/tigervnc.spec
@@ -27,7 +27,7 @@ BuildRequires: xorg-x11-server-source
 BuildRequires: libXext-devel, libX11-devel, libXi-devel, libXfixes-devel
 BuildRequires: libXdamage-devel, libXrandr-devel, libXt-devel, libXdmcp-devel
 BuildRequires: libXinerama-devel, mesa-libGL-devel, libxshmfence-devel
-BuildRequires: pixman-devel, libdrm-devel,
+BuildRequires: pixman-devel, libdrm-devel, mesa-libgbm-devel
 BuildRequires: xorg-x11-util-macros, xorg-x11-xtrans-devel, libXtst-devel
 BuildRequires: xorg-x11-font-utils
 BuildRequires:  libXfont2-devel
@@ -159,7 +159,7 @@ autoreconf -fiv
         --with-pic --disable-static \
         --with-default-font-path="catalogue:%{_sysconfdir}/X11/fontpath.d,built-ins" \
         --with-xkb-output=%{_localstatedir}/lib/xkb \
-        --enable-glx --disable-dri --enable-dri2 --disable-dri3 \
+        --enable-glx --disable-dri --enable-dri2 --enable-dri3 \
         --disable-unit-tests \
         --disable-config-hal \
         --disable-config-udev \

diff --git a/contrib/packages/rpm/el8/SPECS/tigervnc.spec b/contrib/packages/rpm/el8/SPECS/tigervnc.spec
@@ -28,7 +28,7 @@ BuildRequires: xorg-x11-server-source
 BuildRequires: libXext-devel, libX11-devel, libXi-devel, libXfixes-devel
 BuildRequires: libXdamage-devel, libXrandr-devel, libXt-devel, libXdmcp-devel
 BuildRequires: libXinerama-devel, mesa-libGL-devel, libxshmfence-devel
-BuildRequires: pixman-devel, libdrm-devel,
+BuildRequires: pixman-devel, libdrm-devel, mesa-libgbm-devel
 BuildRequires: xorg-x11-util-macros, xorg-x11-xtrans-devel, libXtst-devel
 BuildRequires: xorg-x11-font-utils
 BuildRequires:  libXfont2-devel
@@ -152,7 +152,7 @@ autoreconf -fiv
         --with-pic --disable-static \
         --with-default-font-path="catalogue:%{_sysconfdir}/X11/fontpath.d,built-ins" \
         --with-xkb-output=%{_localstatedir}/lib/xkb \
-        --enable-glx --disable-dri --enable-dri2 --disable-dri3 \
+        --enable-glx --disable-dri --enable-dri2 --enable-dri3 \
         --disable-unit-tests \
         --disable-config-hal \
         --disable-config-udev \

diff --git a/contrib/packages/rpm/el9/SPECS/tigervnc.spec b/contrib/packages/rpm/el9/SPECS/tigervnc.spec
@@ -28,7 +28,7 @@ BuildRequires: xorg-x11-server-source
 BuildRequires: libXext-devel, libX11-devel, libXi-devel, libXfixes-devel
 BuildRequires: libXdamage-devel, libXrandr-devel, libXt-devel, libXdmcp-devel
 BuildRequires: libXinerama-devel, mesa-libGL-devel, libxshmfence-devel
-BuildRequires: pixman-devel, libdrm-devel,
+BuildRequires: pixman-devel, libdrm-devel, mesa-libgbm-devel
 BuildRequires: xorg-x11-util-macros, xorg-x11-xtrans-devel, libXtst-devel
 BuildRequires:  libXfont2-devel
 # SELinux
@@ -151,7 +151,7 @@ autoreconf -fiv
         --with-pic --disable-static \
         --with-default-font-path="catalogue:%{_sysconfdir}/X11/fontpath.d,built-ins" \
         --with-xkb-output=%{_localstatedir}/lib/xkb \
-        --enable-glx --disable-dri --enable-dri2 --disable-dri3 \
+        --enable-glx --disable-dri --enable-dri2 --enable-dri3 \
         --disable-unit-tests \
         --disable-config-hal \
         --disable-config-udev \

diff --git a/unix/vncconfig/vncExt.h b/unix/vncconfig/vncExt.h
@@ -64,7 +64,7 @@ typedef struct {
 
 #ifdef _VNCEXT_PROTO_
 
-#define VNCEXTNAME "VNC-EXTENSION"
+#define VNCEXTNAME "TIGERVNC"
 
 typedef struct {
   CARD8 reqType;       /* always VncExtReqCode */

diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am
@@ -42,6 +42,8 @@ Xvnc_SOURCES = xvnc.c \
 # recommendation for coaxing automake.
 nodist_EXTRA_Xvnc_SOURCES = dummy.cxx
 
+Xvnc_CPPFLAGS = $(AM_CPPFLAGS)
+
 LOCAL_LIBS = \
 	$(XVNC_LIBS) \
 	$(XSERVER_LIBS) \
@@ -53,6 +55,14 @@ Xvnc_LDADD = $(LOCAL_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS)
 
 Xvnc_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
 
+if DRI3
+Xvnc_SOURCES += vncDRI3.h vncDRI3.c vncDRI3Draw.c
+Xvnc_CPPFLAGS += \
+	-I$(top_srcdir)/dri3 \
+	$(GBM_CFLAGS)
+Xvnc_LDADD += $(GBM_LIBS)
+endif
+
 libvnc_la_LTLIBRARIES = libvnc.la
 libvnc_ladir = $(moduledir)/extensions
 

diff --git a/unix/xserver/hw/vnc/Xvnc.man b/unix/xserver/hw/vnc/Xvnc.man
@@ -46,6 +46,12 @@ Specify pixel format for server to use (BGRnnn or RGBnnn). The default for
 depth 16 is RGB565 and for depth 24 and 32 is RGB888.
 .
 .TP
+.B \-rendernode \fIpath\fP
+DRM render node to use for DRI3 GPU acceleration. Specify an empty path to
+disable DRI3. Default is \fBauto\fP which makes \fBXvnc\fP pick a suitable
+available render node.
+.
+.TP
 .B \-interface \fIIP address\fP
 Listen on interface. By default Xvnc listens on all available interfaces.
 .