[PATCH] ephyr: Fix GLX_VISUAL_ID to be a visual ID instead of an Xlib visual pointer

2014-03-18 Thread Keith Packard
DefaultVisual returns a Visual *, not a visual ID. Fetch the visual id from inside the resulting structure. Signed-off-by: Keith Packard kei...@keithp.com --- hw/kdrive/ephyr/ephyr_glamor_glx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/kdrive/ephyr/ephyr_glamor_glx.c

RE: [PATCH 2/2] Fixed driver name in error message about KMS active.

2014-03-18 Thread YC Chen
Hi David, Stefan Sorry, it is my fault, I will be more careful next time. Please revert it and add your patch first. I will update my parts after you had finished it. Regards, Y.C. Chen -Original Message- From: Dave Airlie [mailto:airl...@gmail.com] Sent: Tuesday, March 18, 2014 7:51

[PATCH 02/10] glamor: Use glsl fract/mod instead of while in gradient shaders.

2014-03-18 Thread Markus Wick
This fixes gtkperf. It seemed to hang forever. --- glamor/glamor_gradient.c | 48 1 file changed, 4 insertions(+), 44 deletions(-) diff --git a/glamor/glamor_gradient.c b/glamor/glamor_gradient.c index f77d6a8..38dac68 100644 ---

[PATCH 05/10] glamor: Update GL requirements to 2.1.

2014-03-18 Thread Markus Wick
We will never ever run on OpenGL 1.2 as we use shaders everywhere. 2.0 may be enough, but we also often use PBOs and our big shaders won't fit into the first GLSL limits. --- glamor/glamor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glamor/glamor.c b/glamor/glamor.c

[PATCH 10/10] glamor: Use vbo for solid boxes.

2014-03-18 Thread Markus Wick
--- glamor/glamor_fill.c | 40 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/glamor/glamor_fill.c b/glamor/glamor_fill.c index 2fa726e..3286aa1 100644 --- a/glamor/glamor_fill.c +++ b/glamor/glamor_fill.c @@ -190,9 +190,6 @@

[PATCH 06/10] glamor: Select VBO path by ARB_mbr extension.

2014-03-18 Thread Markus Wick
The mbr path was hard coded enabled for desktop gl and disabled for gles. But there are both, desktop without mbr and mobiles with mbr. --- glamor/glamor.c | 2 ++ glamor/glamor_priv.h | 1 + glamor/glamor_vbo.c | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git

[PATCH 03/10] glamor: Use epoxy_has_gl_extension() instead of rolling our own.

2014-03-18 Thread Markus Wick
--- glamor/glamor.c | 10 +- glamor/glamor_core.c | 22 -- glamor/glamor_priv.h | 1 - 3 files changed, 5 insertions(+), 28 deletions(-) diff --git a/glamor/glamor.c b/glamor/glamor.c index 0f7d68b..9d171b7 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@

[PATCH 07/10] glamor: Don't reset GL_ELEMENT_ARRAY_BUFFER as it's always bound to the same buffer.

2014-03-18 Thread Markus Wick
--- glamor/glamor_fill.c | 3 --- glamor/glamor_gradient.c | 4 glamor/glamor_render.c| 6 +- glamor/glamor_trapezoid.c | 6 -- 4 files changed, 1 insertion(+), 18 deletions(-) diff --git a/glamor/glamor_fill.c b/glamor/glamor_fill.c index 7461b62..2fa726e 100644 ---

[PATCH 04/10] glamor: Use epoxy_gl_version() instead of rolling our own.

2014-03-18 Thread Markus Wick
--- glamor/glamor.c | 6 +++--- glamor/glamor_core.c | 23 --- glamor/glamor_priv.h | 5 - 3 files changed, 3 insertions(+), 31 deletions(-) diff --git a/glamor/glamor.c b/glamor/glamor.c index 9d171b7..ef969e2 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@

[PATCH 08/10] glamor: Remove unneeded unbindings.

2014-03-18 Thread Markus Wick
They are already cleared in glamor_put_vbo_space. --- glamor/glamor_gradient.c | 8 1 file changed, 8 deletions(-) diff --git a/glamor/glamor_gradient.c b/glamor/glamor_gradient.c index ce24d73..c24f342 100644 --- a/glamor/glamor_gradient.c +++ b/glamor/glamor_gradient.c @@ -1120,8

[PATCH 09/10] glamor: Drop feature dependent optimization on startup.

2014-03-18 Thread Markus Wick
We don't care that much about startup time to write different code paths... --- glamor/glamor_render.c | 23 +++ 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index 62236b9..cdf8eff 100644 ---

[PATCH 00/10] glamor cleanup series

2014-03-18 Thread Markus Wick
But I still don't know if the last patch is worth as this code will likely be removed soon by Keith. ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: Switching between a software and a hardware mouse cursor

2014-03-18 Thread Michael Thayer
On 05/03/14 19:45, Adam Jackson wrote: On Thu, 2014-02-27 at 15:46 +0100, Michael Thayer wrote: Another would be to add a return value to the DDX CRTC functions load_cursor_argb, so that if the KMS driver failed to set the cursor, modesetting could pass this on to the X server. Actually we

Re: [PATCH 2/2] Fixed driver name in error message about KMS active.

2014-03-18 Thread Stefan Dirsch
On Tue, Mar 18, 2014 at 09:51:11AM +1000, Dave Airlie wrote: On Tue, Mar 18, 2014 at 9:16 AM, Stefan Dirsch sndir...@suse.de wrote: On Tue, Mar 18, 2014 at 07:53:30AM +1000, Dave Airlie wrote: On Mon, Mar 17, 2014 at 10:48 PM, Stefan Dirsch sndir...@suse.de wrote: Seems some code came from

[PATCH xts] Drop use of perl's given/when construct

2014-03-18 Thread Peter Harris
The perl mongers have retroactively marked this construct experimental, five and a half years after it was marked stable. http://perldoc.perl.org/perl5180delta.html#The-smartmatch-family-of-features-are-now-experimental Signed-off-by: Peter Harris phar...@opentext.com --- xts5/bin/xts-config.in

[PATCH xf86-video-modesetting] Add support for server managed fds

2014-03-18 Thread Hans de Goede
Signed-off-by: Hans de Goede hdego...@redhat.com --- src/driver.c | 77 +++- 1 file changed, 61 insertions(+), 16 deletions(-) diff --git a/src/driver.c b/src/driver.c index 0f9190a..bc68238 100644 --- a/src/driver.c +++ b/src/driver.c @@

Re: [PATCH util/modular] jhbuildrc: Restore mesa-demos, mesa-glut, mesa-glu

2014-03-18 Thread Jon TURNEY
On 16/03/2014 18:15, Gaetan Nadon wrote: On 14-03-15 02:17 PM, Jon TURNEY wrote: On 14/03/2014 20:03, Jon TURNEY wrote: As of 9167c5e7177a758fce55afe759fa48c47a4f7f4e we had mesa-demos, mesa-glut and mesa-glu modules. 9167c5e7177a758fce55afe759fa48c47a4f7f4e add missing modules and meta

Re: [PATCH] randr: fix primary setting of slave outputs

2014-03-18 Thread Aaron Plattner
On 02/20/2014 08:28 PM, Dave Airlie wrote: From: Fedora X Ninjas x...@fedoraproject.org If the user wants to set one of the slave devices as the primary output, we shouldn't fail to do so, we were returning BadMatch which was tripping up gnome-settings-daemon and bad things ensues. Fix all the

[PATCH:libXaw] Fix abs() usage.

2014-03-18 Thread Thomas Klausner
For long arguments, use labs(). From Jörg Sonnenberger jo...@netbsd.org Signed-off-by: Thomas Klausner w...@netbsd.org --- src/Text.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Text.c b/src/Text.c index a1ae74a..8100122 100644 --- a/src/Text.c +++ b/src/Text.c @@

[PULL] xkb keymap loading

2014-03-18 Thread Peter Hutterer
The following changes since commit 795066477ee81b5b82e490eac8bed6b656d01f17: config: search for PnPID on all parents (#75513) (2014-03-12 07:43:16 +1000) are available in the git repository at: git://people.freedesktop.org/~whot/xserver for-keith for you to fetch changes up to

[PATCH:libXpm] Fix abs() usage.

2014-03-18 Thread Thomas Klausner
For long arguments, use labs(). From Jörg Sonnenberger jo...@netbsd.org Signed-off-by: Thomas Klausner w...@netbsd.org --- src/create.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/create.c b/src/create.c index 98678d8..d013da9 100644 --- a/src/create.c +++

Re: [PULL] xkb keymap loading

2014-03-18 Thread Kristian Høgsberg
On Tue, Mar 18, 2014 at 2:54 PM, Peter Hutterer peter.hutte...@who-t.net wrote: The following changes since commit 795066477ee81b5b82e490eac8bed6b656d01f17: config: search for PnPID on all parents (#75513) (2014-03-12 07:43:16 +1000) are available in the git repository at:

[PATCH:mkfontscale 1/2] Only include config.h if it exists.

2014-03-18 Thread Thomas Klausner
Signed-off-by: Thomas Klausner w...@netbsd.org --- hash.c| 2 ++ mkfontscale.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/hash.c b/hash.c index 3adfb68..d834222 100644 --- a/hash.c +++ b/hash.c @@ -20,7 +20,9 @@ THE SOFTWARE. */ +#ifdef HAVE_CONFIG_H #include config.h

[PATCH:mkfontscale 2/2] Add some const.

2014-03-18 Thread Thomas Klausner
Signed-off-by: Thomas Klausner w...@netbsd.org --- mkfontscale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkfontscale.c b/mkfontscale.c index 036a0b4..a81e60a 100644 --- a/mkfontscale.c +++ b/mkfontscale.c @@ -66,7 +66,7 @@ #define QUOTE(x) #x #define

Re: [PATCH:mkfontscale 2/2] Add some const.

2014-03-18 Thread Thomas Klausner
Sorry, I got the commit message wrong. Here's the right one: From fc5a9c8fa6e405c144892849a3a3d40a8513a8f7 Mon Sep 17 00:00:00 2001 From: Thomas Klausner w...@netbsd.org Date: Tue, 18 Mar 2014 23:15:20 +0100 Subject: [PATCH:mkfontscale 2/2] Avoid const warnings. clang complains about both

Re: [PATCH:mkfontscale 1/2] Only include config.h if it exists.

2014-03-18 Thread Gaetan Nadon
On 14-03-18 06:18 PM, Thomas Klausner wrote: Signed-off-by: Thomas Klausner w...@netbsd.org --- hash.c| 2 ++ mkfontscale.c | 2 ++ 2 files changed, 4 insertions(+) Reviewed-by: Gaetan Nadon mems...@videotron.ca ___ xorg-devel@lists.x.org:

Re: [PATCH util/modular] jhbuildrc: Restore mesa-demos, mesa-glut, mesa-glu

2014-03-18 Thread Gaetan Nadon
On 14-03-18 12:56 PM, Jon TURNEY wrote: On 16/03/2014 18:15, Gaetan Nadon wrote: On 14-03-15 02:17 PM, Jon TURNEY wrote: On 14/03/2014 20:03, Jon TURNEY wrote: As of 9167c5e7177a758fce55afe759fa48c47a4f7f4e we had mesa-demos, mesa-glut and mesa-glu modules.

[PULL v2] xkb keymap loading

2014-03-18 Thread Peter Hutterer
In keeping up with current programming and practices I had a a goto fail bug the last patch of this series. krh wasn't happy with this for some reason. here is the same patchset, but this time with an abundance of braces too keep the fail contained. The following changes since commit

Re: [PATCH:libXpm] Fix abs() usage.

2014-03-18 Thread Matt Turner
On Tue, Mar 18, 2014 at 2:57 PM, Thomas Klausner w...@netbsd.org wrote: For long arguments, use labs(). From Jörg Sonnenberger jo...@netbsd.org Signed-off-by: Thomas Klausner w...@netbsd.org --- The author of this patch is you, according to git, but is Jörg Sonnenberger according to your

[PATCH 1/3] os: Always compile ListenOnOpenFD() and export it

2014-03-18 Thread Kristian Høgsberg
This function was written to allow the X server to inherit the listen socket from launchd on OS X. The code is not specific to OS X though and will be useful for on-demand launched Xwayland servers. Signed-off-by: Kristian Høgsberg k...@bitplanet.net --- include/os.h| 4 +---

[PATCH 02/20] mi: miPutImage with XYPixmap failed at depth 32 on 64-bit machines

2014-03-18 Thread Keith Packard
The X server still has 'unsigned long' in a few places to hold 32 bit values. One of those is in miPutImage where it's holding the temporary planemask for XYPixmap format images. It computed the highest plane in the source image with 1 (depth - 1). On 64-bit machines, taking that value and

[PATCH 04/20] glamor: Add bounding box to one-fbo pixmaps

2014-03-18 Thread Keith Packard
This lets code treat the one-fbo pixmaps more symmetrically with the tiled pixmaps. Signed-off-by: Keith Packard kei...@keithp.com Reviewed-by: Eric Anholt e...@anholt.net --- glamor/glamor.c | 4 glamor/glamor_priv.h | 1 + 2 files changed, 5 insertions(+) diff --git

[PATCH 03/20] glamor: Get testing code using small FBOs working again

2014-03-18 Thread Keith Packard
Glamor has a mode where pixmaps will be constructed from numerous small FBOs. This allows testing of the tiled pixmap code without needing to create huge pixmaps. However, the render glyph code assumed that it could create a pixmap large enough for the glyph atlas. Instead of attempting to fix

[PATCH 09/20] glamor: Add glamor_program PolyPoint implementation

2014-03-18 Thread Keith Packard
This accelerates poly point when possible by off-loading all geometry computation to the GPU. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor_polyops.c | 92 ++--- glamor/glamor_priv.h| 3 ++ 2 files changed, 91 insertions(+), 4

[PATCH 06/20] glamor: Add infrastructure for generating shaders on the fly

2014-03-18 Thread Keith Packard
This just adds a bunch of support code to construct shaders from 'facets', which bundle attributes needed for each layer of the rendering system. At this point, that includes only the primtive and the fill stuff. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/Makefile.am| 2

[PATCH 18/20] glamor: Stop using glamor_copy_n_to_n* and glamor_copy_area

2014-03-18 Thread Keith Packard
Use glamor_copy and glamor_copyarea instead Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor_glyphs.c | 6 +++--- glamor/glamor_largepixmap.c | 13 +++-- glamor/glamor_pixmap.c | 6 +++--- glamor/glamor_render.c | 11 ++- 4 files changed, 19

[PATCH 15/20] glamor: Provide a placeholder for glamor_pushpixels

2014-03-18 Thread Keith Packard
This just calls miPushPixels until glamor uses FBOs for bitmaps Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor_copy.c | 8 glamor/glamor_core.c | 2 +- glamor/glamor_priv.h | 4 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/glamor/glamor_copy.c

[PATCH 05/20] glamor: Add helper functions to walk pixmap tiling

2014-03-18 Thread Keith Packard
This adds a few helper functions to make pixmap fbo access symmetrical between the single fbo and tiled cases. Signed-off-by: Keith Packard kei...@keithp.com Reviewed-by: Eric Anholt e...@anholt.net --- glamor/glamor_priv.h | 46 ++ 1 file changed, 46

[PATCH 17/20] glamor: Add glamor_getimage and glamor_putimage

2014-03-18 Thread Keith Packard
These use the upload_boxes and download_boxes helpers to provide reasonably efficient image transfer. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/Makefile.am| 1 + glamor/glamor.c | 2 +- glamor/glamor_core.c | 2 +- glamor/glamor_image.c | 125

[PATCH 11/20] glamor: Add glamor_program based poly_fill_rect

2014-03-18 Thread Keith Packard
This accelerates poly_fill_rect using GPU-based geometry computation Signed-off-by: Keith Packard kei...@keithp.com --- glamor/Makefile.am| 1 + glamor/glamor_core.c | 2 +- glamor/glamor_priv.h | 8 glamor/glamor_rects.c | 113 ++

[PATCH 10/20] glamor: Add glamor_program based fill/set/get spans

2014-03-18 Thread Keith Packard
This accelerates spans operations using GPU-based geometry computation Signed-off-by: Keith Packard kei...@keithp.com --- glamor/Makefile.am| 1 + glamor/glamor.c | 2 +- glamor/glamor_core.c | 4 +- glamor/glamor_priv.h | 18 +++ glamor/glamor_spans.c | 299

[PATCH 19/20] glamor: Add glamor_utils

2014-03-18 Thread Keith Packard
This provides glamor_solid_boxes and glamor_solid using regular GC operations instead of calling directly to some underlying rendering functions. This allows the old core rendering code to be removed. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/Makefile.am| 1 +

[PATCH 16/20] glamor: Use glamor_program for glamor_glyphblt

2014-03-18 Thread Keith Packard
This constructs suitable shaders using the glamor_program infrastructure for poly glyph blt, and then gets rid of the custom image glyph blt functions and uses miImageGlyphBlt. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor_core.c | 4 +- glamor/glamor_glyphblt.c | 262

[PATCH synaptics] Disable GrabEventDevice by default

2014-03-18 Thread Peter Hutterer
This was required when we started supporting hotplugging to avoid duplicate events. These days the drawback of not being able to record events in the case of a bug is significant, possibly more so than whatever static configurations are still out there. Let's see how much pain this causes.

[PATCH] .gitignore: Add new autotools file 'test-driver'

2014-03-18 Thread Kristian Høgsberg
Recent automake introduces a new shell script helper for the automake test framework. Add it to .gitignore. Signed-off-by: Kristian Høgsberg k...@bitplanet.net --- Gaetan, not sure what the convention is for .gitignore. You added the Do not edit comment, but I don't see any other mechanism for