[PATCH 3/3] glamor: Add a helper function for the common GL_QUADS fallback pattern.

We should do better than this with an index buffer, but for now at least make it so that we don't have to copy the same code to new places. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_copy.c | 8 +--- glamor/glamor_rects.c | 9 + glamor/glamor_spans.c | 9

Re: [PATCH] glamor: Fix build when configured --enable-glamor --disable-xshmfence

Jon TURNEY jon.tur...@dronecode.org.uk writes: On 05/02/2015 19:10, Eric Anholt wrote: Jon TURNEY jon.tur...@dronecode.org.uk writes: Signed-off-by: Jon TURNEY jon.tur...@dronecode.org.uk --- glamor/glamor_sync.c | 2 ++ 1 file changed, 2 insertions(+) [...] Reviewed and applied

Re: [PATCH v3] glamor: check max native ALU instructions

Olivier Fourdan ofour...@redhat.com writes: When using glamor (either in Xephyr or Xwayland) on hardware with too low instructions limit, glamor fallbacks to sw due to large shaders. This makes glamor unbearably slow on such hardware. Check reported value for

Re: [PATCH] glamor: Fix build when configured --enable-glamor --disable-xshmfence

Jon TURNEY jon.tur...@dronecode.org.uk writes: Signed-off-by: Jon TURNEY jon.tur...@dronecode.org.uk --- glamor/glamor_sync.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/glamor/glamor_sync.c b/glamor/glamor_sync.c index 5e158c3..fbc47d4 100644 --- a/glamor/glamor_sync.c +++

Re: [PATCH 6/7] glamor: Re-enable a8 textures for GLES2

Maarten Lankhorst maarten.lankho...@ubuntu.com writes: Hey, Op 13-01-15 om 03:48 schreef Eric Anholt: Maarten Lankhorst maarten.lankho...@ubuntu.com writes: This will probably break PVR, but fixes other implementations. GL ES 2.0.25 spec says: Formats not listed in table 4.5, including

Re: [PATCH] xwayland: Set glamor filter to nearest

...@selfnet.de Reviewed-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 4/7] glamor: Use GL_FRAMEBUFFER instead of GL_READ_FRAMEBUFFER

Maarten Lankhorst maarten.lankho...@ubuntu.com writes: The latter might not be available on GLES2. Signed-off-by: Maarten Lankhorst maarten.lankho...@ubuntu.com Reviewed-by: Eric Anholt e...@anholt.net signature.asc Description: PGP signature

Re: [PATCH 2/3] glamor: Don't use PACK/UNPACK_SKIP_ROWS/PIXELS.

Maarten Lankhorst maarten.lankho...@canonical.com writes: Hey, Op 30-12-14 om 23:54 schreef Eric Anholt: It's not available in GLES2 (though it's in GLES3). It's trivial to do the math, and avoids going through more switch statements in the GL on desktop. Signed-off-by: Eric Anholt e

Re: [PATCH 5/7] glamor: GL_TEXTURE_MAX_LEVEL is not available on GLES2

Maarten Lankhorst maarten.lankho...@ubuntu.com writes: Signed-off-by: Maarten Lankhorst maarten.lankho...@ubuntu.com I'd rather just delete the MAX_LEVEL setting, since it's unnecessary, and setting the filtering is a sufficient hint to the driver about texture mipmap allocation.

Re: [PATCH 2/7] glamor: glObjectLabel is not defined in GLES2

Maarten Lankhorst maarten.lankho...@ubuntu.com writes: Signed-off-by: Maarten Lankhorst maarten.lankho...@ubuntu.com --- glamor/glamor_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/glamor/glamor_core.c b/glamor/glamor_core.c index 737b274..4eaf8ac 100644 ---

Re: [PATCH 6/7] glamor: Re-enable a8 textures for GLES2

Maarten Lankhorst maarten.lankho...@ubuntu.com writes: This will probably break PVR, but fixes other implementations. GL ES 2.0.25 spec says: Formats not listed in table 4.5, including compressed internal formats. are not color-, depth-, or stencil-renderable, no matter which components they

Re: [PATCH 7/7] XXX glamor: Only use supported tex formats

Maarten Lankhorst maarten.lankho...@ubuntu.com writes: Some GLES2 implementations don't support GL_UNSIGNED__REV and only guarantee less fancy things to work. I'm only certain it fixes the GLES2 errors, but is this a sane way to handle things? Or am I just shutting up the errors? I

Re: [PATCH 3/7] glamor: swallow gl errors before compiling programs

Maarten Lankhorst maarten.lankho...@ubuntu.com writes: In case the glamor implementation is buggy a error might be set before compiling, which causes glamor_build_program to enter the failure path even though shader compilation succeeded. Eat all errors before running glamor_build_program.

Re: [PATCH 2/3] glamor: Don't optimize out scissor updates in CopyArea.

Keith Packard kei...@keithp.com writes: Eric Anholt e...@anholt.net writes: This possibly is a minor hit for immediate mode renderers (no difference on copypixin100 on my hsw, n=12), but it gives important information about drawing bounds to a deferred renderer (3.1x improvement

Re: [PATCH 1/3] glamor: Just set the logic op to what we want at the start of all rendering.

Keith Packard kei...@keithp.com writes: Eric Anholt e...@anholt.net writes: By dropping the unconditional logic op disable at the end of rendering, this fixes GL errors being thrown in GLES2 contexts (which don't have logic ops). On desktop, this also means a little less overhead per draw

Re: [PATCH] glamor: Don't unbind the GL_ARRAY_BUFFER in glamor_put_vbo_space().

Keith Packard kei...@keithp.com writes: Kenneth Graunke kenn...@whitecape.org writes: That's true. I should probably just resurrect your Xephyr VAO patch, and extend it for the rest of Glamor as well. Yeah, would be good as that's required for 3.0 core context support. Note that most of

Re: 1.17 status and schedule

Keith Packard kei...@keithp.com writes: Ok, it's (almost) the first working day of the year, and we're supposed to be shipping 1.17. I think we're quite close, but I want to make sure everyone is ready for the release before it happens. From my list of pending patches, we've got: glamor:

Re: [PATCH] mi: fix accidental x/y coordinate swap

Peter Hutterer peter.hutte...@who-t.net writes: Reported-by: Adam Greenblatt adam.greenbl...@gmail.com Signed-off-by: Peter Hutterer peter.hutte...@who-t.net Seems pretty obvious. Reviewed-by: Eric Anholt e...@anholt.net signature.asc Description: PGP signature

Re: [PATCH] configure.ac: remove remaining TLS references

Emil Velikov emil.l.veli...@gmail.com writes: No longer used with the removal of the GL dispatch (glapi) from libglx a few releases ago. Reviewed-by: Eric Anholt e...@anholt.net signature.asc Description: PGP signature ___ xorg-devel@lists.x.org

RE: [PATCH] glamor: add fallback if NULL EGLConfig is not supported

Zhou, Jammy jammy.z...@amd.com writes: Hi Eric, Thanks for your response. I think some binary blobs don't support EGL_MESA_configless extension. We can argue that they should add this support, but it will be good if we can also have some fallback there. You wrote the patch, so presumably

Re: [PATCH] glamor: Perform texture2D() separately from swizzle.

Matt Turner matts...@gmail.com writes: The texture2D() happens in each branch, so we may as well do it as early as possible and hide some of its latency in the branching instructions. Moving it outside the (uniform) control flow reduces the number of instructions in the fs_source shader from

Re: [PATCH] glamor: Fix up indentation

Adam Jackson a...@redhat.com writes: Signed-off-by: Adam Jackson a...@redhat.com Reviewed and applied to -next. signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel

Re: [PATCH] glamor: add fallback if NULL EGLConfig is not supported

Jammy Zhou jammy.z...@amd.com writes: Signed-off-by: Kai Guo kai@amd.com Signed-off-by: Jammy Zhou jammy.z...@amd.com What driver does this apply to? Is there a good reason for that driver not supporting EGL_MESA_configless context? It's a very nice extension, and trivial to implement.

Re: [PATCH] ephyr: Avoid a segfault with 'DISPLAY= Xephy -glamor'

Daniel Martin consume.no...@gmail.com writes: On 9 February 2015 at 15:09, Jon TURNEY jon.tur...@dronecode.org.uk wrote: On 09/02/2015 14:03, Daniel Martin wrote: On 9 February 2015 at 14:45, Jon TURNEY jon.tur...@dronecode.org.uk wrote: ephyr_glamor_connect() returns NULL if we failed,

glamor cleanups

Here are some documentation fixes and dead code removal from glamor, as well as a tiny patch from trying to figure out how some of the large pixmap code works. This can be found on the glamor-cleanups branch of my tree. ___ xorg-devel@lists.x.org:

[PULL] glamor-next

indentation Eric Anholt (3): glamor: Just set the logic op to what we want at the start of all rendering. glamor: Don't optimize out scissor updates in CopyArea. glamor: Add a helper function for the common GL_QUADS fallback pattern. Jon TURNEY (2): glamor: Fix build when

[PATCH 4/7] glamor: Move doxygen for private structs into the structs.

This should hopefully keep the comments more up to date with the structure comments. While I'm here, I've reworded a few of them to be more accurate, and dropped a bunch of stale comments. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_priv.h | 149

[PATCH 7/7] glamor: Simplify some temp pixmap extents calculations.

Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_largepixmap.c | 16 +++- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/glamor/glamor_largepixmap.c b/glamor/glamor_largepixmap.c index 391f376..4c2534d 100644 --- a/glamor/glamor_largepixmap.c +++ b/glamor

[PATCH 6/7] glamor: Drop a dead flag to glamor_create_fbo_array().

Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_fbo.c | 35 +++ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c index 5d59913..ffe8ef9 100644 --- a/glamor/glamor_fbo.c +++ b/glamor/glamor_fbo.c

[PATCH 3/7] glamor: Drop the dead PBO field in an FBO cache struct.

PBOs are only used at the whole pixmap level. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_fbo.c | 2 -- glamor/glamor_priv.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c index aedc804..5d59913 100644 --- a/glamor/glamor_fbo.c

[PATCH 5/7] glamor: Drop dead GLAMOR_FBO_DOWNLOADED flag.

Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_priv.h | 5 - glamor/glamor_utils.h | 1 - 2 files changed, 6 deletions(-) diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index 0960055..b9bd1ba 100644 --- a/glamor/glamor_priv.h +++ b/glamor/glamor_priv.h @@ -334,11

[PATCH 1/7] glamor: Propagate the fact that pbo_valid is never set.

The code to set it was deleted in keithp's big rewrite. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_pixmap.c | 18 ++ glamor/glamor_priv.h | 2 -- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c

[PATCH 2/7] glamor: Remove dead gl_tex flag in the fbo struct.

This used to be used in the old copy_area path. --- glamor/glamor_fbo.c | 6 -- glamor/glamor_priv.h | 2 -- 2 files changed, 8 deletions(-) diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c index ea0e801..aedc804 100644 --- a/glamor/glamor_fbo.c +++ b/glamor/glamor_fbo.c @@ -476,12

Re: [PULL] glamor-next

Michel Dänzer mic...@daenzer.net writes: On 26.03.2015 04:14, Eric Anholt wrote: Michel Dänzer mic...@daenzer.net writes: On 25.03.2015 05:21, Eric Anholt wrote: Keith Packard (13): [...] glamor: Eliminate GLAMOR_USE_SCREEN and GLAMOR_USE_PICTURE_SCREEN glamor: Remove _nf

Re: [PULL] glamor-next

Michel Dänzer mic...@daenzer.net writes: On 26.03.2015 04:14, Eric Anholt wrote: Michel Dänzer mic...@daenzer.net writes: On 25.03.2015 05:21, Eric Anholt wrote: Keith Packard (13): [...] glamor: Eliminate GLAMOR_USE_SCREEN and GLAMOR_USE_PICTURE_SCREEN glamor: Remove _nf

Re: [PULL] glamor-next

Markus Wick mar...@selfnet.de writes: Am 2015-03-26 03:33, schrieb Eric Anholt: The only reason _nf is useful is if you need to implement faster software fallbacks -- otherwise, you should wrap above glamor, since _nf would have been equivalent to calling down. For faster fallbacks, we

Re: [PATCH 4/7] glamor: Remove destination drawable argument from glamor_set_texture

Keith Packard kei...@keithp.com writes: This argument wasn't used at all. Signed-off-by: Keith Packard kei...@keithp.com Reviewed-by: Eric Anholt e...@anholt.net signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org

Re: [PATCH 3/7] glamor: Pass depth to glamor_pm_is_solid and glamor_set_planemask

keeps a copy of the depth of the drawable? Is it always the same? If so, Reviewed-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

Re: [PATCH 7/7] glamor: Replace CompositeGlyphs code

. With however much of it you want to take, Reviewed-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

Re: [PATCH 6/7] glamor: Adapt glamor_program API to handle render acceleration

Summary: Tiny nitpicks, one functional concern. Keith Packard kei...@keithp.com writes: This extends the existing API to support options needed for render accleratoin, including an additional fragment, 'combine', (which acceleration provides a place to perform the source IN mask operation

Re: [PATCH 1/7] render: Inline common FindGlyph case

Keith Packard kei...@keithp.com writes: Provide the common path for FindGlyph as an inline function, falling back to a function for the slow case. From the end of your current branch, reverting this commit gives me this on aa10text: x glamor-new-glyphs + revert

[PULL] glamor VC4 crash fixes

to 790311cec30ac3d35e580b9f1266236f558033d4: glamor: Don't try to disable attrib divisors without the extension. (2015-06-19 19:11:05 -0700) Eric Anholt (4): glamor: Actually allow glyphs of dimension 65 to 128 in the cache

[PATCH] modesetting: Fix a compiler warning about CARD32 vs uint32_t.

Signed-off-by: Eric Anholt e...@anholt.net --- hw/xfree86/drivers/modesetting/dri2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xfree86/drivers/modesetting/dri2.c b/hw/xfree86/drivers/modesetting/dri2.c index 63cb065..8dc12b7 100644 --- a/hw/xfree86/drivers

[PATCH 4/7] glamor: Use GL_EXT_map_buffer_range if present.

We were only looking for the desktop GL version of the extension, so GLES2 missed out. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/glamor/glamor.c b/glamor/glamor.c index 0378388..935fb74 100644 --- a/glamor

[PATCH 2/7] glamor: Drop CloseScreen-time GL resource cleanup code.

These will all be freed when the context is freed. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor.c | 5 - glamor/glamor_core.c | 11 --- glamor/glamor_gradient.c | 21 - glamor/glamor_priv.h | 3 --- glamor/glamor_render.c | 21

[PATCH 3/7] Use the normal GL_QUADS drawing helper in the render code.

We use this for all of our other performance-sensitive rendering, too. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor.c| 1 - glamor/glamor_priv.h | 7 +++ glamor/glamor_render.c | 50 -- 3 files changed, 7 insertions

[PATCH 1/7] glamor: Fix text rendering on GLES2.

The GL_QUADS helper takes a number of quads, not a number of vertices. --- glamor/glamor_composite_glyphs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glamor/glamor_composite_glyphs.c b/glamor/glamor_composite_glyphs.c index 1f0d75e..e92f1d9 100644 ---

[PATCH 6/7] glamor: Use proper Bools for some boolean values.

Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_priv.h | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index 17f8253..681895f 100644 --- a/glamor/glamor_priv.h +++ b/glamor/glamor_priv.h @@ -194,16

[PATCH 5/7] glamor: Provide a fallback path for using an index buffer to do quads.

Improves x11perf -aa10text performance by 1377.59% +/- 23.8198% (n=93) on Intel with GLES2. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor.c | 62 +++ glamor/glamor_priv.h | 11 + glamor/glamor_utils.h | 4 +--- 3

[PATCH 7/7] glamor: Avoid using GL_QUADS on VC4.

Improves text rendering from about 284k glyphs per second to 320k glyphs per second. There's no GL extension for probing this, because of the philosophy of Don't expose whether things are really in hardware or not. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor.c | 9

Re: [PATCH 2/6] modesetting: add output master support

the slave stuff really, but it seems reasonable. Acked-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

Re: [PATCH 5/6] cursor: add hw cursor support for prime

) { xf86CursorScreenPtr ScreenPriv = -- Dropping the list_is_empty checks is the only thing I feel strongly about here, everything else is take it or leave it, then: Reviewed-by: Eric Anholt e...@anholt.net signature.asc Description: PGP signature

Re: [PATCH 1/6] glamor: add support for allocating linear buffers (v1.1)

into the FBO cache. Other than that, Reviewed-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

Re: [PATCH 3/6] glamor: egl: add function to back a pixmap with a dma-buf.

screen = pixmap-drawable.pScreen, but either way: Reviewed-by: Eric Anholt e...@annholt.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 4/6] modesetting: reverse prime support

Dave Airlie airl...@gmail.com writes: This adds support for reverse prime to the modesetting driver. Reverse prime is where we have two GPUs in the display chain, but the second GPU can't scanout from the shared pixmap, so needs an extra copy to the on screen pixmap. This allows

Re: [PATCH] glamor: don't do render ops with matching source/dest (v3)

, and check it earlier. (I assume the was for this case.) v3: add same code to largepixmap paths (Keith) Reviewed-by: Eric Anholt e...@anholt.net signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http

[PATCH 4/4] glamor: Don't try to disable attrib divisors without the extension.

Fixes epoxy assertion failures on vc4. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_composite_glyphs.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/glamor/glamor_composite_glyphs.c b/glamor/glamor_composite_glyphs.c index c30cbed..1f0d75e 100644

[PATCH 1/4] glamor: Actually allow glyphs of dimension 65 to 128 in the cache.

The cache was trying to allow glyph_max_dim in, but since we were putting over 64x64 into HW memory, it would end up in the single-glyph-per-render bail_one path. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git

[PATCH 3/4] glamor: Skip actual FBO setup in our glyph atlas.

software fallback for a1 (since the glyph is also in system memory). Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_composite_glyphs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/glamor/glamor_composite_glyphs.c b/glamor/glamor_composite_glyphs.c index 47bf647

composite_glyphs on vc4

After this series, I'm at 143000 glyphs/sec, up from 2640 glyphs/sec with the old always-fallbacks path. ___ 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

[PATCH 2/4] glamor: Clean up some declarations in glyph rendering.

Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_composite_glyphs.c | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/glamor/glamor_composite_glyphs.c b/glamor/glamor_composite_glyphs.c index 39ed854..47bf647 100644 --- a/glamor/glamor_composite_glyphs.c

[PATCH 1/2] glamor: Fix bad rendering of glyphs after an a1 glyph upload.

-by: Eric Anholt e...@anholt.net --- glamor/glamor_composite_glyphs.c | 67 ++-- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/glamor/glamor_composite_glyphs.c b/glamor/glamor_composite_glyphs.c index 1f0d75e..f5a54c9 100644 --- a/glamor

[PATCH 2/2] glamor: Add an assert to catch the previous bug.

Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_transfer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/glamor/glamor_transfer.c b/glamor/glamor_transfer.c index aa5e861..155d7e0 100644 --- a/glamor/glamor_transfer.c +++ b/glamor/glamor_transfer.c @@ -186,6 +186,8

Re: [PATCH 1/7] glamor: Propagate the fact that pbo_valid is never set.

Keith Packard kei...@keithp.com writes: Eric Anholt e...@anholt.net writes: The code to set it was deleted in keithp's big rewrite. Looks like you can now remove the 'pbo' parameter to upload_sub_pixmap_to_texture as it's always 0 now? Sure, but I've got another big cleanup queued

Re: [PATCH 5/7] glamor: Provide a fallback path for using an index buffer to do quads.

Dave Airlie airl...@gmail.com writes: On 20 June 2015 at 12:09, Eric Anholt e...@anholt.net wrote: Improves x11perf -aa10text performance by 1377.59% +/- 23.8198% (n=93) on Intel with GLES2. Do we destroy glamor_priv-ib anywhere? Other than that, this seems sane, it might be nice to have

[git pull] glamor: gles2 text improvements + regression fix + cleanups

to b6a814630e48c76c8682432bf9d74b271840da9e: xserver: fix build with glamor disabled. (2015-07-02 10:07:02 -0700) Dave Airlie (1): xserver: fix build with glamor disabled. Eric Anholt (24): glamor: Fix text rendering on GLES2

Re: [git pull] glamor code cleanups

Eric Anholt e...@anholt.net writes: As I was getting ready to send out another cleanups series, I found this old one laying around, reviewed by Ken back in April. It merges cleanly with the performance series I sent yesterday, and xtests successfully, too. The following changes since

[git pull v2] glamor: gles2 text improvements + regression fix + cleanups

Airlie (1): xserver: fix build with glamor disabled. Eric Anholt (23): glamor: Fix text rendering on GLES2. glamor: Drop CloseScreen-time GL resource cleanup code. glamor: Use the normal GL_QUADS drawing helper in the render code. glamor: Use GL_EXT_map_buffer_range

[PATCH] glamor: Use GL_ARB_debug_output to log GL errors.

This should help people debugging when glamor does something stupid on their driver. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor.c | 41 + 1 file changed, 41 insertions(+) diff --git a/glamor/glamor.c b/glamor/glamor.c index 295f415

Re: [PATCH 07/16] modesetting: reverse prime support (v1.1)

modesetting to support this scenario while still supporting the USB offload one. v1.1: fix comment + ret = bits (Eric) Looks nicer, thanks! This and patch 11-15 are: Reviewed-by: Eric Anholt e...@anholt.net Patch 16 is: Acked-by: Eric Anholt e...@anholt.net (I don't think I'll get around to doing

[git pull] GLES2/VC4 text performance series

://people.freedesktop.org/~anholt/xserver glamor-next for you to fetch changes up to 0e3f1252dacdc3194a99a2d090b5c13f070f8799: glamor: Avoid using GL_QUADS on VC4. (2015-06-29 21:43:36 -0700) Eric Anholt (7): glamor: Fix text rendering

[git pull] glamor code cleanups

pixmap extents calculations. (2015-06-30 15:32:13 -0700) Eric Anholt (7): glamor: Propagate the fact that pbo_valid is never set. glamor: Remove dead gl_tex flag in the fbo struct. glamor: Drop the dead PBO field

[PATCH 7/7] glamor: Use ARRAY_SIZE in a couple more places for consistency.

Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_program.c | 6 ++ glamor/glamor_render.c | 5 + 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/glamor/glamor_program.c b/glamor/glamor_program.c index 5619216..416c54a 100644 --- a/glamor/glamor_program.c +++ b

[PATCH 4/7] glamor: Drop dead glamor_es2_pixmap_read_prepare().

It's been unused since I killed glamor_download_pixmap_to_cpu(). Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_pixmap.c | 70 -- glamor/glamor_priv.h | 6 - 2 files changed, 76 deletions(-) diff --git a/glamor/glamor_pixmap.c

[PATCH 2/7] glamor: Fix up some weird formatting in _glamor_create_fbo_array().

Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_fbo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c index cab2ff9..acb5d0d 100644 --- a/glamor/glamor_fbo.c +++ b/glamor/glamor_fbo.c @@ -424,8 +424,8

[PATCH 5/7] glamor: Make a bunch of single-file glamor functions static.

Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_largepixmap.c | 10 +++--- glamor/glamor_priv.h| 22 -- glamor/glamor_render.c | 4 ++-- 3 files changed, 9 insertions(+), 27 deletions(-) diff --git a/glamor/glamor_largepixmap.c b/glamor

[PATCH 6/7] glamor: Mark a bunch of single-file data static.

This gives the compiler a chance to optimize when the data is never changed -- for example, with pict_format_combine_tab, the compiler ends up inlining the 24 bytes of data into just 10 more bytes of code. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_core.c| 2 +- glamor

[PATCH 1/7] glamor: Drop a redundant check.

Above, we've already checked for -fbo -fbo-fb and returned. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_pixmap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c index f2bf223..0e51550 100644 --- a/glamor

[PATCH 3/7] glamor: Restore the hook to glamor_composite_rectangles().

It was apparently accidentally dropped in keithp's removal of _nf functions in 90d326fcc687e6d6d4b308f6272ededcf8145a17. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glamor/glamor.c b/glamor/glamor.c index

Re: glamor regression caused by 9c679d06 (Re: xserver: Branch 'master' - 5 commits)

Michel Dänzer mic...@daenzer.net writes: On 30.06.2015 13:02, Keith Packard wrote: commit 9c679d06055cc62aa9209318705e87dc33fba4c8 Author: Eric Anholt e...@anholt.net Date: Sun May 31 16:07:01 2015 -0700 glamor: Skip actual FBO setup in our glyph atlas. VC4 (and many

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

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

-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

: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

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

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.

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] damageext: Make DamageSubtract actually work for raw-rects mode

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] xfree86/os-support/linux: Fix make distcheck

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

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] xfree86: Bump video driver ABI version to 20

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

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

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

...@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

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

-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

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

). 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.

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

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

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.

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

glamor: Handle GL_OUT_OF_MEMORY from glTexImage

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

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