Eamon Walsh
2a4aa63a23
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
include/miscstruct.h
2007-05-22 14:50:26 -04:00
Soren Sandmann Pedersen
56fd927155
Remove fast path code from fbpict.c
...
Remove the various fast path functions from fbpict, and instead use
pixman_image_composite().
2007-05-21 20:00:25 -04:00
Soren Sandmann Pedersen
756acea23a
Use pixman_image_set_indexed() to make 8 bit work
2007-05-18 14:06:21 -04:00
Soren Sandmann Pedersen
7916419a00
Comment out setup of general MMX code
2007-05-18 14:06:21 -04:00
Soren Sandmann Pedersen
998164bac6
Move fbCompositeGeneral() to fbpict.c and remove fbcompose.c
2007-05-18 14:06:21 -04:00
Soren Sandmann Pedersen
a2e3614eb8
Break image_from_pict() into a few subfunctions.
2007-05-18 14:06:21 -04:00
Soren Sandmann Pedersen
c5ef84c325
Make the general compositing code create a pixman image and call
...
pixman_image_composite(). Leave the general code commented out for now.
2007-05-18 14:06:21 -04:00
Soren Sandmann Pedersen
0375009a97
Remove excessive unrolling in fbCompositeSrc_x888x8x8888() and fix bug where
...
the source alpha was used instead of 0xff.
2007-05-17 12:59:24 -04:00
Soren Sandmann Pedersen
546465ee6a
Make fbFetch_b8g8r8() actually write the read value to the buffer
2007-05-16 17:42:04 -04:00
Soren Sandmann Pedersen
3da842bf93
Revert various fast path functions to their pre-pixman-merge state
...
since they fail rendercheck. Remove their associated macros.
See bug 10903.
2007-05-15 14:57:14 -04:00
Soren Sandmann Pedersen
d2f813f7db
New fbWalkCompositeRegion() function
...
This new function walks the composite region and calls a rectangle
compositing function on each compositing rectangle. Previously there
were buggy duplicates of this code in fbcompose.c and
miext/rootles/safealpha/safeAlphaPicture.c.
2007-05-03 12:17:24 -04:00
Soren Sandmann Pedersen
e0959adcd8
Add fbCompositeRect() as another special case in the switch of doom in fbpict.c
...
This is phase one of getting the two region walkers in fbcompose.c and
fbpict.c merged together.
2007-05-03 12:17:24 -04:00
Keith Packard
71fc5b3e93
Fix for a divide by zero that can be triggered by a malicious client.
...
Problem reported by Derek Abdine of rapid7.com. Thanks.
2007-05-02 11:41:11 +02:00
Michel Dänzer
5e4b3232da
Fix fbCompositeTrans_0888xnx0888 build for wfb on big endian.
2007-04-29 23:38:22 +02:00
Michel Dänzer
2866e0bac9
Fix a couple of picture repeat fields incorrectly compared to RepeatNormal.
2007-04-29 23:38:13 +02:00
Soren Sandmann Pedersen
78a2045535
Pixman merging
...
More msvc++ porting
2007-04-27 15:20:24 -04:00
Soren Sandmann Pedersen
6c4f1826bf
Bug fix in fbCompositeIn_nx8x8888
...
Make sure both halves of the dst word is set to zero when the masks
are both 0.
2007-04-27 08:13:45 -04:00
Soren Sandmann Pedersen
2208c6087d
Change expand_alpha_rev to expand_alpha in mmxSaturateU
2007-04-26 14:40:30 -04:00
Soren Sandmann Pedersen
a300ef84ce
Fix typo in previous commit
2007-04-26 14:37:53 -04:00
Soren Sandmann Pedersen
0ebe48be59
Pixman merge
...
- Changes to support MS Visual C++
- use inline instead of __inline__
- Fix rounding errors (Billy Biggs, from xserver via pixman)
2007-04-26 14:36:32 -04:00
Soren Sandmann Pedersen
0ff7c94fcf
Pixman merge
...
Make use of fbCompositeSrcAdd_8888x8x8mmx
2007-04-26 10:56:02 -04:00
Soren Sandmann Pedersen
701ccb4a22
Pixman merge
...
- Remove stray default label
- Integrate new MMX ops SolidMaskSrc_nx8x8888mmx, In_8x8mmx, and
In_nx8x8mmx
- Formatting changes to reduce diff noise
2007-04-26 10:49:06 -04:00
Soren Sandmann Pedersen
a54ef54db1
Pixman merge
...
Make sure fbCompositeSrc_x888x8x8888mmx and fbCompositeSrc_8888x8x8888mmx
are used when possible.
2007-04-26 10:24:25 -04:00
Soren Sandmann Pedersen
3571b8e65b
More pixman merging
...
- Move some code around to minimize diff noise
- Add mmx ops from pixman that never made it into X
- Merge Jeff Muizelaar's bugfixes to fbCompositeSrc_8888x8x8888mmx and
fbCompositeSrc_x888x8x8888mmx.
2007-04-26 10:06:47 -04:00
Soren Sandmann Pedersen
67347739b0
Don't treat convolution filters as transformations.
...
Some rearrangement of code to get it closer to pixman.
2007-04-25 22:22:22 -04:00
Soren Sandmann Pedersen
c056ce95d8
Port MSVC++ CPU detection code from pixman. (Vladimir Vukicevic).
2007-04-25 22:22:22 -04:00
Soren Sandmann Pedersen
c19ece1d8c
Integrate optimization from xserver from David Reveman where repeats
...
get handled by fbFetchTransformed() rather than in the region walking
code.
2007-04-25 22:22:22 -04:00
Soren Sandmann Pedersen
48c73dfc36
Add function fbCompositeSrcAdd_8888x8x8(), and fix a bug where
...
srcRepeat = FALSE would be set in the wrong place.
2007-04-25 22:22:22 -04:00
Soren Sandmann Pedersen
66ba3d758a
Various fixes from xserver via pixman (Billy Biggs)
2007-04-25 22:22:22 -04:00
Soren Sandmann Pedersen
0a2fe443d2
Use READ/WRITE macros for new functions introduced in previous commits.
2007-04-24 19:02:44 -04:00
Soren Sandmann Pedersen
7e16da7b78
Remove #if 0'ed blocks
2007-04-24 18:15:34 -04:00
Soren Sandmann Pedersen
2d9a7a7687
From pixman (Jeff Muizelaar)
...
Fix up the fast-path compositing operators; those are useful for
sources without alpha, but can't be used for sources with
alpha. Also, replaced fbCompositeSrcSrc_nxn with call to fbBlt as
this function must handle 1, 4, 8, 16, 24, 32 bpp objects. Would
be nice to optimize fbBlt for common cases involving 8, 16, 24 and
32bpp.
From Keith Packard.
2007-04-24 14:46:59 -04:00
Soren Sandmann Pedersen
fde4a5adf0
From xserver via pixman (Jeff Muizelaar)
...
Add some optimizations from jaymz. Also adds some compile
warnings that will hopefully go awa y as we continue merging.
2007-04-24 13:30:43 -04:00
Soren Sandmann Pedersen
13e1d5ea55
Fix format vs formatCode in previous commit
2007-04-24 12:59:18 -04:00
Soren Sandmann Pedersen
077a5d4555
Add functions fbCompositeSrcSrc_nxn() and fbCompositeTrans_0565xnx0565
...
from xserver via pixman. Add READ/WRITE and fbFinishAccess as
appropriate.
2007-04-24 12:57:55 -04:00
Soren Sandmann Pedersen
84838268b3
Gradient fixes
...
* Port fix for bug 7685 from pixman. Patch by Carl Worth
* Add projective version of radial gradient code.
* Make sure that all Pict*Gradient types have PictGradient as prefix,
since code in various places relies on that.
2007-04-23 13:19:54 -04:00
Aaron Plattner
ca784df84e
Fix unbalanced fbGetDrawable added in commit 0a9239ec
.
2007-04-22 16:26:01 -07:00
Soren Sandmann Pedersen
55bd8668e7
Remove #if 0'ed leftovers from merge
2007-04-21 17:10:54 -04:00
Soren Sandmann Pedersen
41dd7ab067
Fix gradient walker to not reset needlessly
...
Previously the gradient walker was doing excessive resets, (such
as on every pixel in constant-colored regions or outside the
gradient with CAIRO_EXTEND_NONE). Don't do that.
Carl Worth, from pixman
2007-04-21 17:10:54 -04:00
Soren Sandmann Pedersen
c1b73f0f2a
Fixing gradient repeat mode computations in previous patch. From David
...
Turner.
2007-04-21 17:10:54 -04:00
Soren Sandmann Pedersen
38f718799c
Remove a few memory references in fbFetchTransformed
2007-04-21 17:10:54 -04:00
Soren Sandmann Pedersen
9c4b14d4f6
Integrate David Turner's gradient optimizations from pixman
2007-04-21 17:10:54 -04:00
Soren Sandmann Pedersen
3daa5c1a99
Fix pixman bug 5777, patch by David Reveman
2007-04-20 09:44:25 -04:00
Soren Sandmann Pedersen
0a9239ec25
Merge David Reveman's gradient optimization patch from pixman
2007-04-19 18:19:34 -04:00
Eamon Walsh
cf962a849d
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
configure.ac
2007-04-05 14:41:39 -04:00
Eamon Walsh
5ad562565a
devPrivates rework: properly free devPrivates on compatibility structures,
...
type pixmap. Requires ddx'es to call the free function from DestroyPixmap.
2007-04-05 14:18:05 -04:00
Brian
0ee40c9357
s/intead/instead/
2007-04-03 09:31:00 -06:00
Brian
a240c039c4
Split the xserver/fb/fbcmap.c file into two files.
...
Now, fbcmap_mi.c contains the fb functions which just wrap mi functions.
Previously, these were in fbcmap.c and compiled when XFree86Server was defined.
Now, clients of fbcmap should either use fbcmap.c or fbcmap_mi.c and not worry
about setting the XFree86Server symbol.
2007-04-03 09:28:21 -06:00
Eamon Walsh
a7cd53deb9
remove PIXPRIV checks as this flag is always set.
2007-03-06 17:05:03 -05:00
Soren Sandmann Pedersen
262b9b104a
Use the new 8888x0565mmx function in fbpict.c
2007-02-06 17:30:22 -05:00