Re: [PATCH] dix/dispatch: DoGetImage: Use a single buffer

2014-04-01 Thread Keith Packard
Mark Kettenis mark.kette...@xs4all.nl writes: I tried making the FlushClient() implementation a bit smarter by using a circular buffer to avoid the memmove'ing. Unfortunately that makes resizing the output buffer more painful and introduces some additional memcpy'ing there. I don't think

[PATCH 2/7] composite: Add exception mechanism for implicit redirection policy

2014-04-01 Thread Kristian Høgsberg
Normally composite will decide to add implicit redirection when a window with an alternate visual is a parent of a window with a regular visual or vice versa. This uses extra pixmap memory and incurs an extra copy. This exception mechanism provides a way for a DDX to override this if the DDX

[PATCH 1/7] events: Make XYToWindow a screen function pointer

2014-04-01 Thread Kristian Høgsberg
This allows DDXen to override the window picking to account for native windows not seen by the X server. The bulk of the picking logic is exposed as a new helper function, miSpriteTrace(). This function completes the sprite trace filled out by the caller, and can be set up to start the search

[PATCH 3/7] dri3: Allow asynchronous implementation for dri3_open

2014-04-01 Thread Kristian Høgsberg
By passing the client pointer to the dri3_open implementation, we allow the clients to implement the open callback asynchronously. If the client ignore count is positive after returning from dri3_open, we assume that authentication is in progress and doesn't send the reply. The code to send the

Xwayland series v2

2014-04-01 Thread Kristian Høgsberg
Hi, Here's an updated version of the Xwayland series. This takes into account the patches from last series that are already upstream and adds support for glamor acceleration, DRI3+present and render nodes (when available). To that end, there are a few more patches outside Xwayland in this

[PATCH 5/7] glamor: Add new GLAMOR_CREATE_PIXMAP_NO_TEXTURE pixmap create flag

2014-04-01 Thread Kristian Høgsberg
This flag lets a DDX allocate a glamor pixmap without allocating the texture that backs it. The DDX can then allocate the texture itself and then set it later. Signed-off-by: Kristian Høgsberg k...@bitplanet.net --- glamor/glamor.c | 10 +- glamor/glamor.h | 1 + 2 files changed, 10

[PATCH 4/7] glamor: Move glamor_egl_screen_init() prototype to glamor.h

2014-04-01 Thread Kristian Høgsberg
A DDX that implements the glamor EGL functions need to pull in this prototype but shouldn't need to pull in glamor_priv.h Signed-off-by: Kristian Høgsberg k...@bitplanet.net --- glamor/glamor.h | 2 ++ glamor/glamor_egl_stubs.c | 4 +++- glamor/glamor_priv.h | 3 --- 3 files

[PATCH 6/7] glamor: Expose glamor_destroy_pixmap()

2014-04-01 Thread Kristian Høgsberg
When we create a glamor pixmap by calling glamor_create_pixmap() directly, we need to call glamor_destroy_pixmap() to destroy it. Signed-off-by: Kristian Høgsberg k...@bitplanet.net --- glamor/glamor.h | 1 + glamor/glamor_priv.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff

Re: [PATCH 5/6] events: Make XYToWindow a screen function pointer

2014-04-01 Thread Keith Packard
Kristian Høgsberg k...@bitplanet.net writes: This allows DDXen to override the window picking to account for native windows not seen by the X server. The bulk of the picking logic is exposed as a new helper function, miSpriteTrace(). This function completes the sprite trace filled out by

Re: [PATCH 6/6] Xwayland DDX

2014-04-01 Thread Keith Packard
Kristian Høgsberg k...@bitplanet.net writes: +static WindowPtr +xwl_xy_to_window(DeviceIntPtr master, SpritePtr sprite, int x, int y) With my previous adjustment to leave the existing public XYToWindow API unchanged, xwl_xy_to_window will need to figure out which pointer device the sprite is

Re: [PATCH v2 2/2] xf86LogInit: log to XDG_DATA_HOME when not running as root

2014-04-01 Thread Peter Hutterer
On Wed, Mar 26, 2014 at 12:24:50PM +0100, Hans de Goede wrote: When no logfile was specified (xf86LogFileFrom == X_DEFAULT) and we're not running as root log to $XDG_DATA_HOME/xorg/Xorg.#.log as Xorg won't be able to log to the default /var/log/... when it is not running as root.

[PATCH xf86-video-vmware] configure: fix build without xatracker

2014-04-01 Thread Julien Cristau
ACTION-IF-NOT-FOUND is the fourth argument to PKG_CHECK_MODULES, not the fifth. Debian bug#743239 https://bugs.debian.org/743239 Signed-off-by: Julien Cristau jcris...@debian.org --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac

Re: [PATCH v2 2/2] xf86LogInit: log to XDG_DATA_HOME when not running as root

2014-04-01 Thread Julien Cristau
On Tue, Apr 1, 2014 at 17:33:08 +1000, Peter Hutterer wrote: the second point: 755 would be enough? any specific reason for 777? umask should take care of that. Either we consider the log private and should use 0700, or we don't and 0777 would be fine, IMO. Cheers, Julien

Re: [PATCH v2 2/2] xf86LogInit: log to XDG_DATA_HOME when not running as root

2014-04-01 Thread Hans de Goede
Hi, On 04/01/2014 09:33 AM, Peter Hutterer wrote: On Wed, Mar 26, 2014 at 12:24:50PM +0100, Hans de Goede wrote: When no logfile was specified (xf86LogFileFrom == X_DEFAULT) and we're not running as root log to $XDG_DATA_HOME/xorg/Xorg.#.log as Xorg won't be able to log to the default

[PATCH v3] xf86LogInit: log to XDG_DATA_HOME when not running as root

2014-04-01 Thread Hans de Goede
When no logfile was specified (xf86LogFileFrom == X_DEFAULT) and we're not running as root log to $XDG_DATA_HOME/xorg/Xorg.#.log as Xorg won't be able to log to the default /var/log/... when it is not running as root. Signed-off-by: Hans de Goede hdego...@redhat.com --- configure.ac

Fw: Not able to cross-compile xserver

2014-04-01 Thread Prashant Bhumkar
On Tuesday, 1 April 2014 2:15 PM, Prashant Bhumkar prashant.bhum...@yahoo.com wrote: Hello, I am trying to cross compile xserver for arm platform, I am facing some issues while doing it. I have follow all the steps as mentioned in link : http://www.x.org/wiki/CrossCompilingXorg/#index3h2

Re: [PATCH] dix/dispatch: DoGetImage: Use a single buffer

2014-04-01 Thread Daniel Stone
Hi, On 1 April 2014 05:54, Keith Packard kei...@keithp.com wrote: Aaron Plattner aplatt...@nvidia.com writes: Can't the max image size be multiple gigabytes? That seems a little large to describe as close to running out of heap space. The problem is that we're going to buffer that in

Re: [PATCH xf86-video-vmware] configure: fix build without xatracker

2014-04-01 Thread Thomas Klausner
On Tue, Apr 01, 2014 at 10:11:13AM +0200, Julien Cristau wrote: ACTION-IF-NOT-FOUND is the fourth argument to PKG_CHECK_MODULES, not the fifth. Debian bug#743239 https://bugs.debian.org/743239 Reviewed-by: Thomas Klausner w...@netbsd.org Signed-off-by: Julien Cristau jcris...@debian.org

Re: [PATCH 3/5] glx: Consistently use ARB-suffixed names for ARB_multitexture functions

2014-04-01 Thread Jon TURNEY
On 18/12/2013 14:52, Jon TURNEY wrote: On 17/12/2013 01:35, Ian Romanick wrote: On 12/08/2013 08:57 AM, Jon TURNEY wrote: At the moment we have a mix of ARB and non-ARB suffixed forms for ARB_multitexture functions e.g. glMultiTexCoord1fvARB and glMultiTexCoord1dv Consistently use the

Re: [PATCH 2/7] composite: Add exception mechanism for implicit redirection policy

2014-04-01 Thread Jasper St. Pierre
Does this mean this mean that reparenting an RGB24 visual window into an ARGB32 visual window will only be copy-free on Xwayland and not Xorg? On Tue, Apr 1, 2014 at 2:53 AM, Kristian Høgsberg k...@bitplanet.net wrote: Normally composite will decide to add implicit redirection when a window

Re: [PATCH 2/7] composite: Add exception mechanism for implicit redirection policy

2014-04-01 Thread Keith Packard
Jasper St. Pierre jstpie...@mecheye.net writes: Does this mean this mean that reparenting an RGB24 visual window into an ARGB32 visual window will only be copy-free on Xwayland and not Xorg? Until someone makes it work, yes. It's not completely trivial; you have to make sure the rendering code

Re: [PATCH xinit v3 1/3] Bump required util-macros version to 1.19

2014-04-01 Thread Gaetan Nadon
On 14-03-31 09:51 AM, Hans de Goede wrote: Signed-off-by: Hans de Goede hdego...@redhat.com --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Gaetan Nadon mems...@videotron.ca ___ xorg-devel@lists.x.org: X.Org

Re: [PATCH xinit v3 2/3] Drop Replace $RAWCPPFLAGS with $TRADITIONALCPPFLAGS when processing cpp files

2014-04-01 Thread Gaetan Nadon
On 14-03-31 09:51 AM, Hans de Goede wrote: Various .cpp files containt things like #ifdef __APPLE__ and #ifdef __linux__ these have been broken (all #ifdef-s always seen as false) since: http://cgit.freedesktop.org/xorg/util/macros/commit/?id=d690e4a9febd07988d149a967791c5629c17b258 This

Re: [PATCH 7/7] Xwayland DDX

2014-04-01 Thread Mateusz Jończyk
Hello, W dniu 01.04.2014 08:53, Kristian Høgsberg pisze: diff --git a/hw/xwayland/xwayland-cvt.c b/hw/xwayland/xwayland-cvt.c new file mode 100644 index 000..3566559 --- /dev/null +++ b/hw/xwayland/xwayland-cvt.c @@ -0,0 +1,304 @@ +/* Copied from hw/xfree86/modes/xf86cvt.c into

Re: [PATCH 6/6] Xwayland DDX

2014-04-01 Thread Kristian Høgsberg
On Tue, Apr 01, 2014 at 12:10:09AM -0700, Keith Packard wrote: Kristian Høgsberg k...@bitplanet.net writes: +static WindowPtr +xwl_xy_to_window(DeviceIntPtr master, SpritePtr sprite, int x, int y) With my previous adjustment to leave the existing public XYToWindow API unchanged,

Not able to cross-compile xserver

2014-04-01 Thread Prashant Bhumkar
Hello, I am trying to cross compile xserver for arm platform,I am facing some issues while doing it. I have follow all the steps as mentioned in link : http://www.x.org/wiki/CrossCompilingXorg/#index3h2 All the 61 packages compiled and  installed successfully, but on last 62 package xserver

Re: [PATCH 00/20] New glamor core rendering code (v2)

2014-04-01 Thread Keith Packard
Michel Dänzer mic...@daenzer.net writes: Sounds great, but... Patch 11 breaks Xorg for me with radeonsi. It looks like solid fills are basically not rendered at all anymore, so e.g. only the text is visible in an xterm window. Then later patches make it even worse, resulting in just a black

Re: Not able to cross-compile xserver

2014-04-01 Thread Gaetan Nadon
On 14-04-01 04:45 AM, Prashant Bhumkar wrote: configure: WARNING: unrecognized options: --with-driver, --with-mesa-source, --enable-malloc0returnsnull Regarding --enable-malloc0returnsnull, see: http://cgit.freedesktop.org/xorg/util/macros/commit/?id=72fdc868b56fe2b7bdc9a69872651baeca728fb6

[PATCH 14/21] glamor: Use glamor_program for glamor_glyphblt

2014-04-01 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 | 6 +- glamor/glamor_glyphblt.c | 261

[PATCH 04/21] glamor: Stop calling eglMakeCurrent (.., EGL_NO_SURFACE)

2014-04-01 Thread Keith Packard
This eliminates a huge cost when using EGL. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor_egl.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index 8123421..0248efa 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_egl.c @@

[PATCH 00/21] New glamor core rendering code (v3)

2014-04-01 Thread Keith Packard
Here's another pass at the glamor acceleration series. Major changes from last time: * Fixed the new *_nf functions to fallback to software locally when the pixmaps can't be used by the DDX. This matches semantics with the existing _nf functions. xf86-video-intel now works as well as it

[PATCH 03/21] glamor: the render Composite hook must call SourceValidate

2014-04-01 Thread Keith Packard
This call is required for correct operation of the Render extension, in particular it is necessary for software cursors and Composite to work correctly. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor_render.c | 4 1 file changed, 4 insertions(+) diff --git

[PATCH 12/21] glamor: Add glamor_program based fill/set/get spans

2014-04-01 Thread Keith Packard
This accelerates spans operations using GPU-based geometry computation Signed-off-by: Keith Packard kei...@keithp.com --- glamor/Makefile.am| 4 +- glamor/glamor_fillspans.c | 107 - glamor/glamor_getspans.c | 92 --- glamor/glamor_priv.h | 32 ++--

[PATCH 08/21] glamor: Remove warning message when pixmap cannot be stored in a texture

2014-04-01 Thread Keith Packard
This happens when you have 4bpp pixmaps; it's not an error, so stop flooding the log file when it happens. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor_pixmap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c index

[PATCH 02/21] fb: Publish fbGlyphs and fbUnrealizeGlyph

2014-04-01 Thread Keith Packard
This lets other code jump directly into the fb code for fallbacks Signed-off-by: Keith Packard kei...@keithp.com --- fb/fbpict.c | 4 ++-- fb/fbpict.h | 15 ++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/fb/fbpict.c b/fb/fbpict.c index b503858..c2ee8a5 100644

[PATCH 10/21] glamor: Add simple upload/download functions in glamor_transfer

2014-04-01 Thread Keith Packard
These use glTexSubimage2D for upload and glReadPixels for download. There are a variety of interfaces to the basic function as needed by the callers. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/Makefile.am | 2 + glamor/glamor_transfer.c | 264

[PATCH 13/21] glamor: Add glamor_program based poly_fill_rect

2014-04-01 Thread Keith Packard
This accelerates poly_fill_rect using GPU-based geometry computation Signed-off-by: Keith Packard kei...@keithp.com --- glamor/Makefile.am | 2 +- glamor/glamor_polyfillrect.c | 123 - glamor/glamor_priv.h | 12 ++-- glamor/glamor_rects.c

[PATCH 01/21] glamor: glamor_poly_point_nf cannot fail for non-DDX pixmaps

2014-04-01 Thread Keith Packard
All of the glamor _nf functions must check to see if the DDX can access the pixmap directly before returning failure back to the driver; this restructures the point code to split out the _nf checking from the _gl code. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor_points.c |

[PATCH 06/21] glamor: Initialize XV shaders from glamor_xv_init instead of glamor_init

2014-04-01 Thread Keith Packard
The glamor_init calls to glamor_init_xv_shader were never getting run because GLAMOR_XV was never defined. Instead of trying to make that work, fix glamor_xv_init to make the call instead. Further, just get rid of the glamor_fini_xv_shader function entirely as the shader program will be destroyed

[PATCH 16/21] glamor: Use glamor_program for glamor_push_pixels

2014-04-01 Thread Keith Packard
This uses the same shaders as glamor_poly_glyph_blt. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor_copy.c | 2 +- glamor/glamor_glyphblt.c | 135 ++- 2 files changed, 51 insertions(+), 86 deletions(-) diff --git

[PATCH 20/21] glamor: Remove stubbed-out glamor_stipple function

2014-04-01 Thread Keith Packard
This function isn't used anymore. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor_core.c | 11 --- glamor/glamor_priv.h | 5 - 2 files changed, 16 deletions(-) diff --git a/glamor/glamor_core.c b/glamor/glamor_core.c index 6dc9f49..27bffed 100644 ---

[PATCH 17/21] glamor: Use glamor_program and GL_LINES for 0-width lines

2014-04-01 Thread Keith Packard
GL lines are nearly X compliant; you just need to fill in the last pixel when the client hasn't requested CapNotLast. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/Makefile.am| 4 +- glamor/glamor_lines.c | 180 ++

[PATCH 05/21] glamor: SetWindowPixmap is not related to RENDER

2014-04-01 Thread Keith Packard
Move the configuration of screen-SetWindowPixmap out from under the Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glamor/glamor.c b/glamor/glamor.c index 3094432..971dbf8 100644 --- a/glamor/glamor.c

[PATCH 11/21] glamor: Replace fallback preparation code

2014-04-01 Thread Keith Packard
These offer a simpler and more efficient means for temporarily transitioning to CPU-accessible memory for fallback implementations. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/Makefile.am | 2 + glamor/glamor_core.c| 107 - glamor/glamor_picture.c |

[PATCH 19/21] glamor: Remove 'tiling' shader code

2014-04-01 Thread Keith Packard
The core rendering paths all use the glamor_program fill functions now Signed-off-by: Keith Packard kei...@keithp.com --- glamor/Makefile.am | 1 - glamor/glamor.c | 2 - glamor/glamor_priv.h | 12 --- glamor/glamor_tile.c | 298 --- 4

[PATCH 18/21] glamor: Add glamor_transfer based glamor_get_image and glamor_put_image

2014-04-01 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| 5 +- glamor/glamor.c | 4 - glamor/glamor_fill.c | 361

[PATCH 09/21] glamor: Bail from composite when pixmap cannot be uploaded

2014-04-01 Thread Keith Packard
I think the sense of the return value was just flipped here; if you return TRUE, then the calling code assumes that the pixmap *has* been uploaded and that an FBO is available. When it tries to use it, it crashes though. Returning false makes the caller bail back to software. Signed-off-by: Keith

[PATCH 21/21] glamor: Provide render fallbacks for debugging

2014-04-01 Thread Keith Packard
These provide a complete set of fallbacks to isolate the glamor render code from the rest of the implementation. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/Makefile.am | 4 +- glamor/glamor.c | 4 ++ glamor/glamor_render_fallback.c | 127

[PATCH 07/21] glamor: Public polyLines function is glamor_poly_lines_nf

2014-04-01 Thread Keith Packard
There was a spurious declaratoin in glamor.h for glamor_poly_line_nf Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/glamor/glamor.h b/glamor/glamor.h index 11ec493..2ff0409 100644 --- a/glamor/glamor.h +++

[PATCH] xrandr: use full range for gamma table generation

2014-04-01 Thread dbehr
From: Dominik Behr db...@chromium.org Calculate gamma table using full [0,65536) range and do not make any assumptions about relation of gamma table size and significant bits. Gamma table size has nothing to do with number of significant bits in hardware. In particular we are dealing now with

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

2014-04-01 Thread dbehr
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 the end of gamma table.

[PATCH 3/8] glamor: Stop calling eglMakeCurrent (.., EGL_NO_SURFACE)

2014-04-01 Thread Keith Packard
This eliminates a huge cost when using EGL. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor_egl.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index 8123421..0248efa 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_egl.c @@

[PATCH 4/8] glamor: SetWindowPixmap is not related to RENDER

2014-04-01 Thread Keith Packard
Move the configuration of screen-SetWindowPixmap out from under the Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glamor/glamor.c b/glamor/glamor.c index 3094432..971dbf8 100644 --- a/glamor/glamor.c

[PATCH 2/8] glamor: the render Composite hook must call SourceValidate

2014-04-01 Thread Keith Packard
This call is required for correct operation of the Render extension, in particular it is necessary for software cursors and Composite to work correctly. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor_render.c | 4 1 file changed, 4 insertions(+) diff --git

[PATCH 8/8] glamor: Bail from composite when pixmap cannot be uploaded

2014-04-01 Thread Keith Packard
I think the sense of the return value was just flipped here; if you return TRUE, then the calling code assumes that the pixmap *has* been uploaded and that an FBO is available. When it tries to use it, it crashes though. Returning false makes the caller bail back to software. Signed-off-by: Keith

[PATCH 1/8] glamor: glamor_poly_point_nf cannot fail for non-DDX pixmaps

2014-04-01 Thread Keith Packard
All of the glamor _nf functions must check to see if the DDX can access the pixmap directly before returning failure back to the driver; this restructures the point code to split out the _nf checking from the _gl code. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor_points.c |

[PATCH 7/8] glamor: Remove warning message when pixmap cannot be stored in a texture

2014-04-01 Thread Keith Packard
This happens when you have 4bpp pixmaps; it's not an error, so stop flooding the log file when it happens. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor_pixmap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c index

[PATCH 6/8] glamor: Public polyLines function is glamor_poly_lines_nf

2014-04-01 Thread Keith Packard
There was a spurious declaratoin in glamor.h for glamor_poly_line_nf Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/glamor/glamor.h b/glamor/glamor.h index 11ec493..2ff0409 100644 --- a/glamor/glamor.h +++

[PATCH 0/8] Glamor bug fixes

2014-04-01 Thread Keith Packard
I've pulled these 8 patches out of my larger glamor series as they're all fixes related to the current glamor code. They're all short and should be easy to review. -keith [PATCH 1/8] glamor: glamor_poly_point_nf cannot fail for non-DDX Fix for a bug introduced in the accelerated poly point

[PATCH 5/8] glamor: Initialize XV shaders from glamor_xv_init instead of glamor_init

2014-04-01 Thread Keith Packard
The glamor_init calls to glamor_init_xv_shader were never getting run because GLAMOR_XV was never defined. Instead of trying to make that work, fix glamor_xv_init to make the call instead. Further, just get rid of the glamor_fini_xv_shader function entirely as the shader program will be destroyed

[PATCH 00/16] New glamor core rendering code (v4)

2014-04-01 Thread Keith Packard
I sent a set of glamor bug fixes separately; these are just the patches needed to speed up core rendering operations with glamor. Eric mentioned that GLSL 1.30 wasn't all that common yet, so I've added fallbacks to 1.20 for operations where that was possible, which includes everything other than

[PATCH 02/16] glamor: Compute supported GLSL version and save in screen private

2014-04-01 Thread Keith Packard
This currently computes the GLSL version in a fairly naïve fashion, and leaves that in the screen private for other users. This will let us update the version computation in one place later on. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor.c | 9 +

[PATCH 03/16] glamor: Add simple upload/download functions in glamor_transfer

2014-04-01 Thread Keith Packard
These use glTexSubimage2D for upload and glReadPixels for download. There are a variety of interfaces to the basic function as needed by the callers. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/Makefile.am | 2 + glamor/glamor_transfer.c | 264

[PATCH 01/16] fb: Publish fbGlyphs and fbUnrealizeGlyph

2014-04-01 Thread Keith Packard
This lets other code jump directly into the fb code for fallbacks Signed-off-by: Keith Packard kei...@keithp.com --- fb/fbpict.c | 4 ++-- fb/fbpict.h | 15 ++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/fb/fbpict.c b/fb/fbpict.c index b503858..c2ee8a5 100644

[PATCH 10/16] glamor: Use glamor_program for glamor_push_pixels

2014-04-01 Thread Keith Packard
This uses the same shaders as glamor_poly_glyph_blt. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor_copy.c | 6 +-- glamor/glamor_glyphblt.c | 135 ++- 2 files changed, 53 insertions(+), 88 deletions(-) diff --git

[PATCH 12/16] glamor: Add glamor_transfer based glamor_get_image and glamor_put_image

2014-04-01 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 | 3 +- glamor/glamor.c | 2 - glamor/glamor_fill.c | 8 +-- glamor/glamor_getimage.c | 96

[PATCH 04/16] glamor: Replace fallback preparation code

2014-04-01 Thread Keith Packard
These offer a simpler and more efficient means for temporarily transitioning to CPU-accessible memory for fallback implementations. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/Makefile.am | 2 + glamor/glamor_core.c| 107 - glamor/glamor_picture.c |

[PATCH 08/16] glamor: Add glamor_program based poly_text and image_text

2014-04-01 Thread Keith Packard
Accelerates text painting with GPU-based geometry computation and stippling v2: Simplify get_glyphs, expand single character variable names to more descriptive ones. (Markus Wick) Signed-off-by: Keith Packard kei...@keithp.com --- glamor/Makefile.am| 2 + glamor/glamor.c

[PATCH 05/16] glamor: Add glamor_program based fill/set/get spans

2014-04-01 Thread Keith Packard
This accelerates spans operations using GPU-based geometry computation Signed-off-by: Keith Packard kei...@keithp.com --- glamor/Makefile.am| 4 +- glamor/glamor_fillspans.c | 107 glamor/glamor_getspans.c | 92 -- glamor/glamor_priv.h | 32 ++--

[PATCH 15/16] glamor: Remove stubbed-out glamor_stipple function

2014-04-01 Thread Keith Packard
This function isn't used anymore. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/glamor_core.c | 11 --- glamor/glamor_priv.h | 5 - 2 files changed, 16 deletions(-) diff --git a/glamor/glamor_core.c b/glamor/glamor_core.c index 6dc9f49..27bffed 100644 ---

[PATCH 14/16] glamor: Remove 'tiling' shader code

2014-04-01 Thread Keith Packard
The core rendering paths all use the glamor_program fill functions now Signed-off-by: Keith Packard kei...@keithp.com --- glamor/Makefile.am | 1 - glamor/glamor.c | 2 - glamor/glamor_priv.h | 12 --- glamor/glamor_tile.c | 298 --- 4

[PATCH 16/16] glamor: Provide render fallbacks for debugging

2014-04-01 Thread Keith Packard
These provide a complete set of fallbacks to isolate the glamor render code from the rest of the implementation. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/Makefile.am | 4 +- glamor/glamor.c | 4 ++ glamor/glamor_render_fallback.c | 127

[PATCH 13/16] glamor: Replace glamor_solid_boxes and glamor_solid with GC using code

2014-04-01 Thread Keith Packard
This provides glamor_solid_boxes and glamor_solid using regular GC operations instead of calling directly to underlying rendering functions. This will allow the old rendering code to be removed. Signed-off-by: Keith Packard kei...@keithp.com fixup for utils fixup for utils ---

[PATCH 11/16] glamor: Use glamor_program and GL_LINES for 0-width lines

2014-04-01 Thread Keith Packard
GL lines are nearly X compliant; you just need to fill in the last pixel when the client hasn't requested CapNotLast. Signed-off-by: Keith Packard kei...@keithp.com --- glamor/Makefile.am| 4 +- glamor/glamor_lines.c | 179 ++

[PATCH 06/16] glamor: Add glamor_program based poly_fill_rect

2014-04-01 Thread Keith Packard
This accelerates poly_fill_rect using GPU-based geometry computation Signed-off-by: Keith Packard kei...@keithp.com --- glamor/Makefile.am | 2 +- glamor/glamor_polyfillrect.c | 123 - glamor/glamor_priv.h | 12 ++- glamor/glamor_rects.c|

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

2014-04-01 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 | 6 +- glamor/glamor_glyphblt.c | 261

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

2014-04-01 Thread Peter Hutterer
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 Note that the new behavior is is strictly spec compliant but we've had the other

Xorg copyright infrigement (was: Re: [PATCH 7/7 v2] Xwayland DDX)

2014-04-01 Thread Mateusz Jończyk
Hello, W dniu 01.04.2014 08:53, Kristian Høgsberg pisze: diff --git a/hw/xwayland/xwayland-cvt.c b/hw/xwayland/xwayland-cvt.c new file mode 100644 index 000..3566559 --- /dev/null +++ b/hw/xwayland/xwayland-cvt.c @@ -0,0 +1,304 @@ +/* Copied from hw/xfree86/modes/xf86cvt.c into

Re: Xorg copyright infrigement (was: Re: [PATCH 7/7 v2] Xwayland DDX)

2014-04-01 Thread Dave Airlie
+/* + * Generate a CVT standard mode from HDisplay, VDisplay and VRefresh. + * + * These calculations are stolen from the CVT calculation spreadsheet written + * by Graham Loveridge. He seems to be claiming no copyright and there seems to + * be no license attached to this. He apparently