Re: [PATCH:libXfont 2/2] Require fontsproto 2.1.3 for matching function prototypes

2014-04-21 Thread Thomas Klausner
For the series: Reviewed-by: Thomas Klausner w...@netbsd.org Thomas On Sun, Apr 20, 2014 at 06:23:40PM -0700, Alan Coopersmith wrote: Building current libXfont git against fontsproto 2.1.2 causes clang complaints of: patcache.c:130:1: error: conflicting types for 'CacheFontPattern'

Re: glamor versus AIGLX GL context series

2014-04-21 Thread Michel Dänzer
On 19.04.2014 03:39, Eric Anholt wrote: Here it is, at long last. I was stumped for several days with a weird fbo incomplete that was happening after my first round of fixes, and it took a day's detour of cooking up a Xephyr with DRI3 to get a fast debug environment and figure out what was

[PATCH:libXfont-1.4 v2] Require fontsproto 2.1.3 for matching function prototypes

2014-04-21 Thread Alan Coopersmith
Building libXfont-1.4.x against fontsproto 2.1.3 causes clang complaints of: patcache.c:130:1: error: conflicting types for 'CacheFontPattern' CacheFontPattern (FontPatternCachePtr cache, ^ patcache.c:176:1: error: conflicting types for 'FindCachedFontPattern' FindCachedFontPattern

Re: [PATCH:libXfont-1.4 v2] Require fontsproto 2.1.3 for matching function prototypes

2014-04-21 Thread Thomas Klausner
Looks good. Reviewed-By: Thomas Klausner w...@netbsd.org On Mon, Apr 21, 2014 at 07:31:59AM -0700, Alan Coopersmith wrote: Building libXfont-1.4.x against fontsproto 2.1.3 causes clang complaints of: patcache.c:130:1: error: conflicting types for 'CacheFontPattern' CacheFontPattern

Re: [PATCH] Make glamor build with --enable-debug.

2014-04-21 Thread Eric Anholt
Jamey Sharp ja...@minilop.net writes: Bad anholt, no biscuit. Broken in commit 4c9a20072552c52b3763bd73e7a7e9b9cb8b4993. Applied this to my -fixes tree, which I expect to send pull-request for today. pgpKeoY_SrHjF.pgp Description: PGP signature ___

Re: bug in glamor on ShmPutImage for XY images

2014-04-21 Thread Eric Anholt
Jamey Sharp ja...@minilop.net writes: I haven't understood enough of the implementation to see how to fix this, but I can reliably crash Xephyr this way: hw/kdrive/ephyr/Xephyr :1 -screen 1024x768 -glamor DISPLAY=:1 x11perf -shmputxy10 Without the -glamor option to Xephyr, the x11perf

[PATCH] glamor: Fix accelerated rendering of GTK's ARGB vs xBGR composites.

2014-04-21 Thread Eric Anholt
There is some complicated code to support tweaking the format as we upload from a SHM pixmap (aka the GTK icon cache), but if we weren't sourcing from a SHM pixmap we just forgot to check that the formats matched at all. We could potentially be a little more discerning here (xRGB source and ARGB

[PULL] Xwayland fixes

2014-04-21 Thread Kristian Høgsberg
The following changes since commit c7011249d2abe6cc7af82ee4b79d8f6873444707: xkb: Verify reads of compiled keymap header and TOC (2014-04-18 16:30:18 -0700) are available in the git repository at: ssh://people.freedesktop.org/~krh/xserver xwayland-for-keithp for you to fetch changes up to

[PATCH 4/8] Fix const cast warnings in our ops definitions.

2014-04-21 Thread Eric Anholt
We only store string literals here. --- rendercheck.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rendercheck.h b/rendercheck.h index 6cae450..7da59a5 100644 --- a/rendercheck.h +++ b/rendercheck.h @@ -64,7 +64,7 @@ typedef struct _picture_info { struct op_info {

[PATCH 6/8] Disable useless shadow warnings.

2014-04-21 Thread Eric Anholt
They never find real bugs in my experience. --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 4fa5a63..4ec7a8f 100644 --- a/configure.ac +++ b/configure.ac @@ -17,6 +17,7 @@ m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install

[PATCH 2/8] Drop a duplicated prototype.

2014-04-21 Thread Eric Anholt
--- rendercheck.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/rendercheck.h b/rendercheck.h index 34d06c5..6cae450 100644 --- a/rendercheck.h +++ b/rendercheck.h @@ -194,9 +194,6 @@ trans_srccoords_test_2(Display *dpy, picture_info *win, picture_info *white, Bool

[PATCH 3/8] Drop duplicated extern definitions.

2014-04-21 Thread Eric Anholt
--- main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/main.c b/main.c index 9a97d72..241c03d 100644 --- a/main.c +++ b/main.c @@ -26,9 +26,6 @@ #include string.h #include getopt.h -extern int num_ops; -extern int num_colors; - Bool is_verbose = FALSE, minimalrendering = FALSE;

[PATCH 7/8] Shut up some const assignment warnings.

2014-04-21 Thread Eric Anholt
Trying to make all the callchain related to these const is too hard, and it's not like marking things const helps either the developer or the compiler. --- t_repeat.c | 2 +- t_srccoords.c | 2 +- t_tsrccoords.c | 2 +- t_tsrccoords2.c | 2 +- tests.c | 4 ++-- 5 files changed, 6

[PATCH 8/8] Add test for GTK rendering bug in glamor.

2014-04-21 Thread Eric Anholt
Signed-off-by: Eric Anholt e...@anholt.net --- COPYING | 19 +++ Makefile.am | 1 + main.c| 2 + rendercheck.h | 4 ++ t_gtk_argb_xbgr.c | 150 ++ tests.c | 10 6 files changed, 186

rendercheck: warnings cleanups and a new test

2014-04-21 Thread Eric Anholt
keithp sent me some code for a new test that reproduced a bug he was experiencing in glamor, so I pulled out rendercheck to add the testcase to it and found that it was really verbose with all the new warnings. The new warnings didn't appear to reveal actual bugs, though.

[PATCH 1/8] rendercheck: Fix compiler dead code warning.

2014-04-21 Thread Eric Anholt
This was apparently copy and pasted from the 1x1 repeat code above. --- tests.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests.c b/tests.c index f722bc6..e2ae645 100644 --- a/tests.c +++ b/tests.c @@ -390,14 +390,12 @@ do_tests(Display *dpy, picture_info *win) errx(1,

[PATCH 5/8] Convert to using asprintf for describe_format.

2014-04-21 Thread Eric Anholt
This simplifies the manual strcatting mess and avoids potential overflow issues. --- Makefile.am | 1 + main.c| 23 --- rendercheck.h | 2 +- t_blend.c | 6 -- t_fill.c | 7 --- tests.c | 27 +++ 6 files changed, 29

Re: glamor versus AIGLX GL context series

2014-04-21 Thread Eric Anholt
Michel Dänzer mic...@daenzer.net writes: On 19.04.2014 03:39, Eric Anholt wrote: Here it is, at long last. I was stumped for several days with a weird fbo incomplete that was happening after my first round of fixes, and it took a day's detour of cooking up a Xephyr with DRI3 to get a fast

[PATCH] dixfonts: Turn a missing directory ErrorF into a DebugF

2014-04-21 Thread Jasper St. Pierre
On systems without these directories, we don't need to be complaining loudly. Reviewed-by: Kristian Hoegsberg k...@bitplanet.net --- dix/dixfonts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dix/dixfonts.c b/dix/dixfonts.c index 83d2539..1c6442c 100644 ---

Re: [PATCH 1/6] .gitignore: Add new autotools file 'test-driver'

2014-04-21 Thread Keith Packard
Kristian Høgsberg k...@bitplanet.net writes: Automake 1.12 introduces a new parallel test framework that uses a shell script helper and generates *.log and *.trs files. Add to .gitignore. This one got lost in the rest of the Xwayland integration 28fa5dd..9c86d5f master - master --

Re: [PATCH] glamor: Handle unexpected GetGlyphs results better

2014-04-21 Thread Keith Packard
Keith Packard kei...@keithp.com writes: GetGlyphs is supposed to always return the full list of characters when there is a default character available. However, if an application opens a 16-bit two dimensional font and then draws with 8-bit requests, GetGlyphs will return zero glyphs if there

Re: [PATCH] glamor: Fix accelerated rendering of GTK's ARGB vs xBGR composites.

2014-04-21 Thread Keith Packard
Eric Anholt e...@anholt.net writes: +/* If the formats don't match, and the pixmap was already uploaded + * (so the dynamic code above doesn't apply), then fall back to + * software. We should use texture views to fix this properly. + */ +if (source_pixmap == mask_pixmap

Re: [PULL] Xwayland fixes

2014-04-21 Thread Keith Packard
Kristian Høgsberg k...@bitplanet.net writes: Kristian Høgsberg (4): xwayland: Build without GLX extension xwayland: Build without xshmfence configure.ac: Remove check for WAYLAND_SCANNER_RULES xwayland: Remove left-over ErrorF logging Merged. 9c86d5f..ba5c2b6

Re: [PATCH] dixfonts: Turn a missing directory ErrorF into a DebugF

2014-04-21 Thread Keith Packard
Jasper St. Pierre jstpie...@mecheye.net writes: On systems without these directories, we don't need to be complaining loudly. Reviewed-by: Kristian Hoegsberg k...@bitplanet.net Merged. ba5c2b6..ea15f8b master - master -- keith.pack...@intel.com pgpxkijpPQhBg.pgp Description: PGP

Re: [PATCH] composite: Fix memory leak in compCopyWindow

2014-04-21 Thread Keith Packard
Peter Harris phar...@opentext.com writes: Signed-off-by: Peter Harris phar...@opentext.com Reviewed-by: Keith Packard kei...@keithp.com -- keith.pack...@intel.com pgpTN_JeEyC6X.pgp Description: PGP signature ___ xorg-devel@lists.x.org: X.Org

Re: [Resend: PATCH] dmxConfigCanvasUpdate: Delay dereference until after checking for NULL

2014-04-21 Thread Alan Coopersmith
On 04/21/14 01:18 PM, Keith Packard wrote: Alan Coopersmith alan.coopersm...@oracle.com writes: Flagged by cppcheck 1.64: [hw/dmx/config/xdmxconfig.c:306] - [hw/dmx/config/xdmxconfig.c:323]: (warning) Possible null pointer dereference: fs - otherwise it is redundant to check it

[PATCH] dmxConfigCanvasUpdate: Delay dereference until after checking for NULL

2014-04-21 Thread Alan Coopersmith
Flagged by cppcheck 1.64: [hw/dmx/config/xdmxconfig.c:306] - [hw/dmx/config/xdmxconfig.c:323]: (warning) Possible null pointer dereference: fs - otherwise it is redundant to check it against null. Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com ---

Re: [PATCH] fb: Fix origin of source picture in fbGlyphs

2014-04-21 Thread Keith Packard
Peter Harris phar...@opentext.com writes: If a source picture doesn't repeat and a mask format is specified, the incorrect calulation of the origin of the glyphs caused the glyphs to not be drawn at all. Noticed when running gtk-demo from RHEL 6.5 and selecting Rotated Text. Can you

Re: [PATCH 3/8] Drop duplicated extern definitions.

2014-04-21 Thread Aaron Plattner
These first three look like they're already in http://cgit.freedesktop.org/xorg/app/rendercheck/commit/?id=2fd815135e7769aa9dd0d3b8cb558350ba7eb70d On 04/21/2014 11:56 AM, Eric Anholt wrote: --- main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/main.c b/main.c index

Re: [PATCH] fb: Fix origin of source picture in fbGlyphs

2014-04-21 Thread Peter Harris
On 2014-04-21 18:20, Keith Packard wrote: Peter Harris phar...@opentext.com writes: If a source picture doesn't repeat and a mask format is specified, the incorrect calulation of the origin of the glyphs caused the glyphs to not be drawn at all. Noticed when running gtk-demo from RHEL 6.5

[PATCH] Add a command line argument for disabling indirect GLX.

2014-04-21 Thread Eric Anholt
The attack surface for indirect GLX is huge, and it's of no use to most people (if you get an indirect GL context, you're better served by a immediate X error than actually trying to use an indirect GL context and finding out that it doesn't support doing anything you want, slowly). This flag

[PATCH] glamor: Fix accelerated rendering of GTK's ARGB vs xBGR composites.

2014-04-21 Thread Eric Anholt
There is some complicated code to support tweaking the format as we upload from a SHM pixmap (aka the GTK icon cache), but if we weren't sourcing from a SHM pixmap we just forgot to check that the formats matched at all. We could potentially be a little more discerning here (xRGB source and ARGB

Re: [PATCH synaptics 1/6] eventcomm: drop superflous helper function

2014-04-21 Thread Peter Hutterer
On Fri, Apr 18, 2014 at 11:55:24AM +0200, Hans de Goede wrote: Hi, On 04/09/2014 03:47 AM, Peter Hutterer wrote: last_mt_vals_slot is only used in one location and there we can just use cur_slot Signed-off-by: Peter Hutterer peter.hutte...@who-t.net Series looks good, series is:

Re: [PATCH libXfont] Fix buffer read overrun

2014-04-21 Thread Jasper St. Pierre
Always using strlen(s); should be fine. The compiler will optimize it out for a literal string anyway. On Fri, Apr 18, 2014 at 4:39 PM, Keith Packard kei...@keithp.com wrote: Alan Coopersmith alan.coopersm...@oracle.com writes: They work, as long as you only ever pass a literal string to

Re: [PATCH xf86-input-synaptics] Fix product ID cutoff for MODEL_APPLETOUCH/MODEL_UNIBODY_MACBOOK

2014-04-21 Thread Peter Hutterer
On Sat, Apr 19, 2014 at 10:23:00PM -0500, Clinton Sprain wrote: A handful of Macbooks are being tagged as MODEL_UNIBODY_MACBOOKs when they should not be. This causes the default sensitivity to be very low for them, making the touchpad very difficult to use. This change moves the product ID

Re: [PATCH] fb: Fix origin of source picture in fbGlyphs

2014-04-21 Thread Keith Packard
Peter Harris phar...@opentext.com writes: If a source picture doesn't repeat and a mask format is specified, the incorrect calulation of the origin of the glyphs caused the glyphs to not be drawn at all. Noticed when running gtk-demo from RHEL 6.5 and selecting Rotated Text.

Re: [PATCH] fb: Fix origin of source picture in fbGlyphs

2014-04-21 Thread Keith Packard
Peter Harris phar...@opentext.com writes: On 2014-04-21 18:20, Keith Packard wrote: Peter Harris phar...@opentext.com writes: If a source picture doesn't repeat and a mask format is specified, the incorrect calulation of the origin of the glyphs caused the glyphs to not be drawn at all.

Re: [PATCH] Add a command line argument for disabling indirect GLX.

2014-04-21 Thread Keith Packard
Eric Anholt e...@anholt.net writes: The attack surface for indirect GLX is huge, and it's of no use to most people (if you get an indirect GL context, you're better served by a immediate X error than actually trying to use an indirect GL context and finding out that it doesn't support doing

Re: [PATCH 0/3] GLX fixes for indirect contexts

2014-04-21 Thread Keith Packard
Jon TURNEY jon.tur...@dronecode.org.uk writes: Fixes for a few problems with GLX and indirect contexts. I can reproduce [1/3] and [2/3] on X server 1.15.1, mesa 10.1.0 (from Ubuntu 14.04), but not on X server 1.14.5 mesa 9.2.1 (from Ubuntu 13.10), so these are probably regressions in

Re: [PATCH] composite: Fix memory leak in compCopyWindow

2014-04-21 Thread Keith Packard
Peter Harris phar...@opentext.com writes: Signed-off-by: Peter Harris phar...@opentext.com Merged. -- keith.pack...@intel.com pgp9aGj12lCyM.pgp Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives:

Re: glamor versus AIGLX GL context series

2014-04-21 Thread Michel Dänzer
On 22.04.2014 04:08, Eric Anholt wrote: Michel Dänzer mic...@daenzer.net writes: By changing the context, it may also invalidate the DRI2 buffer information, so we need to get that again. Fixes crashes due to use-after-free with LIBGL_ALWAYS_INDIRECT=1 glxgears and piglit. Glad to see

Re: [PATCH] glamor: Add remaining header files to SOURCES

2014-04-21 Thread Keith Packard
Michel Dänzer mic...@daenzer.net writes: From: Michel Dänzer michel.daen...@amd.com It wasn't possible to build glamor from tarballs. Merged. (sorry, the patch IDs are lost in the mists of time for this push) -- keith.pack...@intel.com pgpc__kfiYE5Z.pgp Description: PGP signature

Re: [PATCH] shadowfb: Port to miext/damage (#31303, #65547)

2014-04-21 Thread Keith Packard
Adam Jackson a...@redhat.com writes: Somewhat shocking how much simpler this is, isn't it? We no longer need to wrap the screen or GC or Picture, because damage does it for us, which is doubly great since the old shadowfb code didn't wrap _enough_ things (border updates and Render glyphs, at

Re: [PATCH] shadowfb: Port to miext/damage (#31303, #65547)

2014-04-21 Thread Keith Packard
Keith Packard kei...@keithp.com writes: Adam Jackson a...@redhat.com writes: Somewhat shocking how much simpler this is, isn't it? We no longer need to wrap the screen or GC or Picture, because damage does it for us, which is doubly great since the old shadowfb code didn't wrap _enough_

Re: [PATCH] xfixes: Forbid manipulating clip for source-only pictures (#28968)

2014-04-21 Thread Keith Packard
Adam Jackson a...@redhat.com writes: Just throw BadPicture instead of crashing. It's not currently a meaningful thing to do anyway, RenderSetPictureRectangles would error if you tried (which this patch changes to BadPicture as well for consistency). The problem with trying to do it is if

Re: [PATCH] linux: Propagate failure up to xf86MapVidMem (#18304)

2014-04-21 Thread Keith Packard
walter harms wha...@bfs.de writes: this looks strange, what fd is checked in case open(DEV_MEM,... is never called ? You're just seeing part of the #if, which is opening DEV_MEM in both paths, once with O_SYNC and once without it (the O_SYNC path is never taken as it's #if 0) --

Re: [PATCH] linux: Propagate failure up to xf86MapVidMem (#18304)

2014-04-21 Thread Keith Packard
Adam Jackson a...@redhat.com writes: As opposed to calling FatalError. Hrm. This is effectively and ABI change as mapVidMem would otherwise not return on an error. While it might be nice and allow drivers to do something sensible, I'm afraid I can't take it for 1.16 because drivers may not be

Re: [PATCH] Add a return value to set_cursor_position() to allow it to report failure

2014-04-21 Thread Keith Packard
Michael Thayer michael.tha...@oracle.com writes: set_cursor_position() may need to be able to fail and have the server fall back to a software cursor in at least the situation in which we are running on virtual hardware and using the host cursor as a hardware cursor for the guest but cannot

Re: [PATCH] xres: Fix size estimation for 8bpp pixmaps (#69057)

2014-04-21 Thread Keith Packard
Adam Jackson a...@redhat.com writes: Just use floats, it's not like this is a performance path. Signed-off-by: Adam Jackson a...@redhat.com Merged. 5df6682..f466fb2 master - master -- keith.pack...@intel.com pgp0YvVLIIx9v.pgp Description: PGP signature

Re: [PATCH] Fix hw/xfree86/common/compiler.h for mips64

2014-04-21 Thread Keith Packard
YunQiang Su wzss...@gmail.com writes: Mark mips64 as 64bit Use long as PORT_SIZE Merged. 8daeaa2...19e5a13 master - master -- keith.pack...@intel.com pgpFnb9_y1it_.pgp Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development

Re: [PATCH] os: Initialize the set of signals to be suppressed during our handler.

2014-04-21 Thread Keith Packard
Eric Anholt e...@anholt.net writes: Fixes a valgrind complaint: ==8805== Syscall param rt_sigaction(act-sa_mask) points to uninitialised byte(s) ==8805==at 0x5EB8315: __libc_sigaction (sigaction.c:66) ==8805==by 0x5B13DA: busfault_init (busfault.c:145) ==8805==by 0x5A60A2:

Re: [PATCH 2/2] glxproxy: Fix memory leak on error path in CreateGLXPixmap (#50281)

2014-04-21 Thread Keith Packard
Adam Jackson a...@redhat.com writes: Signed-off-by: Adam Jackson a...@redhat.com --- hw/dmx/glxProxy/glxcmds.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c index 964db40..f097906 100644 --- a/hw/dmx/glxProxy/glxcmds.c +++

Re: [PATCH] os: Add -displayfd into -help text

2014-04-21 Thread Keith Packard
Robert Ancell robert.anc...@canonical.com writes: ErrorF(-cc intdefault color visual class\n); ErrorF(-nocursor disable the cursor\n); ErrorF(-core generate core dump on fatal error\n); +ErrorF(-displayfd fd file

Re: [PATCH] hw/xwin: link dynamically and export symbols

2014-04-21 Thread Keith Packard
Yaakov (Cygwin/X) yselkow...@users.sourceforge.net writes: From: Yaakov Selkowitz yselkow...@users.sourceforge.net With my patch to fix shared libXfont to work correctly on Cygwin/Win32, there is no need for -static anymore. But, XWin.exe must export its symbols in order for them to

Re: [PATCH] Revert xkb: ProcesssPointerEvent must work on the VCP if it gets the VCP

2014-04-21 Thread Keith Packard
Peter Hutterer peter.hutte...@who-t.net writes: This was the wrong fix to the problem, and it triggered a change in XKB behavior: previously a button event would unlock a latched modifier, now it doesn't anymore. https://bugs.freedesktop.org/show_bug.cgi?id=73155 I haven't merged this as I'm

Re: [PATCH] xf86RandR12: use correct gamma size when allocating gamma table

2014-04-21 Thread Keith Packard
db...@chromium.org writes: From: Dominik Behr db...@chromium.org When setting crtc-gamma_size to randr_crtc-gammaSize we should use randr_crtc-gammaSize to allocate new gamma table in crtc. Currently, if randr_crtc-gammaSize crtc-gammaSize the subsequent memcpy will overwrite memory beyond