Re: [PATCH 4/4] glx: Simplify glXDestroyContext

2014-01-09 Thread Jon TURNEY
On 02/10/2013 22:51, Adam Jackson wrote: We can just free the resource unconditionally here. ContextGone (which FreeResourceByType will call) already does: cx-idExists = GL_FALSE; if (!cx-currentClient) { __glXFreeContext(cx); } Signed-off-by: Adam Jackson

Licence information request XORG-CF-FILES

2014-01-09 Thread Adrian Fry (adrfry)
Dear x.org , I represent a technology team at Cisco Systems, Inc. We are contacting you regarding code copyrighted by you which we obtained from x.org, called xorg-cf-files 1.0.2 11.el6, Configuration File for Xorg' A member of the development team intends to use this code for commercial

Licence information request - GCCMAKEDEP

2014-01-09 Thread Adrian Fry (adrfry)
Dear x.org , I represent a technology team at Cisco Systems, Inc. We are contacting you regarding code copyrighted by you which we obtained from x.org, called gccmakedep 1.0.2 11.el6, gccmakedep - create dependencies in makefiles using 'gcc -M' A member of the development team intends to use

Re: Licence information request XORG-CF-FILES

2014-01-09 Thread Alan Coopersmith
On 01/ 9/14 04:23 AM, Adrian Fry (adrfry) wrote: Dear x.org , I represent a technology team at Cisco Systems, Inc. We are contacting you regarding code copyrighted by you which we obtained from x.org, called xorg-cf-files 1.0.2 11.el6, “Configuration File for Xorg' “ A member of the development

glamor cleanup series: reindent and connect to the build

2014-01-09 Thread Eric Anholt
Here's my first patch series for review on glamor -- mostly boring stuff just trying to get things to a consistent style with the rest of the server. The end result is a building module we can start doing interesting things to, with no compiler warnings on my system. Note that x-indent.sh did

[PATCH 08/15] glamor/egl: Remove glapi awareness

2014-01-09 Thread Eric Anholt
From: Adam Jackson a...@redhat.com We only needed this because glx was directly bashing glapi tables. Since that's not the case anymore, we should just MakeCurrent like a real GL app. v2: Hand-resolve against rebase onto newer server (by anholt) Signed-off-by: Adam Jackson a...@redhat.com

[PATCH 07/15] glamor: Remove compat code for building out of tree.

2014-01-09 Thread Eric Anholt
Signed-off-by: Eric Anholt e...@anholt.net --- glamor/Makefile.am | 1 - glamor/compat-api.h | 107 --- glamor/glamor.c | 4 +- glamor/glamor.h | 4 -- glamor/glamor_egl.c | 16 ++-- glamor/glamor_priv.h | 1 - 6 files

[PATCH 03/15] glamor: Fix some mangling of shader strings by indent.

2014-01-09 Thread Eric Anholt
Signed-off-by: Eric Anholt e...@anholt.net --- Once again, git-send-email refused due to x-indent's output being too long, so this isn't a real patch because I replaced that line with THE STRINGS BELOW ALL SMASHED INTO ONE LINE. Look at the git tree for real patches. glamor/glamor_core.c

[PATCH 11/15] glamor: Drop xfree86 dependencies from this dix module.

2014-01-09 Thread Eric Anholt
Signed-off-by: Eric Anholt e...@anholt.net --- glamor/Makefile.am | 2 +- glamor/glamor.h| 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/glamor/Makefile.am b/glamor/Makefile.am index 15a8b74..90d80a7 100644 --- a/glamor/Makefile.am +++ b/glamor/Makefile.am @@ -6,7

[PATCH 01/15] glamor: Touch up some code so indent doesn't get confused.

2014-01-09 Thread Eric Anholt
Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_pixmap.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c index 84694ec..be7aa3d 100644 --- a/glamor/glamor_pixmap.c +++ b/glamor/glamor_pixmap.c @@ -248,7

[PATCH 04/15] glamor: Fix some indent damage of putting a ' ' after the '*' for pointers.

2014-01-09 Thread Eric Anholt
Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor.c | 4 +-- glamor/glamor.h | 16 - glamor/glamor_addtraps.c| 6 ++-- glamor/glamor_fbo.c | 32 +- glamor/glamor_glyphblt.c| 12 +++ glamor/glamor_glyphs.c | 30

[PATCH 12/15] glamor: Silence warnings for non-debug builds.

2014-01-09 Thread Eric Anholt
Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_getspans.c | 1 + glamor/glamor_render.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/glamor/glamor_getspans.c b/glamor/glamor_getspans.c index afb76f6..ff58725 100644 --- a/glamor/glamor_getspans.c +++

[PATCH 02/15] glamor: Apply x-indent.sh.

2014-01-09 Thread Eric Anholt
Signed-off-by: Eric Anholt e...@anholt.net --- I've entirely trimmed this patch -- it was strictly applying x-indent.sh with no other changes, and the next patches are fixups that follow it. I was going to just send it out, but git-send-email fatal errored because one of the lines was too long

[PATCH 10/15] glamor: Disable the XV code for now.

2014-01-09 Thread Eric Anholt
We're going to want to make this DIX code instead of XF86 if at all possible, but for now just disable it so we can work on the rest of the build. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor.h| 2 ++ glamor/glamor_xv.c | 2 ++ 2 files changed, 4 insertions(+) diff --git

[PATCH 06/15] glamor: Remove copy of sna's compiler.h

2014-01-09 Thread Eric Anholt
From: Adam Jackson a...@redhat.com Xfuncproto.h has equivalents for these already. v2: Adjust a couple more likelies after the rebase (anholt) Signed-off-by: Adam Jackson a...@redhat.com Signed-off-by: Eric Anholt e...@anholt.net Reviewed-by: Eric Anholt e...@anholt.net --- glamor/Makefile.am

[PATCH 15/15] glamor: Remove more out-of-tree compat code.

2014-01-09 Thread Eric Anholt
Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_priv.h | 13 - 1 file changed, 13 deletions(-) diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index 9f0c558..9bd88e0 100644 --- a/glamor/glamor_priv.h +++ b/glamor/glamor_priv.h @@ -56,19 +56,6 @@ #include

[PATCH 05/15] glamor: Fix up some indentation damage on header prototypes.

2014-01-09 Thread Eric Anholt
Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_priv.h | 292 +-- 1 file changed, 118 insertions(+), 174 deletions(-) diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index 96fb404..d4f5371 100644 --- a/glamor/glamor_priv.h +++

[PATCH 14/15] glamor: Remove an extra copy of RegionNil().

2014-01-09 Thread Eric Anholt
Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_compositerects.c | 4 ++-- glamor/glamor_utils.h | 6 -- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/glamor/glamor_compositerects.c b/glamor/glamor_compositerects.c index 967e228..3b6b2ed 100644 ---

[PATCH 09/15] glamor: Use dix-config.h not project config.h

2014-01-09 Thread Eric Anholt
From: Adam Jackson a...@redhat.com v2: Also edit the one in glamor_egl.c (by anholt) v3: Also edit the one in glamor_eglmodule.c (by anholt) Signed-off-by: Adam Jackson a...@redhat.com Signed-off-by: Eric Anholt e...@anholt.net Reviewed-by: Eric Anholt e...@anholt.net --- glamor/glamor_egl.c

[PATCH 13/15] glamor: Hook the module back up to the build.

2014-01-09 Thread Eric Anholt
For now we're just building an uninstalled library. The extra EGL stubs are required so that we can get the DIX building and usable without pulling in the xf86 DDX code in glamor_egl.c. Signed-off-by: Eric Anholt e...@anholt.net --- Makefile.am | 6 + configure.ac

Re: [PATCH] config/udev: do not remove devices on add udev events

2014-01-09 Thread Timo Aaltonen
On 26.11.2013 11:56, Maarten Lankhorst wrote: udevadm trigger --action=add can cause devices to be unloaded, which breaks when X.org is already started during early init. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=72021 Signed-off-by: Maarten Lankhorst