diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2017-11-29 07:21:04 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2017-11-29 07:21:04 +0000 |
| commit | 4438a3336a3370ecb4fb9698f313fc431412cfc6 (patch) | |
| tree | aff0ef9ce72b3c603df7cb6b4a915c8a42b886e2 /x11-servers | |
| parent | c38ed84499479328e225d9ee7d0b35b50ffba71c (diff) | |
| download | ports-4438a3336a3370ecb4fb9698f313fc431412cfc6.tar.gz ports-4438a3336a3370ecb4fb9698f313fc431412cfc6.zip | |
x11-servers/xorg-server: Fix dashed/dotted line rendering with GLAMOR.
When drawing dashed lines with GLAMOR, they were drawn partially or as
a regular (solid) line, depending on the OpenGL backend. It behaved
so because screen pixmap was bound as the dash and sampling its alpha,
which is usually just 1.0 (no dashing at all).
Upstream bug: https://bugs.freedesktop.org/show_bug.cgi?id=99708
Fixed by: Eric Anholt (it's a pity that anholt@ no longer works
on FreeBSD)
Silence from: x11@
Notes
Notes:
svn path=/head/; revision=455095
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 2 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/patch-glamor_glamor__dash.c | 27 |
2 files changed, 28 insertions, 1 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 7d712814fee1..7b275af548a7 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -3,7 +3,7 @@ PORTNAME?= xorg-server PORTVERSION?= 1.18.4 -PORTREVISION?= 5 +PORTREVISION?= 6 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver diff --git a/x11-servers/xorg-server/files/patch-glamor_glamor__dash.c b/x11-servers/xorg-server/files/patch-glamor_glamor__dash.c new file mode 100644 index 000000000000..3255e4bd706c --- /dev/null +++ b/x11-servers/xorg-server/files/patch-glamor_glamor__dash.c @@ -0,0 +1,27 @@ +From: Eric Anholt <eric@anholt.net> +Date: Wed Mar 15 17:51:46 2017 -0700 +Subject: [PATCH]glamor: Fix dashed line rendering. +Patch-mainline: fe0b297420fc1de8a7fab28457d0864b3182e967 +References: boo#1021803 +Signed-off-by: Max Staudt <mstaudt@suse.de> + +We were binding the screen pixmap as the dash and sampling its alpha, +which is usually just 1.0 (no dashing at all). + +Please cherry-pick this to active stable branches. + +Signed-off-by: Eric Anholt <eric@anholt.net> +Reviewed-by: Keith Packard <keithp@keithp.com> +Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> + +--- glamor/glamor_dash.c.orig 2016-07-18 19:08:16 UTC ++++ glamor/glamor_dash.c +@@ -146,7 +146,7 @@ glamor_dash_setup(DrawablePtr drawable, GCPtr gc) + goto bail; + + dash_pixmap = glamor_get_dash_pixmap(gc); +- dash_priv = glamor_get_pixmap_private(pixmap); ++ dash_priv = glamor_get_pixmap_private(dash_pixmap); + + if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(dash_priv)) + goto bail; |