Paulo Cesar Pereira de Andrade
31285d063e
Make visible symbols required by xorg modules.
...
This patch exports all symbols required by the compilable
(in a x86 linux computer) xorg/driver/* modules.
Still missing symbols worth mentioning are:
sunleo
miFindMaxBand no longer available
intel (uxa/uxa-accel.c)
fbShmPutImage no longer available (and should have been static)
mga
MGAGetClientPointer (should come from matrox's libhal)
This is not a definitive "visibility" patch, as all it does is to
export missing symbols, but the modules that current don't compile,
may require more symbols once fixed, and third party drivers should
also require more symbols exported.
A "definitive" patch should export symbols defined in the sdk.
2008-11-28 01:55:11 -02:00
Jeremy Huddleston
9c5fc7762e
Partially reverts commit 505c216d03
.
...
I don't know how the hell git-cherrypick messed that up to delete fbwindow.c
2008-10-03 11:24:34 -07:00
Jeremy Huddleston
505c216d03
Added dep on applewmproto 1.1.0
...
(cherry picked from commit b350b06674
)
2008-10-03 11:11:37 -07:00
Adam Jackson
b1a3173473
Fix bad preprocessor line
2008-10-02 17:03:21 -04:00
Tomas Carnecky
ebea78cdba
Prepare for array-index based devPrivates.
...
TODO: static indices can be made just an int; some indices
can be combined.
2008-08-28 18:05:40 -04:00
Adam Jackson
856db05b58
Unifdef sgi.
2008-07-23 13:37:42 -04:00
Daniel Stone
446fe9eecd
Dead code removal
...
Remove a whole bunch of code that was never built, be it entire files or
just dead ifdefs.
2008-07-17 21:37:50 +03:00
Adam Jackson
9719354ae0
Check for __amd64__, not __x86_64__.
...
Spiritual revert of 1fa4de80fc
. Intel's C
compiler claims to be gcc-compatible; if they're not defining the same
macros as gcc then that's their bug, not ours. Even if we were to do
this aliasing we should do it once and for all in servermd.h.
2008-06-24 14:37:06 -04:00
Adam Jackson
b55fbca4f0
Bug #12414 : Create full-fledged pixmaps in fb24_32ReformatTile().
...
... instead of creating pixmaps that only fb knows about, which will
have no devPrivates for any other subsystem and thus cause havoc if
(when) they leak out.
2008-06-20 13:27:32 -04:00
Eamon Walsh
60f64af075
Fix "warning: passing argument 1 of 'pixman_fill' from incompatible pointer type".
2008-06-13 21:23:31 -04:00
Adam Jackson
f31bd087e8
Death to mfb.
...
Anyone still interested in 1 or 4 bpp framebuffers, talk to fb.
2008-06-13 10:51:18 -04:00
Peter Hutterer
e73a03d589
fb: shut up two compiler warnings.
2008-05-20 10:54:32 +09:30
Tilman Sauerbeck
d3d00d9258
Removed fbpseudocolor.h from sdk_HEADERS.
2008-04-19 12:54:40 +02:00
Adam Jackson
5bdc419879
Remove fbpseudocolor
...
"An experimental pseudocolor emulation layer. Not fully completed,
currently only works for 16bpp." That was almost four years ago.
It still doesn't work, only one driver even attempts to use it, it
contains an ad-hoc implementation of damage, and should really be
done up in Composite now anyway.
2008-04-19 04:06:19 -04:00
Matt Turner
1fa4de80fc
Check for __x86_64__ when we check for __amd64__
...
It seems Intel C Compiler neglects to define __amd64__, __amd64, or
amd64, but *does* define __x86_64__.
2008-04-12 20:39:18 +02:00
Adam Jackson
24bebdded4
fbFillRegionTiled() is now dead code.
...
Only ever called from the old PaintWindow* screen hooks, but those are
gone now. As a pleasant side effect, fb loses its #ifdef PANORAMIX.
2008-02-22 15:22:38 -05:00
Eamon Walsh
c8feb73f58
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
Xext/EVI.c
Xext/bigreq.c
Xext/cup.c
Xext/dpms.c
Xext/fontcache.c
Xext/mitmisc.c
Xext/xcmisc.c
Xext/xf86bigfont.c
Xext/xtest.c
configure.ac
dbe/dbe.c
hw/darwin/darwin.h
hw/darwin/darwinEvents.c
hw/darwin/iokit/xfIOKit.h
hw/darwin/iokit/xfIOKitCursor.c
hw/darwin/quartz/fullscreen/fullscreen.c
hw/darwin/quartz/fullscreen/quartzCursor.c
hw/darwin/quartz/quartz.c
hw/darwin/quartz/quartzCommon.h
hw/darwin/quartz/quartzCursor.c
hw/darwin/quartz/xpr/dri.c
hw/darwin/quartz/xpr/dristruct.h
hw/darwin/quartz/xpr/xprCursor.c
hw/darwin/quartz/xpr/xprFrame.c
hw/xfree86/modes/xf86RandR12.c
include/cursor.h
miext/rootless/rootlessCommon.h
miext/rootless/rootlessScreen.c
miext/rootless/rootlessWindow.c
render/picturestr.h
Trying to pick up the pieces from the darwin churn here...
2007-12-13 18:38:25 -05:00
Adam Jackson
fa47910045
Clean up many #if 0.
2007-12-02 12:40:25 -05:00
Eamon Walsh
709c1a70c8
Remove some duplicate include statements.
2007-11-20 15:18:02 -05:00
Eamon Walsh
2d17f47cc7
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
hw/xnest/Pixmap.c
include/dix.h
2007-11-19 18:10:46 -05:00
Aaron Plattner
f797c96845
Save pixmap allocation hints into the PixmapRec.
2007-11-15 12:21:25 -08:00
Eamon Walsh
a52c9b2a59
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/dispatch.c
dix/property.c
hw/xfree86/common/xf86VidMode.c
include/xkbsrv.h
render/glyph.c
xkb/xkbActions.c
2007-11-05 19:08:36 -05:00
Daniel Stone
34cdf06e4c
fb: Remove usage of alloca
...
Replace with heap storage.
2007-11-05 14:34:42 +00:00
Aaron Plattner
f2e310132f
Add CreatePixmap allocation hints.
...
These hints allow an acceleration architecture to optimize allocation of certain
types of pixmaps, such as pixmaps that will serve as backing pixmaps for
redirected windows.
2007-11-04 16:11:28 -08:00
Eamon Walsh
c3f7b86255
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
os/access.c
2007-10-17 15:00:54 -04:00
Dodji Seketeli
a5bd536869
fbcmap_mi.c: add a missing api
...
* fb/fbcmap_mi.c:
(fbSetVisualTypesAndMasks): added this entry point that was missing.
This is useful so that servers using this entry point can use fbcmap_mi.c,
and be obliged to stick to fbcmap.c. Note that fbcmap.c does implement this
entry point. Up to now, kdrive based server could not use fbcmap_mi.c because this
entry point was missing. The will allow Xephyr to properly use GL.
2007-10-02 16:55:17 +02:00
Alan Hourihane
c11a27ef85
Add the FB_ACCESS_WRAPPER checks
2007-09-27 14:55:40 +01:00
Alan Hourihane
e0bb33b3d2
Fix bug #12286
2007-09-27 14:55:40 +01:00
Eamon Walsh
97c150b61b
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
afb/afbpntwin.c
afb/afbscrinit.c
afb/afbwindow.c
cfb/cfb.h
cfb/cfballpriv.c
cfb/cfbscrinit.c
cfb/cfbwindow.c
configure.ac
fb/wfbrename.h
hw/xfree86/xf4bpp/ppcIO.c
hw/xfree86/xf4bpp/ppcPntWin.c
hw/xfree86/xf4bpp/ppcWindow.c
hw/xfree86/xf8_32bpp/cfbscrinit.c
mfb/mfb.h
mfb/mfbpntwin.c
mfb/mfbscrinit.c
mfb/mfbwindow.c
mi/miexpose.c
Note: conflicts caused by devPrivates rework vs. paintwindow changes.
2007-09-19 07:25:55 -04:00
Eric Anholt
e4d11e58ce
Remove the PaintWindow optimization.
...
This was an attempt to avoid scratch gc creation and validation for paintwin
because that was expensive. This is not the case in current servers, and the
danger of failure to implement it correctly (as seen in all previous
implementations) is high enough to justify removing it. No performance
difference detected with x11perf -create -move -resize -circulate on Xvfb.
Leave the screen hooks for PaintWindow* in for now to avoid ABI change.
2007-09-13 00:08:53 +00:00
Eamon Walsh
4017d31902
devPrivates rework: since API is already broken, switch everything
...
over to new system.
Need to update documentation and address some remaining vestiges of
old system such as CursorRec structure, fb "offman" structure, and
FontRec privates.
2007-08-28 09:28:25 -04:00
Eamon Walsh
8554707326
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
include/miscstruct.h
mi/mibstore.c
mi/midispcur.c
os/Makefile.am
2007-08-28 07:25:21 -04:00
Adam Jackson
ae7f71a8b3
Implement core protocol backing store exclusively in terms of Composite.
...
Composite's automatic redirection is a more general mechanism than the
ad-hoc BS machinery, so it's much prettier to implement the one in terms
of the other. Composite now wraps ChangeWindowAttributes and activates
automatic redirection for windows with backing store requested. The old
backing store infrastructure is completely gutted: ABI-visible structures
retain the function pointers, but they never get called, and all the
open-coded conditionals throughout the DIX layer to implement BS are gone.
Note that this is still not a strictly complete implementation of backing
store, since Composite will throw the bits away on unmap and therefore
WhenMapped and Always hints are equivalent.
2007-08-25 15:08:20 -04:00
Søren Sandmann Pedersen
943dd6ad99
Revert "Revert "Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix"" since the pixman changes have been pushed now.
...
This reverts commit 57f7f2a532
.
2007-08-23 12:15:03 -04:00
Eric Anholt
57f7f2a532
Revert "Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix"
...
The corresponding pixman code hasn't been pushed, so revert until the code is
ready.
This reverts commit 53941c8e68
.
2007-08-22 09:02:03 -07:00
Eric Anholt
d0dc9698ae
Revert "Fix <pixman.h> include to <pixman/pixman.h>"
...
The pixman headers have been located under pixman-1/ instead of pixman/ since
around 2007-08-06, and pixman-1.pc has the updated include paths to account
for this.
This reverts commit feb1b3e455
.
2007-08-22 09:00:45 -07:00
Alan Hourihane
feb1b3e455
Fix <pixman.h> include to <pixman/pixman.h>
2007-08-22 16:54:29 +01:00
Søren Sandmann Pedersen
53941c8e68
Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix
...
bug 11620 (reported by Jens Stroebel.
2007-08-21 14:26:14 -04:00
Aaron Plattner
6a32a96d8d
stride is in FbBits-sized chunks, but xoff is not.
...
Fixes corruption problems with composite rendering to redirected windows in
depth 16.
2007-08-16 17:43:29 -07:00
Aaron Plattner
32666d7722
Bug #12015 : Use the right offsets in the dst arguments of pixman_blt.
2007-08-16 14:57:32 -07:00
Søren Sandmann Pedersen
aa3c6aaaab
Require pixman-1 0.9.4, update pixman includes to new scheme
2007-08-06 19:00:59 -04:00
Aaron Plattner
74feba4d77
Don't unwrap too early in libwfb for Composite.
...
Don't call fbFinishWrap until the pixman_image_t that stores the pointer is
actually freed. This prevents corruption or crashes caused by accessing a
wrapped pointer after the wrapping is torn down.
2007-08-06 14:22:49 -07:00
Eamon Walsh
e34fcd2bf4
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/devices.c
dix/property.c
include/dix.h
2007-08-02 14:27:03 -04:00
Alan Coopersmith
7c0ca27f6d
"fbpict.c", line 215: void function cannot return value
2007-07-11 17:16:59 -07:00
Adam Jackson
bcb2352742
Clean up unused #ifdefs from fb.
2007-07-05 15:56:25 -04:00
Adam Jackson
4d76075dbb
Death to RCS tags.
2007-06-29 14:06:52 -04:00
Aaron Plattner
1e189ed1da
Handle tileStride > 1 in fbEvenTile.
...
Patch courtesy of James Jones.
2007-06-27 10:16:40 -07:00
Søren Sandmann Pedersen
19cde59c41
In fbFill() make sure the drawable is validated when pixman_fill() succeeds.
...
In fbSolidBoxClipped() don't return when pixman_fill() succeeds.
2007-06-22 00:39:28 -04:00
Arcady Goldmints-Orlov
5138f710a1
Fixed fbSolidBoxClipped() to fill the right place.
...
Changed an X2 to a Y1.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
2007-06-20 16:46:22 -07:00
Søren Sandmann Pedersen
78179ae827
Remove fbmmx.[ch] files
2007-06-11 22:46:42 -04:00
Søren Sandmann Pedersen
eb2d7fe02f
Replace fbFillmmx() with pixman_fill() and remove fbmmx.[ch]
2007-06-11 22:43:01 -04:00
Søren Sandmann Pedersen
d1d85c04e2
Delete fbBltmmx().
2007-06-11 21:25:42 -04:00
Eamon Walsh
e2a720c9a1
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/dixutils.c
2007-06-11 15:29:11 -04:00
Søren Sandmann Pedersen
3f9adb18f1
Port a few forgotten fbSolidFillmmx()'es to fbFillmmx(). Use pixman_blt() instead of fbBltmmx()
...
in fbCopyNToN().
2007-06-11 15:19:27 -04:00
Søren Sandmann Pedersen
d06099b38e
Remove fbCopyAreammx() and fbSolidFillmmx()
2007-06-11 14:10:33 -04:00
Søren Sandmann Pedersen
d4a034370c
Split fbSolidFillmmx() into a new FbFillmmx() function. Call that from fbFill().
2007-06-11 14:10:33 -04:00
Søren Sandmann Pedersen
3210902a73
Split fbCopyAreammx() into a new fbBltmmx() function; call this
...
function from fbCopyNToN().
2007-06-11 14:10:33 -04:00
Søren Sandmann Pedersen
54e023cec0
Don't pass regions to pixman_image_composite() anymore.
2007-06-11 09:43:15 -04:00
Aaron Plattner
9c47b86bd9
Add new fb symbols to wfbrename.h.
...
Avoids crashes when wfbComposite calls the wrong image_from_pict.
2007-06-07 13:57:12 -07:00
Søren Sandmann Pedersen
567b5bf765
Delete fbCompositeCopyAreammx()
2007-06-05 20:26:49 -04:00
Søren Sandmann Pedersen
49ed31c0b3
Remove most of the fast-path MMX operations from fbmmx. fbCopyAreammx
...
and fbSolidFillmmx are still needed by other code.
2007-06-05 17:48:33 -04:00
Benjamin Herrenschmidt
e5ce982381
Include pixman.h from fb.h or compile of some files will fail
...
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2007-06-03 09:40:37 +10:00
Soren Sandmann Pedersen
047bf3349b
Delete trapezoid rendering code; replace with pixman calls
2007-05-23 16:56:05 -04:00
Soren Sandmann Pedersen
9d87ef4e0d
- Make image_from_pict() non-static
...
- Delete fbedge.c and fbedgeimp.h
- Use pixman_rasterize_edges() in fbtrap.c
2007-05-23 15:50:25 -04:00
Soren Sandmann Pedersen
3ba3ede9bb
Add missing offsets for window coordinates - reported by Colin Harrison
2007-05-23 12:56:04 -04:00
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