[PATCH xserver 6/7 v2] sync: Convert from "CARD64" to int64_t.

2017-08-04 Thread Eric Anholt
, let's just use that here, instead. v2: Fix alarm delta changes. Signed-off-by: Eric Anholt --- Xext/sync.c | 302 +++- Xext/syncsrv.h | 23 ++-- include/misc.h | 25 miext/sync/misync.c | 5 +- miext

[PATCH xserver 5.5/7] test: Extend sync tests to cover alarm delta and waitvalue changes.

2017-08-04 Thread Eric Anholt
This would be squashed into the other tests. Signed-off-by: Eric Anholt --- test/sync/sync.c | 71 ++-- 1 file changed, 69 insertions(+), 2 deletions(-) diff --git a/test/sync/sync.c b/test/sync/sync.c index c39774246841..f25d3fa3774a 100644

[PATCH xserver 1/2] travis: Set prefix to /usr, so we find xkbcomp.

2017-08-04 Thread Eric Anholt
Signed-off-by: Eric Anholt --- test/scripts/build-travis-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/scripts/build-travis-deps.sh b/test/scripts/build-travis-deps.sh index 213b51f6f161..b87c65d3e397 100755 --- a/test/scripts/build-travis-deps.sh +++ b/test

[PATCH xserver 2/2] travis: Request a new docker image with xkb-data and xkbcomp installed.

2017-08-04 Thread Eric Anholt
Travis. Signed-off-by: Eric Anholt --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 00d7a485a29f..edeed0d90972 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME"

Re: [PATCH xserver 5/7] test: Add basic SYNC tests.

2017-08-03 Thread Eric Anholt
Keith Packard writes: > [ Unknown signature status ] > Eric Anholt writes: > >> I couldn't find any, and I was modifying the implementation, so I had >> to write some. I would like the test to end with a "make sure there >> weren't any stray unchecked

Re: [PATCH xserver 6/7] sync: Convert from "CARD64" to int64_t.

2017-08-03 Thread Eric Anholt
Keith Packard writes: > [ Unknown signature status ] > Eric Anholt writes: > >> The extension was using the name CARD64 to represent 64-bit values, >> with a #define from CARD64 to XSyncValue, a struct with a pair of >> 32-bit values representing a signed 64-bi

[PATCH xserver 3/3] glamor: Scissor Render composite operations to the bounds of the drawing.

2017-08-03 Thread Eric Anholt
1perf -comppixwin10 -repeat 1 -reps 1 on i965 by 3.21191% +/- 1.79977% (n=50). v2: Make the jump to the exit land after scissor disable. Signed-off-by: Eric Anholt --- glamor/glamor_render.c | 25 + 1 file changed, 25 insertions(+) diff --git a/glamor/glamor_rende

[PATCH xserver 1/3] glamor: Scissor rectangle drawing to the bounds of the rects.

2017-08-03 Thread Eric Anholt
avoid overhead on desktop GL. No performance difference on i965 with x11perf -rect1 -repeat 1 -reps 1 (n=50) v2: Clamp rectangle bounds addition. Signed-off-by: Eric Anholt --- glamor/glamor_rects.c | 26 ++ glamor/glamor_utils.h | 35

[PATCH xserver 2/3] glamor: Scissor CopyArea to the bounds of the drawing.

2017-08-03 Thread Eric Anholt
Like the previous fix to rectangles, this reduces the area drawn on tiled renderers by letting the CPU-side tile setup know what tiles might be drawn at all. Surprisingly, it improves x11perf -copypixwin1 -repeat 1 -reps 1 on i965 by 2.93185% +/- 1.5561% (n=90). Signed-off-by: Eric Anholt

Re: [PATCH dri3proto v2] Add modifier/multi-plane requests, bump to v1.1

2017-08-03 Thread Eric Anholt
Daniel Stone writes: > On 28 July 2017 at 16:51, Keith Packard wrote: >> Michel Dänzer writes: >>> Declaring where? Once a pixmap is created, it only has a depth, no >>> format, so there's nothing to base on that e.g. CopyArea between two >>> pixmaps of the same depth is undefined. >> >> I thin

[PATCH xserver 6/7] sync: Convert from "CARD64" to int64_t.

2017-08-03 Thread Eric Anholt
The extension was using the name CARD64 to represent 64-bit values, with a #define from CARD64 to XSyncValue, a struct with a pair of 32-bit values representing a signed 64-bit value. Now that stdint.h exists, let's just use that instead. Signed-off-by: Eric Anholt --- Xext/s

[PATCH xserver 7/7] sync: Clean up a bit of header formatting.

2017-08-03 Thread Eric Anholt
Signed-off-by: Eric Anholt --- miext/sync/misyncstr.h | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/miext/sync/misyncstr.h b/miext/sync/misyncstr.h index 084ca4c82d9d..a0a0a98146b4 100644 --- a/miext/sync/misyncstr.h +++ b/miext/sync/misyncstr.h @@ -49,7 +49,7

[PATCH xserver 2/7] meson: Move Xvfb build under an option.

2017-08-03 Thread Eric Anholt
Autotools also had it as an option. Signed-off-by: Eric Anholt --- hw/meson.build| 4 +++- meson_options.txt | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/meson.build b/hw/meson.build index c0d2db3f5c85..96c1559c348b 100644 --- a/hw/meson.build +++ b/hw

[PATCH xserver 4/7] test: Return error from simple-xinit if the client crashes.

2017-08-03 Thread Eric Anholt
I want to be able to call client tests with simple-xinit, so assertion failures should be an error. Signed-off-by: Eric Anholt --- test/simple-xinit.c | 8 1 file changed, 8 insertions(+) diff --git a/test/simple-xinit.c b/test/simple-xinit.c index 89189a609c19..78d546c71e49 100644

[PATCH xserver 3/7] meson: Add Xvfb and Xephyr-glamor testing.

2017-08-03 Thread Eric Anholt
The Xvfb tests are passing and Xephyr-glamor is failing for me, but it fails identically on autotools. Signed-off-by: Eric Anholt --- meson.build | 1 + test/meson.build | 24 test/scripts/xephyr-glamor-piglit.sh | 7

[PATCH xserver 1/7] test: Remove unused ddxstubs.c

2017-08-03 Thread Eric Anholt
Signed-off-by: Eric Anholt --- test/Makefile.am | 1 - test/ddxstubs.c | 97 2 files changed, 98 deletions(-) delete mode 100644 test/ddxstubs.c diff --git a/test/Makefile.am b/test/Makefile.am index 15f0b53f03a4..2dbb2df03030 100644

[PATCH xserver 5/7] test: Add basic SYNC tests.

2017-08-03 Thread Eric Anholt
I couldn't find any, and I was modifying the implementation, so I had to write some. I would like the test to end with a "make sure there weren't any stray unchecked errors", but I didn't figure out how to do that. Signed-off-by: Eric Anholt --- hw/vfb/meson.build|

Re: [PATCH xserver 1/3] glamor: Scissor rectangle drawing to the bounds of the rects.

2017-08-02 Thread Eric Anholt
Michel Dänzer writes: > On 02/08/17 05:59 AM, Eric Anholt wrote: >> Scissors provide a critical hint to tiled renderers as to what tiles >> need to be load/stored because they could be modified by the >> rendering. >> >> The bounds calculation here is limit

[PATCH xserver 3/3] glamor: Scissor Render composite operations to the bounds of the drawing.

2017-08-01 Thread Eric Anholt
1perf -comppixwin10 -repeat 1 -reps 1 on i965 by 3.21191% +/- 1.79977% (n=50). Signed-off-by: Eric Anholt --- glamor/glamor_render.c | 25 + 1 file changed, 25 insertions(+) diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index 52f073d0578b..413c4a7f8e8a 1

[PATCH xserver 2/3] glamor: Scissor CopyArea to the bounds of the drawing.

2017-08-01 Thread Eric Anholt
Like the previous fix to rectangles, this reduces the area drawn on tiled renderers by letting the CPU-side tile setup know what tiles might be drawn at all. Surprisingly, it improves x11perf -copypixwin1 -repeat 1 -reps 1 on i965 by 2.93185% +/- 1.5561% (n=90). Signed-off-by: Eric Anholt

[PATCH xserver 1/3] glamor: Scissor rectangle drawing to the bounds of the rects.

2017-08-01 Thread Eric Anholt
avoid overhead on desktop GL. No performance difference on i965 with x11perf -rect1 -repeat 1 -reps 1 (n=50) Signed-off-by: Eric Anholt --- glamor/glamor_rects.c | 26 ++ glamor/glamor_utils.h | 35 +++ 2 files changed, 57 insertions(+), 4

[PATCH xserver] meson: Fix xwayland build since xwayland-keyboard-grab.

2017-08-01 Thread Eric Anholt
The version detect was erroring out with 1.9 protos installed, and we weren't building the new code. Signed-off-by: Eric Anholt --- hw/xwayland/meson.build | 3 +++ meson.build | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/xwayland/meson.build

Re: [PATCH xserver] glx: Allow arbitrary context attributes for direct contexts

2017-07-28 Thread Eric Anholt
Adam Jackson writes: > On Fri, 2017-07-28 at 09:56 -0700, Eric Anholt wrote: >> Adam Jackson writes: >> >> > For direct contexts, most context attributes don't require any >> > particular awareness on the part of the server. Examples include &g

Re: [PATCH xserver] glx: Allow arbitrary context attributes for direct contexts

2017-07-28 Thread Eric Anholt
Adam Jackson writes: > For direct contexts, most context attributes don't require any > particular awareness on the part of the server. Examples include > GLX_ARB_create_context_no_error and GLX_ARB_context_flush_control, where > all of the behavior change lives in the renderer; since that's on t

Re: [PATCH dri3proto v2] Add modifier/multi-plane requests, bump to v1.1

2017-07-27 Thread Eric Anholt
Keith Packard writes: > [ Unknown signature status ] > Eric Anholt writes: > >> That's what both patch 5 of this series and pixman say the depth is for >> bgrx. I think things have only worked because nobody uses bgrx >> with Render and also tries

Re: [RFC xserver 05/16] DRI3/Glamor: Implement PixmapFromBuffers request

2017-07-27 Thread Eric Anholt
Daniel Stone writes: > From: Louis-Francis Ratté-Boulianne > > Signed-off-by: Louis-Francis Ratté-Boulianne > Signed-off-by: Daniel Stone > --- > +{ .format = DRM_FORMAT_ARGB2101010, .depth = 30, .bpp = 32 }, > +{ .format = DRM_FORMAT_ABGR2101010, .depth = 30, .bpp = 32 }, > +

Re: [PATCH dri3proto v2] Add modifier/multi-plane requests, bump to v1.1

2017-07-27 Thread Eric Anholt
Michel Dänzer writes: > [ Unknown signature status ] > On 27/07/17 07:38 AM, Eric Anholt wrote: >> Michel Dänzer writes: >> >>> [ Unknown signature status ] >>> On 26/07/17 06:20 AM, Eric Anholt wrote: >>>> Daniel Stone writes: >>>

Re: [PATCH dri3proto v2] Add modifier/multi-plane requests, bump to v1.1

2017-07-26 Thread Eric Anholt
Michel Dänzer writes: > [ Unknown signature status ] > On 26/07/17 06:20 AM, Eric Anholt wrote: >> Daniel Stone writes: >> >>> DRI3 version 1.1 adds support for explicit format modifiers, including >>> multi-planar buffers. >> >> I still want pr

Re: [PATCH dri3proto v2] Add modifier/multi-plane requests, bump to v1.1

2017-07-25 Thread Eric Anholt
Daniel Stone writes: > DRI3 version 1.1 adds support for explicit format modifiers, including > multi-planar buffers. I still want proper 64-bit values, and I don't think the little XSync mess will be much of a blocker. > Signed-off-by: Daniel Stone > --- > dri3proto.h | 142 +++

Re: [RFC dri3proto 01/16] Add modifier/multi-plane requests, bump to v1.1

2017-07-25 Thread Eric Anholt
Daniel Stone writes: > On 17 June 2017 at 02:21, Eric Anholt wrote: >> With the Present extension, we started putting CARD64s on the wire. >> Let's use them here, too. > > Mm, we did have that originally, but anyone including XSync headers > very helpfully gets #de

Re: [PATCH xserver] glamor: remove no longer needed KHR_gl_texture_2D_image requirement

2017-06-29 Thread Eric Anholt
Emil Velikov writes: > From: Emil Velikov > > The code that needed it was introduced with commit 7cfd9cc2327 ("Add > DRI3 support to glamor") back in 2013. And was nuked a couple of years > ago with commit 51984dddfcc ("glamor: Delay making pixmaps shareable > until we need to.") Reviewed and p

Re: [PATCH xserver 2/2] meson: Make VBE and VGAHW modules optional

2017-06-19 Thread Eric Anholt
Jon Turney writes: > Don't build them on platforms where they aren't meaningful. > > Note that autoconf defines WITH_VGAHW when building the VGAHW module, but > that doesn't seem to be used anywhere, so we just drop that. both patches are: Reviewed-by: Eric Anholt

Re: [RFC dri3proto 01/16] Add modifier/multi-plane requests, bump to v1.1

2017-06-16 Thread Eric Anholt
Daniel Stone writes: > DRI3 version 1.1 adds support for explicit format modifiers, including > multi-planar buffers. > > Signed-off-by: Daniel Stone > --- > dri3proto.h | 142 > +++- > 1 file changed, 140 insertions(+), 2 deletions(-) >

Re: [PATCH xserver 3/4] glamor: Drop glamor_set_screen_pixmap().

2017-06-02 Thread Eric Anholt
Keith Packard writes: > [ Unknown signature status ] > Eric Anholt writes: > >> All that was left here was updating the FBO's size. However, the FBO >> size was always set correctly already through >> glamor_set_pixmap_texture() from whoever had attached a new B

[PATCH xserver] dmx: Remove includes of glxtokens.h

2017-06-02 Thread Eric Anholt
Our top-level glx.h include already provides all of the tokens we use, and fixes redefinition warnings in the meson build. Signed-off-by: Eric Anholt --- hw/dmx/glxProxy/glxcmds.c | 1 - hw/dmx/glxProxy/glxcmdsswap.c | 1 - 2 files changed, 2 deletions(-) diff --git a/hw/dmx/glxProxy

Re: [PATCH 3/2 xserver] travis: Enable ccache.

2017-06-02 Thread Eric Anholt
Aaron Plattner writes: > On 06/01/2017 01:59 PM, Eric Anholt wrote: >> We bind-mount the cache directory into the container. Cuts build time >> from about 4 minutes to 2. >> >> Signed-off-by: Eric Anholt >> --- >> .travis.yml | 5 +++-- >>

Re: [PATCH xserver] meson: Fix enabling of xshmfence.

2017-06-02 Thread Eric Anholt
Peter Hutterer writes: > On Thu, Jun 01, 2017 at 04:48:07PM -0700, Eric Anholt wrote: >> I misspelled the enable flag, so DRI3 would throw BadImplementation >> when you tried to start any GL app. Same as in >> c7be7a688a78a34f61b90c0d95914e14b90b0cdc, we also conver

[PATCH xserver] meson: Fix enabling of xshmfence.

2017-06-01 Thread Eric Anholt
I misspelled the enable flag, so DRI3 would throw BadImplementation when you tried to start any GL app. Same as in c7be7a688a78a34f61b90c0d95914e14b90b0cdc, we also convert it to #ifdef for consistency. Signed-off-by: Eric Anholt --- Xext/sync.c | 4 ++-- include/meson.build | 2 +- 2

Re: [PATCH xserver 3/4] glamor: Drop glamor_set_screen_pixmap().

2017-06-01 Thread Eric Anholt
Keith Packard writes: > [ Unknown signature status ] > Eric Anholt writes: > >> All that was left here was updating the FBO's size. However, the FBO >> size was always set correctly already through >> glamor_set_pixmap_texture() from whoever had attached

[PATCH 3/2 xserver] travis: Enable ccache.

2017-06-01 Thread Eric Anholt
We bind-mount the cache directory into the container. Cuts build time from about 4 minutes to 2. Signed-off-by: Eric Anholt --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e10cfe1e134f..0a136b23dd80 100644 --- a

[PATCH xserver 2/2] travis: Add a build script for Travis CI.

2017-06-01 Thread Eric Anholt
This currently does a meson build using a docker image I've prepared. The Dockerfile source is at: https://github.com/anholt/xserver-travis Docker proved to be necessary to cut the build time per Travis push. If some day we end up using meson in more of the X stack, we may be able to move mor

[PATCH xserver 1/2] meson: Fix test for whether we've built glamor-EGL.

2017-06-01 Thread Eric Anholt
This matches the test we use for going into the glamor_egl subdir in ../../meson.build. --- hw/xfree86/drivers/modesetting/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xfree86/drivers/modesetting/meson.build b/hw/xfree86/drivers/modesetting/meson.build index

Re: [PATCH xserver] glamor: Store the actual EGL/GLX context pointer in lastGLContext

2017-06-01 Thread Eric Anholt
Michel Dänzer writes: > [ Unknown signature status ] > On 01/06/17 03:00 AM, Eric Anholt wrote: >> Michel Dänzer writes: >> >>> From: Michel Dänzer >>> >>> Fixes subtle breakage which could sometimes trigger after a server reset >>> with

[PATCH xserver 3/4] glamor: Drop glamor_set_screen_pixmap().

2017-06-01 Thread Eric Anholt
All that was left here was updating the FBO's size. However, the FBO size was always set correctly already through glamor_set_pixmap_texture() from whoever had attached a new BO to the pixmap. Signed-off-by: Eric Anholt --- glamor/glamor.c

[PATCH xserver 4/4] glamor: Remove the "delayed fallback" code.

2017-06-01 Thread Eric Anholt
The usage of this died with the old core rendering code. Signed-off-by: Eric Anholt --- glamor/glamor_debug.h | 29 - glamor/glamor_priv.h | 2 -- 2 files changed, 31 deletions(-) diff --git a/glamor/glamor_debug.h b/glamor/glamor_debug.h index 638bee20c400

[PATCH xserver 1/4] glamor_egl: Stop saving the EGL major/minor version.

2017-06-01 Thread Eric Anholt
We don't use them for anything. Signed-off-by: Eric Anholt --- glamor/glamor_egl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index 354c30f68ea5..193a04409ee8 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_

[PATCH xserver 2/4] glamor: Stop tracking the screen_fbo.

2017-06-01 Thread Eric Anholt
This means we no longer get "s" for on-screen drawing in glamor_debug, and there's only "m" (CPU memory) or "f" (Any GPU memory, aka FBOs). That seems fine to me. Signed-off-by: Eric Anholt --- glamor/glamor.c | 1 - glamor/glamor_core.c | 5 +

Re: [PATCH xserver 3/3] Add meson.build for XWin server

2017-05-31 Thread Eric Anholt
Jon Turney writes: > On 23/05/2017 00:17, Eric Anholt wrote: >> Jon Turney writes: >> >>> This needs a meson with PRs #1784, #1792 and #1794 >>> >>> Future work: remove conditionals which are always on, and simplify redundant >>> CYGDEBUG cond

Re: [PATCH xserver] glamor: Store the actual EGL/GLX context pointer in lastGLContext

2017-05-31 Thread Eric Anholt
Michel Dänzer writes: > From: Michel Dänzer > > Fixes subtle breakage which could sometimes trigger after a server reset > with multiple screens using glamor: > > Screen A enters glamor_close_screen last and calls various cleanup > functions, which at some point call glamor_make_current to make

Re: [PATCH xserver 3/3] Add meson.build for XWin server

2017-05-22 Thread Eric Anholt
Jon Turney writes: > This needs a meson with PRs #1784, #1792 and #1794 > > Future work: remove conditionals which are always on, and simplify redundant > CYGDEBUG conditionals This looks pretty good! Just a few little cleanups I see. > --- > hw/meson.build | 4 + > hw/xwi

Re: [PATCH xserver 2/3] hw/xwin: Remove pretense of Xv support

2017-05-22 Thread Eric Anholt
Jon Turney writes: That's some seriously unhelpful stub code! These first two are: Reviewed-by: Eric Anholt signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-

Re: [PATCH xserver 1/2] misprite: Remove some dead cache variables

2017-05-18 Thread Eric Anholt
Adam Jackson writes: > Unused since Keith ported misprite to damage in '04. Nice. Both patches are: Reviewed-by: Eric Anholt signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lis

[PATCH xserver 1/2] glamor_egl: Remove check for KHR_surfaceless_context_*

2017-05-17 Thread Eric Anholt
Those extensions don't exist. There's only surfaceless_context. Signed-off-by: Eric Anholt --- glamor/glamor_egl.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index a82c1f790997..9527caad2b37 100644 --

[PATCH xserver 2/2] glamor_egl: Automatically choose a GLES2 context if desktop GL fails.

2017-05-17 Thread Eric Anholt
GLES2 support has been requested multiple times, and we've had this code laying around trying to implement it. The GLES2 implementation is not quite there yet (some pixel transfer failures), but it shouldn't take much fixing at this point. Signed-off-by: Eric Anholt --- glamor/gl

Re: [PATCH xf86-video-ati] Use plain glamor_egl_create_textured_screen().

2017-05-17 Thread Eric Anholt
Michel Dänzer writes: > On 17/05/17 03:04 AM, Eric Anholt wrote: >> Since 5064ffab631 (2014), glamor's implementation of _ext just drops the >> back_pixmap arg, which we were passing NULL (the default) to anyway. >> >> Signed-off-by: Eric Anholt > > Th

[PATCH xserver 06/12] glamor_egl: Drop unnecessary check for KHR_gl_renderbuffer_image.

2017-05-16 Thread Eric Anholt
I couldn't find it being used anywhere in the history of the code. Signed-off-by: Eric Anholt --- glamor/glamor_egl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index 21cf3c801242..c59aaa832f63 100644 --- a/glamor/glamor_egl.c +++ b/g

[PATCH xserver 12/12] glamor_egl: Drop glamor_egl_create_textured_screen_ext().

2017-05-16 Thread Eric Anholt
The function hasn't been doing anything useful since keithp's resource freeing fixes in 2014. Signed-off-by: Eric Anholt --- glamor/glamor.h | 14 -- glamor/glamor_egl.c | 8 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/glamor/glamor.

[PATCH xserver 09/12] glamor_egl: Avoid flink names in glamor_egl_create_textured_pixmap().

2017-05-16 Thread Eric Anholt
Using flink is banned on render nodes, and they needlessly expose our screen pixmap contents to any authenticated client. This also incidentally drops the dependency on EGL_MESA_drm_image. Signed-off-by: Eric Anholt --- glamor/glamor_egl.c | 84

[PATCH xserver 08/12] glamor_egl: Drop dead "cpp" field

2017-05-16 Thread Eric Anholt
It's been unused since the initial import. Signed-off-by: Eric Anholt --- glamor/glamor_egl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index abfdbf2a3129..ea047b4c422e 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_egl.c @@ -56,7

[PATCH xserver 07/12] glamor_egl: Drop dead gl_context_depth.

2017-05-16 Thread Eric Anholt
This was replaced in 4afe15d8bfd575c010ed1868697a7922a37ab378, but not deleted. Signed-off-by: Eric Anholt --- glamor/glamor_egl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index c59aaa832f63..abfdbf2a3129 100644 --- a/glamor/glamor_egl.c +++ b

[PATCH xserver 05/12] glamor_egl: Always require the gbm-based image import path.

2017-05-16 Thread Eric Anholt
rd to implement as texture import. Signed-off-by: Eric Anholt --- glamor/glamor_egl.c | 55 ++--- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index bf23dc8ed16c..21cf3c801242 100644

[PATCH xserver 11/12] glamor_egl: Automatically choose a GLES2 context if desktop GL fails.

2017-05-16 Thread Eric Anholt
GLES2 support has been requested multiple times, and we've had this code laying around trying to implement it. The GLES2 implementation is not quite there yet (some pixel transfer failures), but it shouldn't take much fixing at this point. Signed-off-by: Eric Anholt --- glamor/gl

[PATCH xserver 03/12] modesetting: Drop code for GLAMOR && !GLAMOR_HAS_GBM.

2017-05-16 Thread Eric Anholt
The glamor_egl module that the GLAMOR paths are using is only built if GLAMOR_HAS_GBM is true, and there's no plan for implementing the module without GBM. Simplify modesetting's code as a result. Signed-off-by: Eric Anholt --- hw/xfree86/drivers/modesetting/dri2.c|

[PATCH xserver 01/12] glamor_egl: Print a useful identifying string on initialization.

2017-05-16 Thread Eric Anholt
The EGL version is not used anywhere in the glamor code, so it's not interesting. And when saying that we've started using GL acceleration, it's nice to know what GL we're actually using. Signed-off-by: Eric Anholt --- glamor/glamor_egl.c | 17 +++-- 1 file c

[PATCH xserver 10/12] glamor_egl: Drop warning about indirect GLX and GLES2.

2017-05-16 Thread Eric Anholt
Indirect GLX uses its own context and doesn't care what glamor is using. Signed-off-by: Eric Anholt --- glamor/glamor_egl.c | 6 -- 1 file changed, 6 deletions(-) diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index 6bc9b5383f08..a82c1f790997 100644 --- a/glamor/glamor_egl.c

[PATCH xserver 04/12] glamor_egl: Drop the has_gem flag.

2017-05-16 Thread Eric Anholt
We're using GBM, so we know we've got GEM. Signed-off-by: Eric Anholt --- glamor/glamor_egl.c | 35 +++ 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index f68d153114df..bf23dc8ed16c 100644 --

[PATCH xserver 02/12] glamor_egl: Unifdef GLAMOR_HAS_GBM.

2017-05-16 Thread Eric Anholt
We only build this code with GBM, and supporting non-GBM well would be invasive. Signed-off-by: Eric Anholt --- glamor/glamor_egl.c | 34 -- 1 file changed, 34 deletions(-) diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index e5dfe657d92e..f68d153114df

[PATCH xf86-video-ati] Use plain glamor_egl_create_textured_screen().

2017-05-16 Thread Eric Anholt
Since 5064ffab631 (2014), glamor's implementation of _ext just drops the back_pixmap arg, which we were passing NULL (the default) to anyway. Signed-off-by: Eric Anholt --- src/radeon_glamor.c | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/radeon_glamor.c

Re: [PATCH xserver 5/7] meson: Make XV optional

2017-05-11 Thread Eric Anholt
Julien Cristau writes: > On Mon, May 8, 2017 at 10:13:52 -0700, Eric Anholt wrote: > >> Optional XV seems a bit silly to me. Could we just do something >> like: >> >> build_xv = build_xorg || build_dmx || build_ephyr? > > FWIW the Xorg build we're s

Re: [PATCH xserver 4/4] meson: Detect strlcat/strlcpy/reallocarray in libbsd

2017-05-09 Thread Eric Anholt
Peter Harris writes: > If we're linking with libbsd anyway, we might as well use the functions > it provides instead of compiling our replacements. > > Signed-off-by: Peter Harris This series is: Reviewed-by: Eric Anholt Let me know if you would like me to push them

Re: [PATCH xserver] xfree86: fix autoConfigDevice() regression that skipped all but the first driver match

2017-05-09 Thread Eric Anholt
Aaron Plattner writes: > On 05/09/2017 04:51 PM, Eric Anholt wrote: >> Aaron Plattner writes: >> >>> Commit 112d0d7d01b9 lost the initialization of the variable i in the loop >>> to add >>> secondary driver matches to the list of configs: >>>

Re: [PATCH xserver] xfree86: fix autoConfigDevice() regression that skipped all but the first driver match

2017-05-09 Thread Eric Anholt
. > > Reported-by: Michel Dänzer > Reported-by: Peter Hutterer > Reported-by: Eric Anholt > Cc: Adam Jackson > Fixes: 112d0d7d01b9 ("xfree86: Improved autoconfig drivers matching") > Signed-off-by: Aaron Plattner > --- > Resend: forgot to Cc the list. This is

Re: [PATCH xserver 4/7] meson: Make driprotos and libdrm optional

2017-05-09 Thread Eric Anholt
Jon Turney writes: > On 08/05/2017 21:28, Jon Turney wrote: >> On 08/05/2017 18:12, Eric Anholt wrote: >>> Jon Turney writes: >>>> +libxserver_dri3 = '' >>> >>> Pretty sure this should be = [] >> >> Yeah, me too. But wh

Re: [PATCH] Improved autoconfig drivers matching

2017-05-09 Thread Eric Anholt
Adam Jackson writes: > On Mon, 2017-05-01 at 18:03 +0900, Michel Dänzer wrote: >> On 28/04/17 04:11 AM, Adam Jackson wrote: >> > Fixed up (and rebased and made meson-aware) and merged: >> > >> > To ssh://git.freedesktop.org/git/xorg/xserver >> >    1549e3037..112d0d7d0  master -> master >> >> T

Re: [RFC PATCH xserver] xfree86: build a shared lib identical to Xorg

2017-05-09 Thread Eric Anholt
lude_directories: [inc, xorg_inc], > +link_whole: xorg_link, > +dependencies: xorg_deps, > +link_args: '-Wl,--export-dynamic', > +c_args: xorg_c_args, > +install: false, > +) > + > +xorgserver_dep = declare_dependency(link_with : xorgserver_

[PATCH xserver] meson: Use link_whole() not link_with(), for the Xorg dixmods.

2017-05-08 Thread Eric Anholt
I clearly hadn't run ninja test, since fb no longer had any of the fb symbols in it. Signed-off-by: Eric Anholt --- hw/xfree86/dixmods/meson.build | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build

Re: [PATCH xserver 7/7] meson: An empty array is not a dependency object

2017-05-08 Thread Eric Anholt
7;, required: false) > if gbm_dep.found() We've certainly got a cleanup of gbm_dep to do, but I'm fine with this for now. Meson folks agreed that this was the best workaround, though "[].found() == false" may be available in the future. Reviewed-by: Eric Anholt signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xserver 6/7] meson: Refine build_dbus

2017-05-08 Thread Eric Anholt
are turned off. I got confused by dbus/hal/systemd requirements several times. Thanks for fixing it up. Acked-by: Eric Anholt signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives

Re: [PATCH xserver 5/7] meson: Make XV optional

2017-05-08 Thread Eric Anholt
Jon Turney writes: > Signed-off-by: Jon Turney > --- > meson.build | 11 ++- > meson_options.txt | 3 +++ > 2 files changed, 13 insertions(+), 1 deletion(-) > > diff --git a/meson.build b/meson.build > index c7c9c79c3..5f30b996c 100644 > --- a/meson.build > +++ b/meson.build > @@

Re: [PATCH xserver 4/7] meson: Make driprotos and libdrm optional

2017-05-08 Thread Eric Anholt
'dri3') == 'yes' > +if build_dri3 > + if not xshmfence_dep.found() > + error('DRI3 requested, but xshmfence not found') > + endif > +endif > +endif > + > +libdrm_required = (get_opt

Re: [PATCH app/xdpyinfo] Use XRANDR 1.2 extension for reporting dimensions and resolution per output

2017-05-08 Thread Eric Anholt
Pali Rohár writes: > [ Unknown signature status ] > On Saturday 06 May 2017 13:28:17 Julien Cristau wrote: >> On Fri, May 5, 2017 at 10:08:14 +0200, Pali Rohár wrote: >> > PING. >> > >> > I would like to know if there is some problem with this and >> > something needs to be reworked or if it ca

Re: [PATCH xserver resend] xf86: dri2: Use va_gl as vdpau_driver for Intel i965 GPUs

2017-05-08 Thread Eric Anholt
Hans de Goede writes: > The modesetting driver (which now often is used with Intel GPUs), > relies on dri2_probe_driver_name() to get the dri and vdpau driver > names, before this commit it would always assign the same name to > the 2 names. But the vdpau driver for i965 GPUs should be va_gl > (i

[PATCH xserver] meson: Fix kdrive build.

2017-05-03 Thread Eric Anholt
Signed-off-by: Eric Anholt --- hw/kdrive/ephyr/meson.build | 1 - hw/kdrive/src/meson.build | 1 - 2 files changed, 2 deletions(-) diff --git a/hw/kdrive/ephyr/meson.build b/hw/kdrive/ephyr/meson.build index cf1cfd5e0c6f..615649865c1e 100644 --- a/hw/kdrive/ephyr/meson.build +++ b/hw/kdrive

Re: [PATCH xserver 2/2] Makefile.am: make 'make distcheck' verify the meson build

2017-05-03 Thread Eric Anholt
Adam Jackson writes: > Signed-off-by: Adam Jackson Cute. Reviewed-by: Eric Anholt signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.

Re: [PATCH v2 xserver] Makefile.am: add the meson files to the tarball

2017-05-03 Thread Eric Anholt
Peter Hutterer writes: > While we're shipping both build systems, we'll likely have 'make dist' > generated tarballs - those tarballs should be buildable with meson to > have more exposure. > > Signed-off-by: Peter Hutterer Reviewed-by: Eric Anholt signa

[PATCH xserver 1/2] meson: use link_with for Xorg's shared modules as well as Xorg.

2017-04-28 Thread Eric Anholt
I converted Xorg when meson 0.40 came out, but fumbled my grep and forgot that I had instances of the .extract_all_objects() workaround in dixmods, too. Signed-off-by: Eric Anholt --- hw/xfree86/dixmods/meson.build | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw

[PATCH xserver 2/2] meson: Fix glx build with DRI2 disabled.

2017-04-28 Thread Eric Anholt
A common meson pattern is to use empty arrays for optional sources and dependencies, since it generally iterates over trees of arrays looking for values. A value of '' will actually go looking for ''. Signed-off-by: Eric Anholt --- glx/meson.build | 2 +- 1 file change

Re: [PATCH xserver] Makefile.am: add the meson files to the tarball

2017-04-28 Thread Eric Anholt
; -print 2>/dev/null) > +EXTRA_DIST += meson_options.txt \ > + hw/xfree86/loader/symbol-test.c \ > + hw/xfree86/common/xf86Build.sh \ > + $(meson_files) Matching sucks because it might pick up other things, but it's the only reasonable solution

Re: [PATCH xserver 0/3] meson build for xserver

2017-04-27 Thread Eric Anholt
Adam Jackson writes: > On Tue, 2017-04-25 at 16:02 -0700, Eric Anholt wrote: > >> meson build/ -Dxephyr=true  # ./configure equivalent >> mesonconf build/ -Ddmx=yes  # Turns on a feature later. > > I also found useful: > > mesonconf build/ # display available

Re: [PATCH xserver 1/9] First round of meson fixes

2017-04-27 Thread Eric Anholt
that you can then pass it as a link_with to > another static library and have it work like you expect makes up for it. I'd say that pattern was the hardest thing to adjust to with meson, for me. One whitespace comment, two optional changes, otherwise it's all: Reviewed-by: Eric

Re: [PATCH xserver 5/9] meson: Build libwfb.so

2017-04-27 Thread Eric Anholt
Adam Jackson writes: > Signed-off-by: Adam Jackson > --- > fb/meson.build | 10 ++ > hw/xfree86/dixmods/meson.build | 12 > 2 files changed, 22 insertions(+) > > diff --git a/fb/meson.build b/fb/meson.build > index ef8e68ca2..12329073d 100644 > --- a/fb/meso

Re: [PATCH xserver 4/9] meson: Build libglx.so

2017-04-27 Thread Eric Anholt
Adam Jackson writes: > Signed-off-by: Adam Jackson > --- > glx/meson.build| 5 + > hw/xfree86/dixmods/meson.build | 15 +++ > meson.build| 2 ++ > 3 files changed, 22 insertions(+) > > diff --git a/glx/meson.build b/glx/meson.build > index a

Re: [PATCH xserver 2/3] Use #ifdef instead of #if for features to make Meson easier.

2017-04-26 Thread Eric Anholt
Aaron Plattner writes: > We try to do exactly the opposite in our internal driver build, because > it's too easy to accidentally do something like > > #ifdef GLAMOUR_HAS_GBM > > And mistakes like that don't always cause obvious build failures like > this would. So we build everything with -Wundef

Re: [PATCH xserver] os: Handle SIGABRT

2017-04-25 Thread Eric Anholt
otrapSignals case - quartz.c's QuartzInitOutput() that also tries to not trap signals. With that fixed, it will be: Reviewed-by: Eric Anholt signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.o

[PATCH xserver 3/3] Add a Meson build system alongside autotools.

2017-04-25 Thread Eric Anholt
ually replace autotools. meson is faster to generate the build, faster to run the bulid, shorter to write the build files in, and less error-prone than autotools. Signed-off-by: Eric Anholt --- Xext/meson.build | 61 + Xi/meson.build

[PATCH xserver 0/3] meson build for xserver

2017-04-25 Thread Eric Anholt
ure later. ninja -C build/ # make equivalent ninja -C build/ install # make install equivalent ninja -C build/ test# make check equivalent Eric Anholt (3): dix: Remove a redundant #define Use #ifdef instead of #if for features to make Meson easier. Add a Meson build system al

[PATCH xserver 2/3] Use #ifdef instead of #if for features to make Meson easier.

2017-04-25 Thread Eric Anholt
We mostly use #ifdef throughout the tree, and this lets the generated config.h files just be #define TOKEN instead of #define TOKEN 1. Signed-off-by: Eric Anholt --- glamor/glamor_priv.h| 4 ++-- hw/xfree86/common/xf86.h| 2 +- hw/xfree86/drivers

[PATCH xserver 1/3] dix: Remove a redundant #define

2017-04-25 Thread Eric Anholt
Found when the meson conversion set the symbol to defined, instead of defined to 1. Signed-off-by: Eric Anholt --- dix/dispatch.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dix/dispatch.c b/dix/dispatch.c index 78ac095b1fb8..a2df1e0e6dca 100644 --- a/dix/dispatch.c

[PATCH xserver] modesetting: Add the "DPI" connector type.

2017-04-25 Thread Eric Anholt
The number for it was merged to drm_mode.h in kernel 4.7, and the output_names[] array just requires that we slot in new strings in order. Signed-off-by: Eric Anholt --- hw/xfree86/drivers/modesetting/drmmode_display.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/xfree86/drivers

Re: [PATCH xserver 1/3] Rewrite the byte swapping macros.

2017-04-24 Thread Eric Anholt
Keith Packard writes: > [ Unknown signature status ] > Eric Anholt writes: > >> It doesn't find anything. > > Sounds like we can just remove the memcpy then. So, is that a reviewed-by for #1, since #3 removes the memcpy? signature.asc

<    1   2   3   4   5   6   7   8   9   10   >