Re: [PATCH xserver] meson: Add an option to build XSELINUX.

2018-08-09 Thread Eric Anholt
Peter Hutterer writes: > On Thu, Aug 09, 2018 at 01:02:41PM -0700, Eric Anholt wrote: >> Dependencies are ported from the automake build. >> >> v2: Make it a tristate defaulting to 'auto'. Use pkg-config for libaudit. >> >> Signed-off-by: Eri

[PATCH xserver] glamor: Add support for exporting depth 16 pixmaps.

2018-09-04 Thread Eric Anholt
support DRI3 on those pixmaps means that we can avoid having a different path for EGL pbuffers compared to pixmaps. Signed-off-by: Eric Anholt --- glamor/glamor_egl.c | 22 ++ 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c

Re: [PATCH xserver] glamor_egl: request GL2.1 when requesting Desktop GL context

2018-09-06 Thread Eric Anholt
Icenowy Zheng writes: > Some devices cannot support OpenGL 2.1, which is the minimum desktop GL > version required by glamor. However, they may support OpenGL ES 2.0, > which is the GLES version required by glamor. Usually in this situation > the desktop GL version supported is 2.0 or 1.4. > > Cu

Re: [PATCH xserver] miext/damage: take care of the coordinate mode in damagePolyPoint

2018-09-21 Thread Eric Anholt
Cedric Roux writes: > The mode (CoordModeOrigin or CoordModePrevious) was not taken into > account when computing the box. The result was a bad drawing of > points in some situations (on my hardware/software configuration, > calling XDrawString followed by XDrawPoints in the mode > CoordModePrevi

Re: [PATCH app/fonttosfnt] Mark vsprintf_alloc as printf-like function

2018-11-01 Thread Eric Anholt
Peter Hutterer writes: > Signed-off-by: Peter Hutterer > --- > Review this quickly please, we have another release coming up in 9 years > time and I don't want to miss the merge window. Reviewed-by: Eric Anholt signature.asc Descripti

Re: Migrating x.org wiki to GitLab

2018-11-14 Thread Eric Anholt
Zach writes: > Hello X.Org Developers, > > I have been working on migrating the x.org/wiki/ to GitLab pages. The > tracking issue is at > https://gitlab.freedesktop.org/freedesktop/freedesktop/issues/80 and > the current development branch is at > https://gitlab.freedesktop.org/zachr/xorg-wiki/tr

Re: Repos to archive?

2018-11-20 Thread Eric Anholt
Alan Coopersmith writes: > While iterating over all the /xorg/ repos to update their READMEs > (which I think I've now finished - let me know if you spot one I missed), > I noticed a few more to consider archiving: I agree with your reasoning for all of these. signature.asc Description: PGP si

Re: [Mesa-dev] [Intel-gfx] gitlab.fd.o financial situation and impact on services

2020-02-29 Thread Eric Anholt
On Fri, Feb 28, 2020 at 12:48 AM Dave Airlie wrote: > > On Fri, 28 Feb 2020 at 18:18, Daniel Stone wrote: > > > > On Fri, 28 Feb 2020 at 03:38, Dave Airlie wrote: > > > b) we probably need to take a large step back here. > > > > > > Look at this from a sponsor POV, why would I give X.org/fd.o >

Re: [PATCH] hw/xfree86: Make strings in DriverRec and ScrnInfoRec const

2013-11-15 Thread Eric Anholt
Keith Packard writes: > This avoids compiler warnings when initializing with string constants. > > Signed-off-by: Keith Packard I've apparently misplaced my patch that did the same thing. Reviewed-by: Eric Anholt pgpf7MVcX5gyJ.pgp Description:

Re: [PATCH] xfree86: Prefer fbdev to vesa

2013-11-15 Thread Eric Anholt
re's not and vesa will kick in anyway. Reviewed-by: Eric Anholt pgp_byZJGLpcI.pgp Description: PGP signature ___ 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: [PATCH] present: Send GLX_BufferSwapComplete events from present extension

2013-11-25 Thread Eric Anholt
practice (I expect that the swap-requesting client using this GLX extension is also the drawable-creating one), and either choice seems wrong compared to "send the event to everyone listening for the event on this drawable". That would be a separate change, anyway. Reviewed-by: Eri

Re: [PATCH] glx: Add null pointer protection to __glGetProcAddress

2013-12-10 Thread Eric Anholt
API) An ErrorF when returning NoopDDA to warn that we're papering over a bug in implementing some function would be pretty nice. Either way, Reviewed-by: Eric Anholt pgppr2J9Bj6GK.pgp Description: PGP signature ___ xorg-devel@lists.x.org: X.Org

[PATCH 2/2] glx: unifdef swrast dri_interface.h values from Mesa 7.1.

2013-12-16 Thread Eric Anholt
We can't remove all the ifdefs (__DRI_TEX_BUFFER_VERSION) because configure.ac is only checking for that version of Mesa in the absence of dri2. --- glx/glxdriswrast.c | 25 + 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/glx/glxdriswrast.c b/glx/glxdriswras

[PATCH 1/2] glx: unifdef for DRI2 dri_interface.h things in mesa 9.2.

2013-12-16 Thread Eric Anholt
Thanks to configure.ac's check, we know that we have a new enough dri_interface.h that we don't need to conditionalize all this code. --- glx/glxdri2.c | 59 --- 1 file changed, 59 deletions(-) diff --git a/glx/glxdri2.c b/glx/glxdri2.c inde

Re: [PATCH 01/10] Replace 'pointer' type with 'void *'

2013-12-29 Thread Eric Anholt
ies should be the same before and after, and would have caught a few of the code bugs present. With all of these changes, this patch is: Reviewed-by: Eric Anholt > diff --git a/Xext/hashtable.h b/Xext/hashtable.h > index 8a65732..780d5d2 100644 > --- a/Xext/hashtable.h > +++ b/Xex

[PULL] glamor import

2013-12-30 Thread Eric Anholt
CLAMP_TO_BORDER in copy_n_to_n so we can sample outside of the source Fixup glx support Christian König (1): Use GBM_LIBS and GBM_CFLAGS Dave Airlie (5): glamor: fix make distcheck part 1 glamor: add compiler.h glamor_utils: fix unlikely define use glamor:

[PULL] glx loader unifdeffing.

2013-12-30 Thread Eric Anholt
fetch changes up to 295d41fa2aa97b74c1b9ffd7ef4ccf52f3e97dde: glx: unifdef swrast dri_interface.h values from Mesa 7.1. (2013-12-30 23:10:34 -0800) Eric Anholt (2): glx: unifdef for DRI2 dri_interface.h things in mesa 9.2

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 hor

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

2014-01-09 Thread Eric Anholt
From: Adam Jackson 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 Signed-off-by: Eric A

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

2014-01-09 Thread Eric Anholt
Signed-off-by: Eric Anholt --- 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 changed, 6

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

2014-01-09 Thread Eric Anholt
Signed-off-by: Eric Anholt --- 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/gla

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

2014-01-09 Thread Eric Anholt
Signed-off-by: Eric Anholt --- 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 +6,7 @@ else

[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 --- 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 +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 --- 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 --- 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 +++ b/glamor

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

2014-01-09 Thread Eric Anholt
Signed-off-by: Eric Anholt --- 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 (998 chara

[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 --- glamor/glamor.h| 2 ++ glamor/glamor_xv.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/glamor/gla

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

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

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

2014-01-09 Thread Eric Anholt
Signed-off-by: Eric Anholt --- 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 "glamor_de

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

2014-01-09 Thread Eric Anholt
Signed-off-by: Eric Anholt --- 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 +++ b/glamor

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

2014-01-09 Thread Eric Anholt
Signed-off-by: Eric Anholt --- 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 --- a/glamor

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

2014-01-09 Thread Eric Anholt
From: Adam Jackson 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 Signed-off-by: Eric Anholt Reviewed-by: Eric Anholt --- glamor/glamor_egl.c | 4 +--- glamor/glamor_eglmodule.c | 4 +--- glamor

[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 --- Makefile.am | 6 + configure.ac

Re: [PATCH 0/4] fb support for 8bpp bitmaps

2014-01-15 Thread Eric Anholt
Michel Dänzer writes: > On Die, 2014-01-14 at 05:34 -0800, Keith Packard wrote: >> Michel Dänzer writes: >> >> > Didn't SNA prove though that sharing the same pixel storage for GPU and >> > CPU doesn't give the overall best performance even with Intel GPUs? It >> > certainly doesn't with most o

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

2014-01-16 Thread Eric Anholt
Michel Dänzer writes: > On Fre, 2014-01-10 at 09:26 +0800, Eric Anholt wrote: >> 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. > > The radeon driver can

Re: [PATCH:libXfont 1/3] Correct comment in configure.ac about scalable font support

2014-01-22 Thread Eric Anholt
Alan Coopersmith writes: > Bitstream Speedo support was removed in commit d50de26430c1a114a. > All scalable font support now goes through FreeType, which can > also handle some bitmap font formats as well. This series is: Reviewed-by: Eric Anholt pgpQ0g3_2f7QU.pgp Description: PGP

Re: [PATCH] inputproto: Allow library users to avoid having the 'Pointer' typedef declared

2014-01-22 Thread Eric Anholt
Keith Packard writes: > 'Pointer' collides with too many other application names, so stop > using it locally and allow applications to avoid having it in the API. Some googling didn't find anyone using Pointer with a 'P', so: Reviewed-by: Eric Anholt pgp

Re: [PATCH] glx: Remove left-over glthread.c

2014-01-22 Thread Eric Anholt
Jon TURNEY writes: > Commit be668096 "glx: convert to direct GL dispatch (v2)" removes glthread.c > from Makefile.am along with the rest of the dispatch table code, but doesn't > remove glthread.c itself. > > Signed-off-by: Jon TURNEY > Cc: Adam J

Re: warning-fixes review.

2014-01-23 Thread Eric Anholt
Keith Packard writes: > Eric Anholt writes: > >> Patch 1 - NAK due to changes to "DO NOT EDIT" files. > > I've removed the changes to indirect_dispatch_swap.c and indirect_program.c > > Yeah, any suggestions on how we can fix the generated files to not

[PATCH] glamor: Disable definitions of GL extension prototypes to avoid warnings.

2014-01-24 Thread Eric Anholt
We're not using the extension prototypes, since you have to dlsym them anyway. Disabling their definitions prevents them from being defined twice (once by gl.h, once by glext.h). Signed-off-by: Eric Anholt --- I was about to send the pull req for the glamor reformat and initial build work

[PULL] glamor-reformat

2014-01-27 Thread Eric Anholt
gl: Remove glapi awareness glamor: Use dix-config.h not project config.h Eric Anholt (14): glamor: Touch up some code so indent doesn't get confused. glamor: Apply x-indent.sh. glamor: Fix some mangling of shader strings by indent. glamor: Fix some indent dama

[PATCH 5/5] test: Fix compiler warning on 64-bit.

2014-01-27 Thread Eric Anholt
We all know that XIDs are 32 bits, even if 32-bit headers call them "long". --- test/hashtabletest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/hashtabletest.c b/test/hashtabletest.c index ceadfa7..a37dfb5 100644 --- a/test/hashtabletest.c +++ b/test/hashtabletest.c @

[PATCH 4/5] xfree86: Fix a compiler warning on 64-bit.

2014-01-27 Thread Eric Anholt
asm/mtrr.h makes this an unsigned long on 32, but a u64 on 64. Cast it to a long to win. --- hw/xfree86/os-support/linux/lnx_video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c index 824003d

[PATCH 1/5] glx: Stop relying on libGL ABI bugs for glGetCompressedTexImage().

2014-01-27 Thread Eric Anholt
In theory, the linux libGL ABI exposes just GL 1.2 plus GLX 1.3. But, thanks to libglapi, we're letting glGetCompressedTexImageARB() be exposed too. The GLX code was inappropriately relying on it by using GL_GLEXT_PROTOTYPES. --- glx/indirect_texture_compression.c | 8 ++-- 1 file changed, 6

[PATCH 2/5] glx: Reduce compiler warnings by not requesting GL extension prototypes.

2014-01-27 Thread Eric Anholt
They're not officially in the ABI, so you shouldn't use them anyway. --- glx/glxserver.h | 1 - 1 file changed, 1 deletion(-) diff --git a/glx/glxserver.h b/glx/glxserver.h index 7f36e5f..3f2ae35 100644 --- a/glx/glxserver.h +++ b/glx/glxserver.h @@ -46,7 +46,6 @@ #include #include -#define

[PATCH 3/5] glx: Delete dead NV program string functions.

2014-01-27 Thread Eric Anholt
These have been throwing a compiler warning about missing prototypes, since the generated code to define the prototypes stopped being generated (possibly because the code was dead). --- glx/indirect_program.c | 22 -- 1 file changed, 22 deletions(-) diff --git a/glx/indirect_p

Re: [PATCH] dri3: Don't enable the DRI3 extension unless some screen supports it

2014-02-03 Thread Eric Anholt
applications that > only check for the extension and not for appropriate per-screen > support. I don't think that's a real risk as DRI3 is only useful for > systems with deep knowledge of the hardware. Reviewed-by: Eric Anholt pgpOxA4icIVRP.pgp Description: PGP signature ___

[PATCH 6/8] xephyr: Build support for rendering with glamor using a -glamor option.

2014-02-03 Thread Eric Anholt
Signed-off-by: Eric Anholt --- configure.ac | 3 + glamor/glamor.c| 11 ++ glamor/glamor.h| 2 + hw/kdrive/ephyr/Makefile.am| 20 ++- hw/kdrive/ephyr/ephyr.c| 36 +++-- hw/kdrive/ephyr/ephyr.h

[PATCH 4/8] glamor: Fix attempting to compile shaders with no active context.

2014-02-03 Thread Eric Anholt
Signed-off-by: Eric Anholt --- glamor/glamor_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glamor/glamor_core.c b/glamor/glamor_core.c index 5246c98..5883809 100644 --- a/glamor/glamor_core.c +++ b/glamor/glamor_core.c @@ -215,6 +215,7

[PATCH 5/8] glamor: Promote the screen pixmap to a texture when it starts as MEMORY.

2014-02-03 Thread Eric Anholt
ng MEMORY state. Signed-off-by: Eric Anholt --- glamor/glamor.c | 17 + 1 file changed, 17 insertions(+) diff --git a/glamor/glamor.c b/glamor/glamor.c index 5947d7f..65fabc2 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -115,6 +115,23 @@ glamor_set_screen_pixmap(PixmapPt

[PATCH 3/8] glamor: Put in a pluggable context switcher for GLX versus EGL.

2014-02-03 Thread Eric Anholt
e was rather incestuous, along with pulling in xf86 dependencies to our dix code. The new code just initializes itself from the current state. Signed-off-by: Eric Anholt --- glamor/Makefile.am| 2 ++ glamor/glamor.c | 8 +++-- glamor/glamor.h | 7 ++-- glamor/glamor_cont

[PATCH 8/8] xephyr: Use GLX swap events to reduce repaints.

2014-02-03 Thread Eric Anholt
information we can use to avoid full screen repaints when the swap is a copy. Signed-off-by: Eric Anholt --- hw/kdrive/ephyr/ephyr.c| 1 + hw/kdrive/ephyr/ephyr_glamor_glx.c | 95 +- hw/kdrive/ephyr/ephyr_glamor_glx.h | 1 + hw/kdrive/ephyr/hostx.c

[PATCH 7/8] xephyr: Pass incoming XCB events to the Xlib event filter.

2014-02-03 Thread Eric Anholt
This is the same thing that Qt ended up doing to get DRI2's event mangling to happen despite using an XCB event loop. Signed-off-by: Eric Anholt --- hw/kdrive/ephyr/ephyr.c| 3 +++ hw/kdrive/ephyr/ephyr_glamor_glx.c | 39 ++ hw/kdrive/

[PATCH 2/8] glamor: Rename glamor_get/put_dispatch to glamor_get/put_context.

2014-02-03 Thread Eric Anholt
It used to be the thing that returned your dispatch table and happeend to set up the context, but now it just sets up the context. Signed-off-by: Eric Anholt --- glamor/glamor.c | 8 glamor/glamor_copyarea.c | 18 +- glamor/glamor_core.c | 12

xephyr-glamor series

2014-02-03 Thread Eric Anholt
Additionally, there's a rendering bug when you run some Render-using applications (cairogears -xrender TRAP shows it off very well) that I think is fallback-related but I haven't quite tracked it down yet. You can see some fallback fixes in glamor-server I wrote while trying to fix this. This code

[PATCH 02/15] glamor: Drop fixed function transformation matrix setup.

2014-02-03 Thread Eric Anholt
gl_ModelViewProjection and friends aren't used in our shaders, so this setup didn't do anything. Signed-off-by: Eric Anholt --- glamor/glamor_pixmap.c | 6 -- 1 file changed, 6 deletions(-) diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c index 9fe2b2e..41d5f5a 10

[PATCH 03/15] glamor: yInverted is a boolean value, so use the Bool type.

2014-02-03 Thread Eric Anholt
Signed-off-by: Eric Anholt --- glamor/glamor.c | 4 ++-- glamor/glamor_priv.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/glamor/glamor.c b/glamor/glamor.c index f1c71ea..ba2a1f4 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -308,10 +308,10 @@ glamor_init

[PATCH 04/15] glamor: Drop a bunch of GLES2 ifdefs.

2014-02-03 Thread Eric Anholt
Now that we're using epoxy, we can write code using both desktop and ES symbols and decide what to use at runtime. Signed-off-by: Eric Anholt --- glamor/glamor.c | 40 +++- glamor/glamor_copyarea.c | 15 ++- glamor/glamor_f

[PATCH 14/15] glamor: Move the EGL DRI3 code to GLAMOR_HAS_GBM.

2014-02-03 Thread Eric Anholt
There's nothing dependent on the presence of DRI3 code in the server for this, but it does rely on GBM. Signed-off-by: Eric Anholt --- glamor/glamor_egl.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index 81

[PATCH 01/15] glamor: Drop useless glEnable/glDisable(GL_TEXTURE_2D) calls.

2014-02-03 Thread Eric Anholt
Those calls are only for enabling texture handling in the fixed function pipeline, while everything we do is with shaders. Signed-off-by: Eric Anholt --- glamor/glamor_copyarea.c | 4 glamor/glamor_pixmap.c| 6 -- glamor/glamor_putimage.c | 2 -- glamor/glamor_render.c| 9

[PATCH 07/15] glamor: Unifdef the cache format indices.

2014-02-03 Thread Eric Anholt
We only ask for GL_RGB on desktop GL as far as I can see, but now if GLES2 did happen to ask for GL_RGB it would return a cache index instead of -1. Signed-off-by: Eric Anholt --- glamor/glamor_priv.h | 4 glamor/glamor_utils.h | 18 ++ 2 files changed, 2 insertions

[PATCH 15/15] xephyr: Allow initializing glamor with gles2 (on GLX).

2014-02-03 Thread Eric Anholt
This should be useful for glamor development, so you can test both paths (which are significantly different, and apparently glamor_gradient.c was broken on GLES2 as of the import). Signed-off-by: Eric Anholt --- hw/kdrive/ephyr/ephyr_glamor_glx.c | 24 +++- hw/kdrive/ephyr

[PATCH 09/15] glamor: Unifdef the picture-format-to-format-and-type functions.

2014-02-03 Thread Eric Anholt
There's no way these should be in a header file, but I'll leave that cleanup until later. Signed-off-by: Eric Anholt --- glamor/glamor_pixmap.c | 50 +- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/glamor/glamor_

[PATCH 10/15] glamor: Move shader precision stuff from build time to shader compile time.

2014-02-03 Thread Eric Anholt
This is the last desktop-versus-ES2 build ifdef in core glamor. Signed-off-by: Eric Anholt --- glamor/glamor_priv.h | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index 81b46b6..e28a021 100644 --- a/glamor/glamor_priv.h

[PATCH 11/15] glamor: Fix typo in setting v_position's attrib location.

2014-02-03 Thread Eric Anholt
Assuming it was the first attribute assigned by the GL, it would have ended up with location 0 anyway. Signed-off-by: Eric Anholt --- glamor/glamor_gradient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glamor/glamor_gradient.c b/glamor/glamor_gradient.c index 4ea441e

[PATCH 08/15] glamor: Move glamor_get_tex_format_type_from_pictformat to a .c file.

2014-02-03 Thread Eric Anholt
A pair of 150 lines of inlined switch statements in a header file is crazy. Signed-off-by: Eric Anholt --- glamor/glamor_pixmap.c | 303 + glamor/glamor_utils.h | 303 - 2 files changed, 303

[PATCH 12/15] glamor: Don't bother keeping references to shader stages for gradients.

2014-02-03 Thread Eric Anholt
They never get reattached to any other program, so saving them to unreference later is a waste of code. Signed-off-by: Eric Anholt --- glamor/glamor_gradient.c | 88 glamor/glamor_priv.h | 9 - 2 files changed, 6 insertions(+), 91

[PATCH 05/15] glamor: Add a screen argument to drop an ifdef from glamor_set_alu().

2014-02-03 Thread Eric Anholt
Signed-off-by: Eric Anholt --- glamor/glamor_copyarea.c | 7 --- glamor/glamor_fill.c | 4 ++-- glamor/glamor_pixmap.c | 17 +++-- glamor/glamor_priv.h | 2 +- glamor/glamor_tile.c | 4 ++-- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/glamor

[PATCH 06/15] glamor: Pass pixmaps around to unifdef glamor_iformat_for_depth().

2014-02-03 Thread Eric Anholt
Signed-off-by: Eric Anholt --- glamor/glamor.c | 6 +++--- glamor/glamor_picture.c | 3 +-- glamor/glamor_pixmap.c | 4 ++-- glamor/glamor_utils.h | 26 -- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/glamor/glamor.c b/glamor/glamor.c

[PATCH 13/15] glamor: Fix linking of the gradient shaders on GLES2.

2014-02-03 Thread Eric Anholt
GLES2 sensibly doesn't allow you to attach multiple shaders for the same stage to a single program. This means we have to attach the whole thing in one glShaderSource call. Signed-off-by: Eric Anholt --- glamor/glamor_gradient.c | 68 +++- 1

Re: [PATCH 5/5] test: Fix compiler warning on 64-bit.

2014-02-03 Thread Eric Anholt
Mark Kettenis writes: >> From: Eric Anholt >> Date: Mon, 27 Jan 2014 11:36:09 -0800 >> >> We all know that XIDs are 32 bits, even if 32-bit headers call them >> "long". >> --- >> test/hashtabletest.c | 2 +- >> 1 file chang

Re: [PATCH] Stop defining GL_GLEXT_PROTOTYPES

2014-02-04 Thread Eric Anholt
Keith Packard writes: > It looks like GL_GLEXT_PROTOTYPES is just a trap for the unwary, > causing glext.h to define a pile of functions which are also defined > in gl.h. > > However, there is *one* function used in the server which is not > defined in gl.h and is only defined in glext.h when > G

Re: [PATCH] ephyr: Repaint entire screen when colormap is updated

2014-02-06 Thread Eric Anholt
en->width; > +box.y2 = pScreen->height; > +RegionReset(DamageRegion(scrpriv->pDamage), &box); > +} > } I expected DamageReportDamage() to be used instead, but this is safe because we're using DamageReportNone (and leaving the blockhandler to do

Re: [PATCH] ephyr: Repaint entire screen when colormap is updated

2014-02-06 Thread Eric Anholt
Keith Packard writes: > Eric Anholt writes: > >> I expected DamageReportDamage() to be used instead, but this is safe >> because we're using DamageReportNone (and leaving the blockhandler to do >> our paint). > > I didn't want other root damage trackers

Re: [PATCH 3/8] glamor: Put in a pluggable context switcher for GLX versus EGL.

2014-02-06 Thread Eric Anholt
Keith Packard writes: > Eric Anholt writes: > > >> +struct glamor_context { >> +/** Either an EGLDisplay or an Xlib Display */ >> +void *display; >> + >> +/** Either a GLXContext or an EGLContext. */ >> +void *ctx; >> +

Re: [PATCH] ephyr: Repaint entire screen when colormap is updated

2014-02-07 Thread Eric Anholt
Keith Packard writes: > Any time the colormap is changed, the entire screen needs to be > repainted to match. Revviewed-by: Eric Anholt pgp4JvCVe4emQ.pgp Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives

Re: [PATCH 04/15] glamor: Drop a bunch of GLES2 ifdefs.

2014-02-07 Thread Eric Anholt
Michel Dänzer writes: > On Mon, 2014-02-03 at 11:03 -0800, Eric Anholt wrote: >> Now that we're using epoxy, we can write code using both desktop and >> ES symbols and decide what to use at runtime. > > Nice. > > >> diff --git a/glamor/glamor_copyarea

Re: [PATCH] glx: Ignore unused function warnings

2014-02-08 Thread Eric Anholt
Keith Packard writes: > indirect_dispatch_swap.c, which is autogenerated from a mesa script, > contains the function 'bswap_CARD64', which is never used in the > file. While it would be nice to fix this upstream, that's "hard", so > this change causes these warnings to be ignored for just this >

Re: [PATCH 09/15] glamor: Unifdef the picture-format-to-format-and-type functions.

2014-02-14 Thread Eric Anholt
Keith Packard writes: > Eric Anholt writes: > >> There's no way these should be in a header file, but I'll leave that >> cleanup until later. > > I don't understand this comment; did you flip the order of 08/15 and > 09/15 at some point and not rewrite

[PULL] reviewed glamor changes

2014-02-14 Thread Eric Anholt
for you to fetch changes up to 3d71df48e70884deccb293cf1fcffbdba8efd94b: glamor: Move the EGL DRI3 code to GLAMOR_HAS_GBM. (2014-02-14 18:30:01 -0800) -------- Eric Anholt (17): glamor: Convert to using libepoxy. glamor:

Re: [PATCH] exa: Fix a warning when enabling DEBUG_TRACE_FALL

2014-02-19 Thread Eric Anholt
Thierry Reding writes: > From: Thierry Reding > > The format string wants a picture and a character, but the argument list > contains only a character, causing GCC to complain. Add the missing > argument. > > Signed-off-by: Thierry Reding Reviewed-by: Eric Anholt

[PATCH 2/6] xephyr: Pass incoming XCB events to the Xlib event filter.

2014-02-24 Thread Eric Anholt
This is the same thing that Qt ended up doing to get DRI2's event mangling to happen despite using an XCB event loop. Signed-off-by: Eric Anholt Reviewed-by: Keith Packard --- hw/kdrive/ephyr/ephyr.c| 3 +++ hw/kdrive/ephyr/ephyr_glamor_glx.c

glamor: Enabling xephyr and Xorg.

2014-02-24 Thread Eric Anholt
Here's a short series to make the server glamor stuff actually testable. I'm now running glamor for my normal desktop, and the xephyr bits work too. I pulled out changes that would have required more from the intel 2d driver: now it's just a matter of not linking to the external module's libglamo

[PATCH 3/6] xorg: Build a glamor_egl module.

2014-02-24 Thread Eric Anholt
: Eric Anholt --- configure.ac | 11 +++ glamor/glamor_eglmodule.c | 3 ++- hw/xfree86/Makefile.am| 7 ++- hw/xfree86/glamor_egl/Makefile.am | 39 +++ include/dix-config.h.in | 3 +++ 5 files changed

[PATCH 1/6] xephyr: Build support for rendering with glamor using a -glamor option.

2014-02-24 Thread Eric Anholt
v2: Avoid making the Ximage for the screen that we'll never use, and drive the screen pixmap creation for glamor ourselves. Signed-off-by: Eric Anholt Reviewed-by: Keith Packard (v1) --- configure.ac | 3 + glamor/glamor.c| 11 ++ g

[PATCH 6/6] glamor: Add support for DRI3.

2014-02-24 Thread Eric Anholt
usion from discussion with keithp was that if the driver's dri3_open for a provider on a different screen, that's a core dri3 bug. Signed-off-by: Eric Anholt --- glamor/glamor.h | 4 +- glamor/glamor_egl.c | 78 +++

[PATCH 5/6] glamor: Rename the DRI-related pixmap functions.

2014-02-24 Thread Eric Anholt
There was confusion over whether they should have egl in the name, and they had DRI3 in the name even though they're useful to have without DRI3. Signed-off-by: Eric Anholt --- glamor/glamor.c | 10 +- glamor/glamor.h

[PATCH 4/6] xorg: Connect up the glamor XV code, xorg DDX-only for now.

2014-02-24 Thread Eric Anholt
try to fix the xv ABI later). Signed-off-by: Eric Anholt --- glamor/Makefile.am| 1 - glamor/glamor.h | 5 - glamor/glamor_eglmodule.c | 2 +- glamor/glamor_xv.c| 17 ++--- hw/xfree86/glamor_egl/Makefile.am | 1 + 5 fil

Re: [PATCH 6/6] glamor: Add support for DRI3.

2014-02-25 Thread Eric Anholt
davya...@free.fr writes: > Hi, > > While for XWayland we want to provide our own dri3_open, we still want to > have glamor > enabling the dri3 support > > That is rather a GLAMOR_NO_DRI3_SETUP flag > > and > > +if (glamor_egl->dri3_capable && !(glamor_priv->flags & GLAMOR_NO_DRI3)) { > +

[PATCH 6/6] glamor: Add support for DRI3.

2014-02-25 Thread Eric Anholt
usion from discussion with keithp was that if the driver's dri3_open for a provider on a different screen, that's a core dri3 bug. v3: Don't put quite so much under GLAMOR_NO_DRI3, and add a comment explaining what this is about. Signed-off-by: Eric Anholt --- glamor/glamor

[PATCH 4/6] xorg: Connect up the glamor XV code, xorg DDX-only for now.

2014-02-25 Thread Eric Anholt
try to fix the xv ABI later). v3: Fix last minute breakage of having reintroduced xf86ScrnToScreen (one of the compat macros). Just use the drawable's pScreen instead. Signed-off-by: Eric Anholt --- glamor/Makefile.am| 1 - glamor/glamor.h |

[PATCH 5/6 v2] glamor: Rename the DRI-related pixmap functions.

2014-02-26 Thread Eric Anholt
ned-off-by: Eric Anholt --- glamor/glamor.c | 10 +- glamor/glamor.h | 53 + glamor/glamor_egl.c | 12 ++-- 3 files changed, 40 insertions(+), 35 deletions(-) diff --git a/glamor/glamor.c b/glamor/glamor.c index 85fd56

Re: [PATCH 1/2] xf86Config: Fix warning: declaration of 'Pointer' shadows a global

2014-03-04 Thread Eric Anholt
s de Goede Looks like keithp just hasn't pusehd the reviewed change for inputproto yet. I'd rather see that land. Patch 2/2 is: Reviewed-by: Eric Anholt (I had similar, but it got nitpicked and I just don't care what type gets used). pgpZYCmRHVfI_.pgp Description: PGP signature

[PULL] glamor xephyr and xorg changes

2014-03-05 Thread Eric Anholt
changes up to da08316605b26830b4d8f8fb2d9e69471cdc80ab: glamor: Add support for DRI3. (2014-03-05 13:10:24 -0800) Eric Anholt (6): xephyr: Build support for rendering with glamor using a -glamor option. xephyr: Pass

[PATCH 3/6] glamor: Add a note about the state of GL_ARB_map_buffer_range.

2014-03-06 Thread Eric Anholt
GLES2 Xephyr is failing due to lack of glMapBuffer() with the read bits set, and I decided to see if we can just switch everything to glMapBufferRange(). I'm undecided, and it largely depends on whether we find people are interested in using glamor for the windows X server. Signed-off-by:

[PATCH 5/6] glamor: Fix a mismatched glamor_get/put_context().

2014-03-06 Thread Eric Anholt
We don't call GL in this function any more, so we can just drop the get. Signed-off-by: Eric Anholt --- glamor/glamor_gradient.c | 5 - 1 file changed, 5 deletions(-) diff --git a/glamor/glamor_gradient.c b/glamor/glamor_gradient.c index 9f6f1b1..6a7b528 100644 --- a/g

[PATCH 4/6] dix: Remove incorrect comment about privates.

2014-03-06 Thread Eric Anholt
PRIVATE_ALL was apparently dropped before this comment was added in commit 495fc3eb2d6c98bde82ae1278f89fcf131fd9bf8. Signed-off-by: Eric Anholt --- dix/privates.c | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dix/privates.c b/dix/privates.c index e03b225..dd26c6f

[PATCH 2/6] glamor: Fix a spelling mistake in GLAMOR_PIXMAP_FBO_NOT_EXACT_SIZE.

2014-03-06 Thread Eric Anholt
Signed-off-by: Eric Anholt --- glamor/glamor_pixmap.c | 2 +- glamor/glamor_render.c | 2 +- glamor/glamor_utils.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c index f1440f3..119e4d9 100644 --- a/glamor/glamor_pixmap.c

[PATCH 6/6] xephyr: Don't forget to glViewport() before drawing the screen.

2014-03-06 Thread Eric Anholt
Fixes misrendering with cairogears. I had noticed the failure while trying to figure out what was going on with traps. Cairogears was apparently putting its results on the screen through putimage, which is a texture upload, so the last GL drawing was done to the size of the cairogears window, not

little glamor cleanups (and a dix cleanup)

2014-03-06 Thread Eric Anholt
Here are some trivial patches from the glamor-server branch for review. I'm planning to send out the VBO changes next, which get us closer to making glamor not actually suck for performance. These are on the glamor-cleanups branch of my tree, branched from glamor-pull-request. __

<    3   4   5   6   7   8   9   10   11   >