[PATCH rendercheck 2/5] Save the list of active formats in a global for use by tests.

2016-02-01 Thread Eric Anholt
I'd like to move driving of tests out of tests.c and into t_*.c, and part of that will be allowing tests to use the formats list. While I'm at it, save the name of the format in the array so it doesn't need to be recomputed. Signed-off-by: Eric Anholt <e...@anholt.net> --- rendercheck.

[PATCH rendercheck 4/5] shmblend: New test for XRenderComposite() from a pixmap in SHM.

2016-02-01 Thread Eric Anholt
There's a giant pile of code in glamor for uploading SHM pixmaps to temporary GL memory for accelerating a Composite operation, and most of its code is about how you convert formats. Add a test that runs through all the formats, to give us some coverage. Signed-off-by: Eric Anholt &l

[PATCH rendercheck 1/5] Start using stdbool.h instead of Xlib or custom bools.

2016-02-01 Thread Eric Anholt
I have a hard time typing anything else at this point. Signed-off-by: Eric Anholt <e...@anholt.net> --- main.c | 21 ++ ops.c| 2 +- rendercheck.h| 58 +++- t_blend.c

[PATCH rendercheck 3/5] Use ELF sections to make test setup easier.

2016-02-01 Thread Eric Anholt
of the remaining ones use "win" for presenting results (which we may want to just put in a global?), and the rest use the pre-created pictures, which would need some much bigger refactoring if we want to move their test logic into their test files. Signed-off-by: Eric Anholt <e...@anholt.net

[PATCH rendercheck 5/5] autogen: Set a default prefix for patches if unset.

2016-02-01 Thread Eric Anholt
Signed-off-by: Eric Anholt <e...@anholt.net> --- autogen.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/autogen.sh b/autogen.sh index 1b15e18..c262d6b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -11,3 +11,6 @@ autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? $

Re: [PATCH xserver 14/19] glamor: Drop extra conditionals for large pixmap handling.

2016-01-29 Thread Eric Anholt
Eric Anholt <e...@anholt.net> writes: > For a small pixmap, it's got a box from 0,0 to width/height, so we can > always use that. This seemed so sensible, but it turns out that for MEMORY pixmaps we'll attach an FBO to it in the glamor_picture.c code, without setting its box (wh

Re: [PATCH xserver 00/19] glamor: Cleanups all over

2016-01-29 Thread Eric Anholt
Dave Airlie <airl...@gmail.com> writes: > On 28 January 2016 at 18:21, Dave Airlie <airl...@gmail.com> wrote: >> On 28 January 2016 at 11:56, Eric Anholt <e...@anholt.net> wrote: >>> I've been working on vc4 X performance again, particularly looking at &

Re: [PATCH RESEND] xfree86: prune duplicate monitor modes.

2016-01-27 Thread Eric Anholt
Michel Dänzer writes: > From: Leo Liu > > same monitor modes added causing memory leak > when looping `xrandr --prop'. > > Signed-off-by: Leo Liu > Signed-off-by: Michel Dänzer > --- > > More than two years later...

Re: [PATCH 3/5] xephyr: Remove DRI1

2016-01-27 Thread Eric Anholt
Adam Jackson <a...@redhat.com> writes: > This only worked if the backend server supported DRI1, which is > stunningly unlikely these days. Patches 1-3 are: Reviewed-by: Eric Anholt <e...@anholt.net> I have an old branch around for doing DRI3 under Xephyr, but I'm happy to res

[PATCH xserver 08/19] glamor: Set up XV sampler uniforms once at program build time.

2016-01-27 Thread Eric Anholt
No sense doing it on every draw. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_xv.c | 20 +++- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/glamor/glamor_xv.c b/glamor/glamor_xv.c index 6e1a588..5d31fee 100644 --- a/glamor/glamor_xv.c

[PATCH xserver 15/19] glamor: Clarify some logic in RepeatFix handling.

2016-01-27 Thread Eric Anholt
wh ratios are != 1.0 only when large, so with that we can simplify down how we end up with RepeatFix being used. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_render.c | 21 +++-- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/

[PATCH xserver 03/19] glamor: Clarify when Render fallbacks happen due to an unsupported op.

2016-01-27 Thread Eric Anholt
Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_render.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index 5712cf8..51718d1 100644 --- a/glamor/glamor_render.c +++ b/glamor/glamor_render.c @@ -

[PATCH xserver 09/19] glamor: Simplify XV vertex setup.

2016-01-27 Thread Eric Anholt
place. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_xv.c | 68 -- 1 file changed, 30 insertions(+), 38 deletions(-) diff --git a/glamor/glamor_xv.c b/glamor/glamor_xv.c index 5d31fee..2593d47 100644 --- a/glamor/glamo

[PATCH xserver 02/19] glamor: Label programs before linking them.

2016-01-27 Thread Eric Anholt
i965 does most of its compiling at link time, so our debug output for its shaders didn't have the name on. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_core.c | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/glamor/glamor_co

[PATCH xserver 18/19] glamor: Cut down a bunch of conditional handling for RepeatFix.

2016-01-27 Thread Eric Anholt
-magpixwin100 (n=40). Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_render.c | 50 +++--- 1 file changed, 19 insertions(+), 31 deletions(-) diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index ed425f5..da45920

[PATCH xserver 14/19] glamor: Drop extra conditionals for large pixmap handling.

2016-01-27 Thread Eric Anholt
For a small pixmap, it's got a box from 0,0 to width/height, so we can always use that. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_utils.h | 18 -- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/glamor/glamor_utils.h b/glamor/glamor_u

[PATCH xserver 01/19] ephyr: Make sure we have GLX_ARB_create_context before calling it.

2016-01-27 Thread Eric Anholt
This should fix aborts()s from epoxy on old software stacks. Signed-off-by: Eric Anholt <e...@anholt.net> --- hw/kdrive/ephyr/ephyr_glamor_glx.c | 34 -- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/hw/kdrive/ephyr/ephyr_glamor_glx.c

[PATCH xserver 19/19] glamor: Flip around conditionals in RepeatNone fixups.

2016-01-27 Thread Eric Anholt
Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_render.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index da45920..73ac831 100644 --- a/glamor/glamor_render.c +++ b/glamor/glamor_render.c @@ -110,8

[PATCH xserver 12/19] glamor: Reuse the glamor_program_alpha_* enums for Render.

2016-01-27 Thread Eric Anholt
This is a step toward using glamor_program.c for Render acceleration. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_priv.h | 12 ++-- glamor/glamor_render.c | 28 ++-- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/

[PATCH xserver 10/19] glamor: Convert XV to using glamor_program.c.

2016-01-27 Thread Eric Anholt
One less custom path! By following the common glamor_program.c use pattern, we get the ability to handle large pixmaps as the destination. It's also one less place where glamor_utils.h coordinate transformation happens. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_

[PATCH xserver 11/19] glamor: Drop extra SHADER_IN type for no mask present.

2016-01-27 Thread Eric Anholt
We can just hand in a constant mask and the driver will optimize away the multiplication for us. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_priv.h | 1 - glamor/glamor_render.c | 17 ++--- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/

[PATCH xserver 00/19] glamor: Cleanups all over

2016-01-27 Thread Eric Anholt
after it. (I'm away from the hardware at the moment, but should test later today). Eric Anholt (19): ephyr: Make sure we have GLX_ARB_create_context before calling it. glamor: Label programs before linking them. glamor: Clarify when Render fallbacks happen due to an unsupported op. glamor

[PATCH xserver 04/19] glamor: Drop dead *_from_x_coord_y() functions.

2016-01-27 Thread Eric Anholt
They've been dead since the yInverted removal (e310387f443b6333edf02c8980daa303505382b4). Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_utils.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/glamor/glamor_utils.h b/glamor/glamor_utils.h index d4366c1..875c935

[PATCH xserver 16/19] glamor: Clean up formatting of RepeatFix shader code.

2016-01-27 Thread Eric Anholt
All sorts of weird indentation, and some cuddled conditional statements deep in the if tree. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_render.c | 57 ++ 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/

[PATCH xserver 13/19] glamor: Simplify the pixmap box looping.

2016-01-27 Thread Eric Anholt
We had a double loop across h and w, and passed the current x and y out to callers who then used w to multiply/add to an index. Instead, just single loop across w * h. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_composite_glyphs.c | 10 ++ glamor/glamor_

[PATCH xserver 07/19] glamor: Drop dead glamor_pict_format_is_compatible().

2016-01-27 Thread Eric Anholt
This hasn't been used since 2f80c7791bb0b11f261cb1e3e0d89163dcdd0342 (GLAMOR_SEPARATE_TEXTURE removal). Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_utils.h | 20 1 file changed, 20 deletions(-) diff --git a/glamor/glamor_utils.h b/glamor/glamor_u

[PATCH xserver 17/19] glamor: Clarify how the repeat values being passed around work.

2016-01-27 Thread Eric Anholt
Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_render.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index a2a7f4a..ed425f5 100644 --- a/glamor/glamor_render.c +++ b/glamor/glamor_re

[PATCH xserver 06/19] glamor: Drop comment about dead yInverted flag.

2016-01-27 Thread Eric Anholt
Wait long enough, and you don't need to think about it at all. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_transform.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/glamor/glamor_transform.c b/glamor/glamor_transform.c index ad06943..564a52d 100644 --- a/

[PATCH xserver 05/19] glamor: Rename the *y_inverted helpers to not say "inverted".

2016-01-27 Thread Eric Anholt
Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_utils.h | 30 ++ 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/glamor/glamor_utils.h b/glamor/glamor_utils.h index 875c935..3adc687 100644 --- a/glamor/glamor_utils.h +++ b/

Re: [PATCH xserver 1/2] glamor: Fix copy-like Render operations between 15 and 16 depth.

2016-01-22 Thread Eric Anholt
Keith Packard <kei...@keithp.com> writes: > Eric Anholt <e...@anholt.net> writes: > >> if (op == PictOpSrc) { >> +/* We can't do direct copies between different depths at 16bpp >> + * because r,g,b are allocated to different bits.

[PATCH xserver 1/2] glamor: Fix copy-like Render operations between 15 and 16 depth.

2016-01-21 Thread Eric Anholt
. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_render.c | 8 1 file changed, 8 insertions(+) diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index d8574ec..92b6b0c 100644 --- a/glamor/glamor_render.c +++ b/glamor/glamor_render.c @@ -512,6 +512,14 @@

[PATCH xserver 2/2] glamor: Drop the composite_with_copy path entirely.

2016-01-21 Thread Eric Anholt
I originally inherited this from the EXA code, without determining whether it was really needed. Regular composite should end up doing the same thing, since it's all just shaders anyway. To the extent that it doesn't, we should fix composite. Signed-off-by: Eric Anholt <e...@anholt.

[PATCH xserver 1/3] glamor: Drop duplicated GLAMOR_DEFAULT_PRECISIONs in render accel.

2016-01-21 Thread Eric Anholt
We only need it once at the top of the shader, so just put it there. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_render.c | 17 - 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index e

[PATCH xserver 2/3] squash: glamor: Fix rendering to a8 textures in core profile.

2016-01-21 Thread Eric Anholt
Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_priv.h | 10 +- glamor/glamor_render.c | 50 +++--- 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index 5

[PATCH xserver 0/3] Fixups for GL_RED patch.

2016-01-21 Thread Eric Anholt
Here are my fixes for the regressions in the glamor-core-profile series. The first commit would go just before the GL_RED change, then I'd squash the other two into GL_RED. The series is now in glamor-core-profile of my fdo tree. Eric Anholt (3): glamor: Drop duplicated

[PATCH xserver 3/3] squash: glamor: Fix Render blending for alpha-to-red.

2016-01-21 Thread Eric Anholt
Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_render.c | 36 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index c36b345..51718d1 100644 --- a/glamor/glamor_render.c +++ b/

Re: [PATCH v2 xserver] glamor: Disable debugging messages other than GL API errors

2016-01-19 Thread Eric Anholt
Michel Dänzer writes: > From: Michel Dänzer > > According to Nicolai Hähnle, the relevant specification says "All > messages are initially enabled unless their assigned severity is > DEBUG_SEVERITY_LOW", so we need to explicitly disable the messages

Re: [PATCH] glamor: don't do copy if we have 0 boxes to copy.

2016-01-19 Thread Eric Anholt
Dave Airlie writes: > From: Dave Airlie > > This happens if you run twm + mplayer + xclock and drag > the clock over the mplayer. If we don't catch it, we cause > an illegal draw elements command to be passed to GL. What exactly is the error? I was

Re: [PATCH 3/8] glamor: Use vertex arrays

2016-01-19 Thread Eric Anholt
ave Airlie <airl...@redhat.com> commit message should s/vertex arrays/vertex array objects/. With that changed, patches other than the GL_RED one are: Reviewed-by: Eric Anholt <e...@anholt.net> I think GL_RED's going to have rendering bugs, and I'm doing a piglit-xts run now t

Re: [PATCH 3/8] glamor: Use vertex arrays

2016-01-19 Thread Eric Anholt
driver could precompute state (like what you did in GLX here). This is way more incremental, and I like it a lot. Reviewed-by: Eric Anholt <e...@anholt.net> signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org developmen

Re: [PATCH 4/8] glamor: Use GL_RED instead of GL_ALPHA if we have texture_swizzle

2016-01-19 Thread Eric Anholt
Dave Airlie writes: > From: Keith Packard > > GL_RED is supported by core profiles while GL_ALPHA is not; use GL_RED > for one channel objects (depth 1 to 8), and then swizzle them into the > alpha channel when used as a mask. > > [airlied: updated to

Re: [PATCH 5/8] glamor: add core profile support.

2016-01-19 Thread Eric Anholt
Dave Airlie writes: > From: Dave Airlie > > This adds a new flag to glamor_init to denote the context is > core profile. > > This flag is used to disable quads for rendering. > > Signed-off-by: Dave Airlie > --- > glamor/glamor.c | 3

Re: [PATCH 6/8] ephyr: Create 3.3 core profile context if possible (v2)

2016-01-19 Thread Eric Anholt
Dave Airlie writes: > From: Keith Packard > > On desktop GL, Ask for a 3.3 core profile context if that's available, > otherwise create a generic context. > > v2: tell glamor the profile is a core one. > > Signed-off-by: Keith Packard >

Re: glamor core profile support

2016-01-19 Thread Eric Anholt
r<#secure method=pgpmime mode=sign> Marek Olšák writes: > On Tue, Jan 19, 2016 at 1:56 AM, Dave Airlie wrote: >> This series implements support for glamor in ephyr/EGL/Xwayland >> to use GL core profile when it can. >> >> This required 4 main changes: >> a)

Re: [PATCH 2/8] glamor/xv: add vbo support

2016-01-18 Thread Eric Anholt
GL_FLOAT, GL_FALSE, > + 2 * sizeof(float), vbo_offset + 8 * > sizeof(GLfloat)); > > glScissor(dstx, dsty, dstw, dsth); > glDrawArrays(GL_TRIANGLE_FAN, 0, 3); > +vbo_offset += 16 * sizeof(GLfloat); You could move the p

Re: [PATCH xserver] autogen: Set a default subject prefix for patches

2016-01-18 Thread Eric Anholt
|| exit $? > if test -z "$NOCONFIGURE"; then > exec "$srcdir"/configure "$@" > fi > + > +git config --local --get format.subjectPrefix || > +git config --local format.subjectPrefix "PATCH xserver" > -- This doesn't work unless y

Re: [PATCH xserver 1/5] glamor: Handle GL_OUT_OF_MEMORY when allocating texture images.

2015-11-19 Thread Eric Anholt
Pekka Paalanen <ppaala...@gmail.com> writes: > On Wed, 18 Nov 2015 09:57:02 -0800 > Eric Anholt <e...@anholt.net> wrote: > >> Keith Packard <kei...@keithp.com> writes: >> >> > Eric Anholt <e...@anholt.net> writes: >> > >> >&

Re: [PATCH xserver 1/5] glamor: Handle GL_OUT_OF_MEMORY when allocating texture images.

2015-11-18 Thread Eric Anholt
Keith Packard <kei...@keithp.com> writes: > Eric Anholt <e...@anholt.net> writes: > >> I think it's a safe enough assumption that we're not generating non-OOM >> errors. And, now that we're logging errors, we should get reports of >> them sooner than we used

Re: [PATCH v2] glamor: Make glamor_name_from_pixmap work without DRI3

2015-11-18 Thread Eric Anholt
Mark Kettenis writes: > This function is used by the modesetting driver to implement DRI2 and > shouldn't fail on systems that don't support DRI3. Remove the check > for DRI3 and rename glamor_egl_dri3_fd_name_from_tex to > glamor_egl_fd_name_from_tex. At the time you

Re: [PATCH xserver 10/11 v2] glamor: Delay making pixmaps shareable until we need to.

2015-11-11 Thread Eric Anholt
Michel Dänzer <mic...@daenzer.net> writes: > On 11.11.2015 06:41, Eric Anholt wrote: >> If a pixmap isn't getting exported as a dmabuf, then we don't need to >> make an EGLImage/GBM bo for it. This should reduce normal pixmap >> allocation overhead, and also lets th

Re: [PATCH xserver 1/5] glamor: Handle GL_OUT_OF_MEMORY when allocating texture images.

2015-11-11 Thread Eric Anholt
Keith Packard <kei...@keithp.com> writes: > Eric Anholt <e...@anholt.net> writes: > >> +if (glGetError() == GL_OUT_OF_MEMORY) { > > It seems like you'll need to call this in a loop in case multiple error > bits are set? > > And, don't you need to cal

[PATCH xserver 05/11 v2] glamor: Hook up EGL DestroyPixmap through the normal wrap chain.

2015-11-10 Thread Eric Anholt
). Caught by Michel. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor.c | 9 +++-- glamor/glamor.h | 2 -- glamor/glamor_egl.c | 33 +++-- glamor/glamor_egl_stubs.c | 5 - hw/xwayland/xwayland-gl

[PATCH xserver 10/11 v2] glamor: Delay making pixmaps shareable until we need to.

2015-11-10 Thread Eric Anholt
ges that started storing gbm_bos in the pixmap priv due to lifetime issues. Signed-off-by: Eric Anholt <e...@anholt.net> Reviewed-by: Michel Dänzer <michel.daen...@amd.com> --- Note that with this patch, we drop patch 11 of the series. glamor/glamor.h | 5 -- glam

glamor: Handle GL_OUT_OF_MEMORY from glTexImage

2015-11-06 Thread Eric Anholt
One of the troubles vc4 has with doing X with glamor is that we've only really got 256MB to play with. It's pretty easy to run out of that, particularly with glamor's FBO cache camping on so much memory. When we do run out, we get a GL_OUT_OF_MEMORY error from either a TexImage call or a

[PATCH xserver 5/5] glamor: Fix segfault in fallback picture uploading.

2015-11-06 Thread Eric Anholt
from the screen, just use the pFormat that came from our source picture. The only time we need to look up a PictFormat when we're doing non-shader gradients, which we put in a8r8g8b8. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_render.c | 16 +--- 1 file chan

[PATCH xserver 3/5] glamor: Fix rendering when core font texture allocation fails.

2015-11-06 Thread Eric Anholt
Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_font.c | 5 + 1 file changed, 5 insertions(+) diff --git a/glamor/glamor_font.c b/glamor/glamor_font.c index 6b3a16a..6753d50 100644 --- a/glamor/glamor_font.c +++ b/glamor/glamor_font.c @@ -127,8 +127,13 @@ glamor_fo

[PATCH xserver 4/5] glamor: Fix assert failures when fallback picture upload alloc fails.

2015-11-06 Thread Eric Anholt
If the glTexImage (or glTexSubImage) out-of-memories, error out cleanly so that we can fall back to software. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_picture.c | 37 ++--- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/

[PATCH xserver 1/5] glamor: Handle GL_OUT_OF_MEMORY when allocating texture images.

2015-11-06 Thread Eric Anholt
The spec allows general undefined behavior when GL_OOM is thrown. But if the driver happens to throw the error at this point, it probably means the pixmap was just too big, so we should delete that texture and have this pixmap fall back to software. Signed-off-by: Eric Anholt <e...@anholt.

[PATCH xserver 2/5] glamor: Fix crashes when the glyph atlas allocation fails.

2015-11-06 Thread Eric Anholt
We already have a fallback path, so we just need to jump to it when we hit the failure. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_composite_glyphs.c | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/glamor/glamor_composite_glyphs.c b/

[PATCH xserver] glamor: Remove the FBO cache.

2015-11-06 Thread Eric Anholt
It is a modest performance improvemnt (2.7% on Intel), with the significant downside that it keeps extra pixmap contents laying around for 1000 BlockHandlers without the ability for the system to purge them when under memory pressure, and tiled renderers don't know that we could avoid reading

[PATCH xserver 08/11] glamor: Simplify DRI3 pixmap-from-fd, using GBM.

2015-11-06 Thread Eric Anholt
This GBM import path was introduced in 10.2, which we already require. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_egl.c | 37 +++-- 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c

[PATCH xserver 07/11] glamor: Use real types for glamor_egl's public gbm functions.

2015-11-06 Thread Eric Anholt
I think void * was just used to avoid needing to #include gbm.h, but we can just forward-declare the structs and be fine. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor.h | 11 +++ glamor/glamor_egl.c | 7 --- 2 files changed, 11 insertions(+), 7 del

[PATCH xserver 10/11] glamor: Delay making pixmaps shareable until we need to.

2015-11-06 Thread Eric Anholt
source, this improves x11perf -copypixwin100 from about 4300/sec to 5780/sec under xcompmgr -a, because we no longer need to upload our x11perf window to a tiled temporary in order to render it to the screen. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor.c

[PATCH xserver 03/11] glamor: Remove glamor_egl_destroy_textured_pixmap().

2015-11-06 Thread Eric Anholt
The DestroyPixmap chain and CloseScreen chain all do pixmap teardown already, and calling it manually would be redundant. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor.h | 1 - glamor/glamor_egl.c | 6 -- 2 files changed, 7 deletions(-) diff --git a/glamor/glam

[PATCH xserver 06/11] glamor: Use the GBM function for getting an FD from a GBM BO.

2015-11-06 Thread Eric Anholt
We were rolling ioctl calls ourselves, when there's a nice interface for it. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_egl.c | 18 +- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index 7

[PATCH xserver 11/11] glamor: Stop holding on to the EGLImage for textures.

2015-11-06 Thread Eric Anholt
if the EGLImage object is destroyed by a call to DestroyImageKHR. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_egl.c | 37 ++--- glamor/glamor_priv.h | 5 - 2 files changed, 6 insertions(+), 36 deletions(-) diff --git a/glamor/glamor_e

[PATCH xserver 01/11] glamor: No need to glFlush before destroying a pixmap.

2015-11-06 Thread Eric Anholt
* want to throw away the rendering to it. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_egl.c | 4 1 file changed, 4 deletions(-) diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index 2e6c7bd..cc16b0a 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor

glamor: Delay making pixmaps shared until needed.

2015-11-06 Thread Eric Anholt
This is a branch I've been working on for a while for glamor, targeting 1.19. The observation is that X allocates many pixmaps, only a few of which will be shared between clients, and sharing a new pixmap between clients is infrequent. Given this, we can allocate higher-performance non-shared

[PATCH xserver 02/11] modesetting: No need to free the EGLImage just before freeing the pixmap.

2015-11-06 Thread Eric Anholt
DestroyPixmap handles that just fine. This also lets us drop our use of the manual image destruction function (Note that the ATI driver still uses it in a similar fashion, though). Signed-off-by: Eric Anholt <e...@anholt.net> --- hw/xfree86/drivers/modesetting/drmmode_display.c | 6 ---

[PATCH xserver 09/11] glamor: Make glamor_get_name_from_bo static.

2015-11-06 Thread Eric Anholt
Signed-off-by: Eric Anholt <e...@anholt.net> --- 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 fde7688..e68af18 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_egl.c @@ -369,9

[PATCH xserver 04/11] glamor: Unexport glamor_destroy_textured_pixmap().

2015-11-06 Thread Eric Anholt
This is just a bit of the DestroyPixmap chain. Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor.c | 9 ++--- glamor/glamor.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/glamor/glamor.c b/glamor/glamor.c index d4a0236..dbaee46 100644 --- a/

[PATCH xserver 05/11] glamor: Hook up EGL DestroyPixmap through the normal wrap chain.

2015-11-06 Thread Eric Anholt
One less layering violation (EGL should call glamor, if anything, not the other way around). Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor.c | 3 --- glamor/glamor.h | 2 -- glamor/glamor_egl.c

Re: [PATCH] glamor: fix crash when drawing nothing

2015-10-14 Thread Eric Anholt
Rob Clark writes: > For example, in the PolyFillRect() path w/ nrect==0, we end up in > glamor_get_vbo_space(size=0): I wonder instead if we shouldn't just have glamor_get_vbo_space() return NULL on size == 0? signature.asc Description: PGP signature

Re: [PATCH:xserver] glamor: Get rid of an extraneous ; at the end of a C source line

2015-09-30 Thread Eric Anholt
Alan Coopersmith writes: > Signed-off-by: Alan Coopersmith > --- > glamor/glamor_picture.c |2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/glamor/glamor_picture.c b/glamor/glamor_picture.c > index

Re: [PATCH] glamor: explicitly check for GL_OES_EGL_image

2015-09-17 Thread Eric Anholt
Emil Velikov writes: > Otherwise we'll fail miserably later on as we try to use > glEGLImageTargetTexture2DOES. I thought this had been implied by other extensions we check for, but I don't see it. I think this would go next to the EGL_EXT_image_dma_buf_import check

Re: [PATCH 1/4] modesetting: Implement 32-24 bpp conversion in shadow update

2015-07-29 Thread Eric Anholt
Adam Jackson a...@redhat.com writes: On Mon, 2015-07-27 at 13:29 -0700, Eric Anholt wrote: It's clearly derived from fb/fb24_32.c. But I'm not sure where things would have switched from SuSE to keithp. It does make me wonder why we don't just use fb's CopyArea to do the job, though

Re: [PATCH] glamor: Make our EGL context current before calling into GL in glamor_init

2015-07-29 Thread Eric Anholt
-by: Michel Dänzer michel.daen...@amd.com Signed-off-by: Eric Anholt e...@anholt.net Reviewed-by: Dave Airlie airl...@redhat.com Reviewed-by: Eric Anholt e...@anholt.net signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org

Re: [PATCH] Xserver.man: -retro is used when starting the server, not the stipple

2015-07-29 Thread Eric Anholt
:24:39 2015 -0700 Xserver.man: -retro is used when starting the server, not the stipple Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com Reviewed-by: Michel Dänzer michel.daen...@amd.com Signed-off-by: Eric Anholt e...@anholt.net signature.asc Description: PGP

Re: [PATCH 1/4] modesetting: Implement 32-24 bpp conversion in shadow update

2015-07-27 Thread Eric Anholt
Matt Turner matts...@gmail.com writes: On Wed, Jul 22, 2015 at 9:14 AM, Adam Jackson a...@redhat.com wrote: From: Dave Airlie airl...@redhat.com 24bpp front buffers tend to be the least well tested path for client rendering. On the qemu cirrus emulation, and on some Matrox G200 server

Re: [PATCH] xnest: Fix cursor crash at regeneration

2015-07-27 Thread Eric Anholt
Adam Jackson a...@redhat.com writes: (EE) Backtrace: (EE) 0: ./hw/xnest/Xnest (OsSigHandler+0x29) [0x468ba9] (EE) 1: /lib64/libc.so.6 (__restore_rt+0x0) [0x30d7034a4f] (EE) 2: ./hw/xnest/Xnest (xnestUnrealizeCursor+0x31) [0x419a81] (EE) 3: ./hw/xnest/Xnest

[PATCH] glamor: Don't try to free the pixmap priv if we fail to allocate FBO.

2015-07-27 Thread Eric Anholt
Fixes a regression since a2a2f6e34bd49e7ae31779274d52e800595660bc. I missed this in testing on x86, because we never fail to allocate an FBO. We do hit this path on VC4, though. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor.c | 1 - 1 file changed, 1 deletion(-) diff --git

Re: [PATCH] xfree86: Bump video driver ABI version to 20

2015-07-17 Thread Eric Anholt
implementing that need to use the updated definition. Signed-off-by: Aaron Plattner aplatt...@nvidia.com Signed-off-by: Eric Anholt e...@anholt.net signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives

Re: [PATCH] xfree86/os-support/linux: Fix make distcheck

2015-07-17 Thread Eric Anholt
header in the distribution tarball. Signed-off-by: Eric Anholt e...@anholt.net signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org

Re: [PATCH] glamor: Use glamor_prepare_access_box() for PutImage/GetImage fallback

2015-07-17 Thread Eric Anholt
Dänzer michel.daen...@amd.com Signed-off-by: Eric Anholt e...@anholt.net Reviewed-by: Dave Airlie airl...@redhat.com Reviewed-by: Eric Anholt e...@anholt.net signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org

Re: [PATCH] modesetting: Use correct datatypes for return values from glamor_name_from_pixmap and glamor_fd_from_pixmap

2015-07-17 Thread Eric Anholt
...@canonical.com Signed-off-by: Eric Anholt e...@anholt.net signature.asc 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] glamor: make current in prepare paths

2015-07-17 Thread Eric Anholt
Dave Airlie airl...@gmail.com writes: From: Dave Airlie airl...@redhat.com Lots of the accel paths only make current once they start doing someting, so a lot of them call the bail paths without make current, which means on PRIME systems for example we end up in the wrong context. Add a

Re: [PULL] xserver updates

2015-07-17 Thread Eric Anholt
-next for you to fetch changes up to 7b0f940625a0f6eee2ef91dfbfa4a206246940f5: atom: make FreeAtom static (2015-07-08 16:41:29 -0400) Merged: commit 2fcfa532532fbe4a7f668556808e6245ff4e36bc Merge: cb695b0 7b0f940 Author: Eric Anholt e...@anholt.net Date: Fri Jul 17 10:15:01 2015 -0700

Re: [PATCH] xfree86/os-support/linux: Fix make distcheck

2015-07-16 Thread Eric Anholt
Armin K kre...@email.com writes: Header was added in 1dba5a0b194653b0effb01a918bd7338b0c6bcb9 but not in Makefile.am, resulting in missing header in the distribution tarball. Reviewed-by: Eric Anholt e...@anholt.net (Will push later today) signature.asc Description: PGP signature

Re: [PATCH] modesetting: Use correct datatypes for return values from glamor_name_from_pixmap and glamor_fd_from_pixmap

2015-07-16 Thread Eric Anholt
Robert Ancell robert.anc...@canonical.com writes: glamor_name_from_pixmap and glamor_fd_from_pixmap return CARD16 and CARD32 values via pointers. The current code uses uint16_t and uint32_t which will probably be the same but it's safer to use the datatypes as specified by the function.

Re: [PATCH] damageext: Make DamageSubtract actually work for raw-rects mode

2015-07-14 Thread Eric Anholt
Adam Jackson a...@redhat.com writes: I swear this has come up before, but I have no idea why this isn't implemented. This basically makes the raw mode unusable since you can never subtract damage, your only recourse is to destroy the old damage and make a new one as the old one saturates in

Re: [PATCH] glamor: Use glamor_prepare_access_box() for PutImage/GetImage fallback

2015-07-10 Thread Eric Anholt
Michel Dänzer mic...@daenzer.net writes: From: Michel Dänzer michel.daen...@amd.com Fixes slow text display in xdvi. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91260 Signed-off-by: Michel Dänzer michel.daen...@amd.com Reviewed-by: Eric Anholt e...@anholt.net I'll grab

[git pull] glamor: always-privates and Render fixes.

2015-07-10 Thread Eric Anholt
box translation/bounds code. (2015-07-10 09:42:58 -0700) Eric Anholt (16): glamor: Reuse the glamor_is_memory helper. glamor: Drop dead glamor_is_large_picture(). glamor: Ask the server to always allocate our private

Re: [PATCH 4/4] glamor: Drop a bunch of glamor_priv == NULL checks.

2015-07-08 Thread Eric Anholt
Keith Packard kei...@keithp.com writes: Eric Anholt e...@anholt.net writes: Now that it's always non-null when the pixmap is non-null, we don't need so much of this. glamor_get_pixmap_private() itself still accepts a NULL pixmap and returns NULL, because of glamor_render.c Might want

Re: [PATCH 4/4] glamor: Drop a bunch of glamor_priv == NULL checks.

2015-07-08 Thread Eric Anholt
Michel Dänzer mic...@daenzer.net writes: On 08.07.2015 09:26, Eric Anholt wrote: diff --git a/glamor/glamor_utils.h b/glamor/glamor_utils.h index 0a7de82..a923b7a 100644 --- a/glamor/glamor_utils.h +++ b/glamor/glamor_utils.h @@ -756,8 +756,8 @@ glamor_translate_boxes(BoxPtr boxes, int

Re: [PATCH] glamor_egl: Properly free resources on init-error and exit

2015-07-08 Thread Eric Anholt
the fd dup()-ed by eglInitialize() to stay open, call eglTerminate() from the new glamor_egl_cleanup() to fix this. Signed-off-by: Hans de Goede hdego...@redhat.com Reviewed-by: Eric Anholt e...@anholt.net I'll stick it in my next pull request, unless keithp grabs it first. signature.asc

[PATCH 05/12] glamor: Move glamor_render.c pict handling to glamor_picture.c

2015-07-08 Thread Eric Anholt
These functions aren't used by anything else, and are specific to the temporary-upload-as-a-weird-format path of glamor_render.c, called through glamor_upload_picture_to_texture(). Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_picture.c | 870

[PATCH 08/12] glamor: Drop dead drm_stride field.

2015-07-08 Thread Eric Anholt
Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_priv.h | 1 - 1 file changed, 1 deletion(-) diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index 5989dc4..f3950f1 100644 --- a/glamor/glamor_priv.h +++ b/glamor/glamor_priv.h @@ -350,7 +350,6 @@ typedef struct

[PATCH 07/12] glamor: Drop tracking of the last picture attached to pixmaps.

2015-07-08 Thread Eric Anholt
Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor.c | 11 --- glamor/glamor_picture.c | 48 glamor/glamor_priv.h| 15 --- glamor/glamor_render.c | 3 --- glamor/glamor_utils.h | 10 +- glamor

[PATCH 09/12] glamor: Take transforms into account when preparing for a fallback.

2015-07-08 Thread Eric Anholt
pictures with a transform attached, but that seems unlikely to be used anyway. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_prepare.c | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/glamor/glamor_prepare.c b/glamor/glamor_prepare.c index 9bfc557

[PATCH 01/12] glamor: Don't try to do rendering with unsupported formats.

2015-07-08 Thread Eric Anholt
src -f a8r8g8b8,x2r10g10b10 Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_render.c | 38 ++ 1 file changed, 38 insertions(+) diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index 488d1a7..3048cd8 100644 --- a/glamor/glamor_render.c

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