From owner-freebsd-x11@freebsd.org Wed Nov 22 10:33:41 2017 Return-Path: Delivered-To: freebsd-x11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 076C4DE716A for ; Wed, 22 Nov 2017 10:33:41 +0000 (UTC) (envelope-from danfe@regency.nsu.ru) Received: from mailman.ysv.freebsd.org (mailman.ysv.freebsd.org [IPv6:2001:1900:2254:206a::50:5]) by mx1.freebsd.org (Postfix) with ESMTP id E18B375CCE for ; Wed, 22 Nov 2017 10:33:40 +0000 (UTC) (envelope-from danfe@regency.nsu.ru) Received: by mailman.ysv.freebsd.org (Postfix) id DDD33DE7168; Wed, 22 Nov 2017 10:33:40 +0000 (UTC) Delivered-To: x11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DD734DE7167 for ; Wed, 22 Nov 2017 10:33:40 +0000 (UTC) (envelope-from danfe@regency.nsu.ru) Received: from mx.nsu.ru (mx.nsu.ru [84.237.50.39]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8E4F575CCD for ; Wed, 22 Nov 2017 10:33:40 +0000 (UTC) (envelope-from danfe@regency.nsu.ru) Received: from [84.237.50.47] (helo=regency.nsu.ru) by mx.nsu.ru with esmtp (Exim 4.72) (envelope-from ) id 1eHS1T-0008Em-Ta for x11@freebsd.org; Wed, 22 Nov 2017 17:12:51 +0700 Received: from regency.nsu.ru (localhost [127.0.0.1]) by regency.nsu.ru (8.14.2/8.14.2) with ESMTP id vAMAM0EE098403 for ; Wed, 22 Nov 2017 16:22:00 +0600 (NOVT) (envelope-from danfe@regency.nsu.ru) Received: (from danfe@localhost) by regency.nsu.ru (8.14.2/8.14.2/Submit) id vAMALtcv098338 for x11@freebsd.org; Wed, 22 Nov 2017 17:21:55 +0700 (+07) (envelope-from danfe) Date: Wed, 22 Nov 2017 17:21:55 +0700 From: Alexey Dokuchaev To: x11@freebsd.org Subject: [patch] x11-servers/xorg-server: glamor: Fix dashed line rendering (from upstream) Message-ID: <20171122102155.GA97343@regency.nsu.ru> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="FL5UXtIhxfXey3p5" Content-Disposition: inline Content-Transfer-Encoding: 8bit User-Agent: Mutt/1.4.2.1i X-KLMS-Rule-ID: 3 X-KLMS-Message-Action: skipped X-KLMS-AntiSpam-Status: not scanned, whitelist X-KLMS-AntiPhishing: not scanned, whitelist X-KLMS-AntiVirus: Kaspersky Security 8.0 for Linux Mail Server, version 8.0.1.705, not scanned, whitelist X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Nov 2017 10:33:41 -0000 --FL5UXtIhxfXey3p5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi there, May I commit the attached patch? It fixes displaying dashed and dotted lines in 2D applications (e.g. bounding boxes around active widgets e.g. buttons) which are drawn as solid lines without this patch. Found via openSUSE's xorg-x11-server package. ./danfe --FL5UXtIhxfXey3p5 Content-Type: text/plain; charset=koi8-r Content-Disposition: attachment; filename="patch-glamor_glamor__dash.c" Content-Transfer-Encoding: 8bit From: Eric Anholt 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 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 Reviewed-by: Keith Packard Reviewed-by: Michel Dänzer --- 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; --FL5UXtIhxfXey3p5--