summaryrefslogtreecommitdiff
path: root/uxa
AgeCommit message (Collapse)Author
2010-03-16Fill alpha on xrgb images.Chris Wilson
Do not try to fixup the alpha in the ff/shaders as this has the side-effect of overriding the alpha value of the border color, causing images to be padded with black rather than transparent. This can generate large and obnoxious visual artefacts. Fixes: Bug 17933 - x8r8g8b8 doesn't sample alpha=0 outside surface bounds http://bugs.freedesktop.org/show_bug.cgi?id=17933 and many related cairo test suite failures. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-03-04uxa: Fix type mismatch to avoid compiler warning.Carl Worth
The code was using uint32_t where an XID (currently an unsigned long) was specified in the prototype. Use XID to avoid both the warning and any potential problem.
2010-02-20uxa: Skip adjusting mask coordinates when no mask is present.Eric Anholt
Quiets clang warnings about garbage variable usage.
2010-02-20Remove dead assignments noticed by clang.Eric Anholt
2010-01-27uxa: Fix compatible_formats() for OVERChris Wilson
In separating the boolean logic out into a separate function, dc6522dd, I reversed the sense of one particular test: src->format == dst->format The OVER optimisation is only valid if the src and dst formats match, but not always. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-01-25Extract pixel value for all formats to avoid hitting fallbacks.Chris Wilson
On failing to extract the pixel value for an alpha-only solid we actually triggered a fallback. Since this path is commonly hitting whilst fading in images, for example cairo_paint_with_alpha(), the fallback was detected during the Moblin boot sequence where it was adding a second to the overall boot time. See fallback intel: Moblin startup is hitting a composite fallback, costing a ton of performance https://bugs.freedesktop.org/show_bug.cgi?id=26189 Based on the initial patch by Arjan van de Van. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-01-25uxa: Adjust uxa_get_color_for_pixmap to match prototypeChris Wilson
The prototype says this function returns a Bool and not just an int, so be pedantic and return TRUE/FALSE. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-01-24uxa: Protect against a potential NULL src->Drawable referenceChris Wilson
One of the convoluted if branches dereferenced Drawable when it is potentially NULL. Avoid this by explicitly handling the NULL Drawable cases earlier, and enabling solid fills for solid sources. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-01-24uxa/uxa-render: Always remove useless repeats during composite.Chris Wilson
I added a jump if there was no src or mask Drawable, but we do actually need to check for useless src repeats even if we have a source-only mask. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-01-24uxa: Increase amount of composite fallback verbageChris Wilson
The fallback log for http://bugs.freedesktop.org/show_bug.cgi?id=26189 does not actually state the reason why we actually fallback. This is possibly because we need to fallback for reasons other than the operation cannot be performed in hardware -- such as using an alpha map or the screen is swapped out, so add this information to the fallback log. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-01-08uxa-glyphs: Enable TILING_X on glyph caches.Chris Wilson
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-12-10Revert "uxa-glyphs: Enable TILING_X on glyph caches."Chris Wilson
This reverts commit 3f11bbec420080151406c203af292e55177e77d1. For unknown reasons, enabling tiling for the glyph cache is causing glyph corruption both across suspend and resume and VT switching, on a wide range of chipsets (reports include both i8xx and gm45) This strongly suggests that we are handling tiling, or updates to tiled buffers, incorrectly across i915_gem_idle(). However, until we can find the root cause, we want to fix this regression before the next stable release, so simply revert this patch. :( Fixes: [Bug 25406] fonts garbled after resuming from suspend since 6729b508 http://bugs.freedesktop.org/show_bug.cgi?id=25406 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-12-07uxa: Cache solid fills.Chris Wilson
Maintain a small cache of pixmaps to hold SolidFill pictures. Currently we create a pixmap the size of the damaged region and fill that using pixman before downloading it to the GPU and compositing. Needless to say this is extremely expensive compared to simply emitting the solid colour. To mitigate this cost, we maintain a small cache of 1x1R pictures which is recognised by the driver as being a solid, but at the very least is maintained as a GPU ready pixmap. This gives a good boost to cairo-xcb (which uses solid fills) on a gm45: Before: gnome-terminal-vim: 41.9s After: gnome-terminal-vim: 31.7s Compare with using a cache of 1x1R pixmaps in cairo-xcb: gnome-terminal-vim: 31.6s Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-12-02uxa_check_composite: Minor whitespace.Chris Wilson
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-12-02uxa: Review uxa_prepare_access() to remove potential nestingChris Wilson
Around a call to uxa_put_image() it is possible to mix both accelerated and fallback paths, with the fallback code making the presumed optimisation of only trying to call uxa_prepare_access() once. This fails if the accelerated path also uses prepare/finish access on the same drawable and then later fallback to the fallback path. This can happen currently if an error is reported whilst attempting to accelerate PutImage. #0 memcpy () at ../sysdeps/x86_64/memcpy.S:162 #1 0x00007ffff43ce4bd in fbBlt (srcLine=<value optimized out>, srcStride=40, srcX=<value optimized out>, dstLine=0xffffffffffffffff, dstStride=64, dstX=0, width=<value optimized out>, height=8, alu=3, pm=4294967295, bpp=8, reverse=0, upsidedown=0) at fbblt.c:93 #2 0x00007ffff43ce740 in fbBltStip (src=0xffffffffffffffff, srcStride=156555204, srcX=34, dst=0xfffffffc, dstStride=64, dstX=40, width=304, height=8, alu=3, pm=4294967295, bpp=8) at fbblt.c:944 #3 0x00007ffff4c32c53 in uxa_do_put_image (pDrawable=0x246aa410, pGC=0x2c0a4f0, depth=8, x=0, y=0, w=38, h=8, leftPad=0, format=2, bits=0x954d7c4 "") at uxa-accel.c:196 #4 uxa_do_shm_put_image (pDrawable=0x246aa410, pGC=0x2c0a4f0, depth=8, x=0, y=0, w=38, h=8, leftPad=0, format=2, bits=0x954d7c4 "") at uxa-accel.c:223 #5 uxa_put_image (pDrawable=0x246aa410, pGC=0x2c0a4f0, depth=8, x=0, y=0, w=38, h=8, leftPad=0, format=2, bits=0x954d7c4 "") at uxa-accel.c:289 #6 0x00000000004d574f in damagePutImage (pDrawable=0x246aa410, pGC=0x2c0a4f0, depth=8, x=0, y=0, w=38, h=8, leftPad=0, format=2, pImage=0x954d7c4 "") at damage.c:905 #7 0x00000000004287db in ProcPutImage (client=0x47ca72d0) at dispatch.c:2073 #8 0x000000000042bd94 in Dispatch () at dispatch.c:445 #9 0x000000000042513a in main (argc=4, argv=0x7fffffffe2a8, envp=<value optimized out>) at main.c:285 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-11-30uxa-glyphs: Enable TILING_X on glyph caches.Chris Wilson
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-11-29uxa-glyphs: Stream uploads via temporary boChris Wilson
Avoid mapping the glyph cache back to the cpu by allocating temporary buffer objects to store the glyph pixmap and blit to the cache. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-11-13i915: Derive the correct target color from the pixmap by checking its formatChris Wilson
Particularly noting to route alpha to the green channel when blending with a8 destinations. Fixes: rendercheck/repeat/triangles regressed http://bugs.freedesktop.org/show_bug.cgi?id=25047 introduced with commit 14109a. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-11-13uxa: Do not remove repeat from solids for 1x1 composites.Chris Wilson
Or else we hit the buggy 1x1 source path and trigger: rendercheck/mcoords regressed http://bugs.freedesktop.org/show_bug.cgi?id=25046 caused by the recent commit e581ceb.
2009-11-10uxa: Force alpha bits to fill remaining bitsChris Wilson
In the case of x8r8g8b8 and similar where the alpha channel is ignored, but should be interpreted as being 1, then it is convenient if those bits are set appropriately in the colour. In order to do so for these formats, where PIXMAN_FORMAT_A() returns 0 we need to compute the alpha channel width as the remaining bits instead. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-11-05configure: use CWARNFLAGS from xorg-macros.m4Rémi Cardona
Signed-off-by: Rémi Cardona <remi@gentoo.org> Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-10-26Fix crash in uxa_acquire_pattern when pDst is NULLAlbert Damen
This avoids a crash when an XRenderComposite call is made with a -1 value for width/height, (which apparently compiz's gtk-window- decorator likes to do). Fixes bug: X crashes in uxa_acquire_pattern when logging in (gdm) http://bugs.freedesktop.org/show_bug.cgi?id=24724 Signed-off-by: Albert Damen <albrt@gmx.net> Reviewed-by: Carl Worth <cworth@cworth.org>
2009-10-12uxa: Refactor create Picture for pixman formatChris Wilson
Pull the common methods for creating a Picture given a pixman format into its own method, and tidy the surrounding code. The benefit is that we can now composite directly to the Picture and so save an intermediate copy when creating patterns for gradients. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-10-12uxa: Free the ScratchPixmapHeader after its associated PictureChris Wilson
Fixes: http://bugs.freedesktop.org/show_bug.cgi?id=24459 Intel Driver > 2.8: Cairo rendering bug, triggered in QtCurve GTK engine Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-10-06Move to kernel coding style.Eric Anholt
We've talked about doing this since the start of the project, putting it off until "some convenient time". Just after removing a third of the driver seems like a convenient time, when backporting's probably not happening much anyway.
2009-09-22Check the correct Picture for error during creation.Chris Wilson
2009-09-20Avoid fallbacks for a1 src/maskChris Wilson
Carl Worth did the hard work in identifying that the regression in cairo between X.org 1.6 and 1.7 was caused by cairo sending an a1 mask to the server in 1.7 whereas in 1.6 cairo used local fallbacks (as the source was using RepeatPad, which triggers cairo's 'buggy_pad_reflect' fallback for X.org 1.6). This was causing the driver to do a fallback to handle the a1 mask instead, which due to the GPU pipeline stall is much more expensive than the equivalent fallback in cairo. Reference: cairo's performance downgrades 4X with server master than server-1.6. https://bugs.freedesktop.org/show_bug.cgi?id=23184 The fix is a relatively simple extension of the current uxa_picture_from_pixman_image() to use CompositePicture() instead of CopyArea() when we need to convert to a new format. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-09-14Avoid fallbacks for compositing gradient patternsChris Wilson
Currently when asked to composite using a gradient source or mask, we fallback to using fbComposite(). This has the side-effect of causing a readback on the destination surface, stalling the GPU pipeline. Instead, like uxa_trapezoids(), we can use pixman to fill a scratch pixmap and then copy that to an offscreen pixmap for use with uxa_composite(). Speedups on i915: firefox-talos-svg: 710378.14 -> 549262.96: 1.29x speedup No slowdowns. Thanks to Søeren Sandmann Pedersen for spotting the missing ValidatePicture(). Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-08-25Fix SHM functions to work with server after 1.6.0Keith Packard
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-22uxa: Tell the driver when we're just going to immediately map the pixmap.Eric Anholt
This lets the driver allocate a nice idle buffer object instead of a busy one, reducing runtime of firefox-20090601 on my G45 from 50.7 (+/- .41%) to 48.4 (+/- 1.1%).
2009-07-22uxa: Skip fill of temporary alpha picture that just gets copied over.Eric Anholt
This was needed when we were doing the mask computations in this pixmap, but now they're done in a temporary and then uploaded later. This reduces runtime of firefox-20090601 from 52.6 (+/- .96%) to 50.7 (+/- .41%) seconds on my G45.
2009-07-18Update to xextproto 7.1 support.Peter Hutterer
DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers need to include dpmsconst.h if xextproto 7.1 is available. SHM is now shm.h instead of shmstr. Requires definition of ShmFuncs that's not exported by the server. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-07-17accessing a pixmap if prepare_access fails is verboten.Owain Ainsworth
Don't do it, treat this the same as every other prepare access call in uxa. Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Owain Ainsworth <zerooa@googlemail.com>
2009-06-30uxa: Fix segfault on source-only picture usage with FallbackDebug.Eric Anholt
Bug #22107.
2009-06-09UXA: Rasterize trapezoids to system memory, not a pixmapCarl Worth
Since we're only doing software rasterization right now, anyway, it makes more sense to just rasterize to system memory and then upload to a pixmap once complete. This avoids expensive read-modify-write cycles. This results in a 2.4x speedup for a real-world test case that's heavy on trapezoids, which is swfdec running on the following file: http://michalevy.com/wp-content/uploads/Giant%20Steps%202007.swf Many thanks to Chris Wilson for his cairo-traces repository and cairo-perf-trace tool which makes it so easy to measure things like this.
2009-04-27Remove pre-server-1.5 support.Eric Anholt
2009-04-24Fix UXA to build with Sun compilers (use __func__ instead of __FUNCTION__)Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-03-13Use CopyArea to load glyphs from per-glyph pixmap to cache pixmapKeith Packard
With glyphs sitting in per-glyph pixmaps, there's no reason to use the CPU to move them to the cache pixmap, and lots of reasons to use the accelerator. Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-26Fix UXA for server 1.4.Eric Anholt
2009-02-26uxa: Fix composite fallback debug printing of main memory versus bo info.Eric Anholt
It was just printing whether it was a pixmap (it is), instead of whether the pixmap was offscreen.
2009-02-10uxa: Fix breakage from UXA_FALLBACK conversion from "do {} while (0)" construct.Eric Anholt
Thanks to keithp for post-commit review.
2009-02-10uxa: Fix driver against fbDoCopy -> miDoCopy change in the server.Eric Anholt
2009-02-10uxa: Fix failure to --amend in further changes in previous commit.Eric Anholt
2009-02-10uxa: hook up the fallback debug to the driver's fallback debug option.Eric Anholt
2009-01-13UXA: Declare glyph cache picture as component-alpha when necessary.Bernhard Rosenkraenzer
Without this, rendering component-alpha glyphs may break without a mask. Bug #19534. Ported from fix by Michel Dänzer <daenzer@vmware.com> in xserver commit 639f289dcdbe00a516820f573c01a8339e120ed4
2009-01-06uxa: handle uxa_prepare_access failureKeith Packard
uxa_prepare_access may fail to map the pixmap into user space. Recover from this without crashing. Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-16uxa: Correctly prepare/finishaccess of stipple in ValidateGC (and only it)Eric Anholt
This avoids prepare/finish_access_gc overhead when we're not changing things (since GCTile is already handled) and get us the RW flag for the prepare on of the stipple pixmap so thing will be synced correctly.
2008-12-05uxa: Add in EnableDisableFBAccess handling like examodule.c did.Eric Anholt
This fixes assertion failures when rendering text while VT switched.
2008-12-03uxa: don't call composite routines with no buffer.Dave Airlie
We can get a case with gnome-terminal + links, where we get two arrays of glyphs all with 0 width and 0 heights in them. If this happens we manage to get to this case without any buffer setup and segfault. (cherry picked from commit 717c7492a0f6ba3fb3eabda33515881eef314155)
2008-09-30Work around gcc uninitialized variable warningsJesse Barnes
GCC isn't smart enough to analyze the control flow and figure out that these are false positives, but initializing them shouldn't hurt, so work around it.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 13:50:05 +0000