fa47910045
Clean up many #if 0.
2007-12-02 12:40:25 -05:00
5aff37d1d6
Revert "registry: Register RENDER extension protocol names."
...
This reverts commit 8964c6d8e1
2007-11-20 17:57:06 -05:00
2d17f47cc7
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
hw/xnest/Pixmap.c
include/dix.h
2007-11-19 18:10:46 -05:00
8d0cd1cd2c
Fix a really dumb typo.
2007-11-15 12:21:25 -08:00
0b729051c0
Merge branch 'master' into mpx
...
Conflicts:
Xi/extinit.c
Xi/grabdev.c
Xi/setmode.c
Xi/ungrdev.c
dix/devices.c
dix/events.c
dix/getevents.c
include/dix.h
mi/midispcur.c
mi/misprite.c
xkb/xkbActions.c
xkb/xkbEvents.c
xkb/xkbPrKeyEv.c
2007-11-07 15:37:23 +10:30
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
e0491f470e
Render: Remove usage of alloca
...
Replace it with heap-based allocations.
2007-11-05 14:34:41 +00:00
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
2251572062
Restore the CompositeGlyphs -> ps->Glyphs -> miGlyphs callchain to allow acceleration architectures to wrap above miGlyphs.
2007-10-26 15:14:03 -07:00
0e749ceab4
Include stddef.h for size_t.
...
This is required by a buggy version of the openssl/sha.h header
which is distributed with Fedora 7.
2007-10-26 10:55:48 -04:00
b633d54b94
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
GL/glx/glxscreens.c
hw/xnest/Screen.c
render/glyph.c
render/glyphstr.h
render/render.c
2007-10-25 12:19:30 -04:00
a8a148919b
Superfluous ','.
2007-10-23 16:23:28 +02:00
4b14c9a9cd
Replace calls to Glyphs screen hook with CompositeGlyphs and remove dead code.
...
Not all of the DDX/miext Glyphs hook implementations have been removed, but
they should be.
2007-10-19 16:34:54 -07:00
fe97f7c54a
registry: Add some missing #include's.
2007-10-15 22:46:08 -04:00
8964c6d8e1
registry: Register RENDER extension protocol names.
2007-10-15 19:10:51 -04:00
526f40434c
NULL is not a valid argument to CreatePicture, please use serverClient
...
as the client argument if no real client is creating the object.
2007-10-12 18:19:44 -04:00
6adeba1730
dix: Add a new "registry" mechanism for registering string names of things.
...
Supports protocol requests, events, and errors, and resource names.
Modify XRES extension to use it.
2007-10-11 14:18:59 -04:00
439edc768e
Merge branch 'glyph-pixmaps'
...
Conflicts:
configure.ac
exa/exa_render.c
2007-10-02 12:14:04 -07:00
082c0f7fb3
devPrivates rework: move devPrivates field in drawable structure types
...
to just below the DrawableRec. Wish there were a better way to do this
but it has to be in the same place for all drawable types.
2007-09-19 13:59:35 -04:00
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
0003ccfcdf
xace: add new fields to resource access hook to allow parent resource objects
...
to be passed in at create time. Also added a missing devPrivates initializer.
2007-09-05 11:18:36 -04:00
07630d897e
Bug #7364 : Require renderproto 0.9.3 on 64-bit, and fix build with it.
2007-08-31 15:16:01 -07:00
fd04b983db
xace: add hooks + new access codes: Render extension
2007-08-31 09:55:27 -04:00
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
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
6f44a2c8a8
Refactor PictureInitIndexedFormats.
...
The plural version is now static, which is fine since it was only ever called
from within picture post-init anyway. The body of the work is now done with
a one-shot (public) function that operates on a single format at a time.
2007-08-25 15:13:46 -04:00
93ae6fe18c
Avoid leaking a Pixmap for every glyph
2007-08-23 16:33:05 -07:00
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
feb1b3e455
Fix <pixman.h> include to <pixman/pixman.h>
2007-08-22 16:54:29 +01:00
dc84bb3418
xace: add hooks + new access codes: core protocol cursor requests
2007-08-15 14:13:53 -04:00
f367285fd5
Merge branch 'master' into mpx
...
Conflicts:
Xi/exevents.c
dix/devices.c
dix/getevents.c
include/dix.h
mi/mieq.c
2007-08-12 15:31:10 +09:30
aa3c6aaaab
Require pixman-1 0.9.4, update pixman includes to new scheme
2007-08-06 19:00:59 -04:00
0a71e1542a
Create a Picture as well as a Pixmap at the time of AllocateGlyph
...
This avoids some inefficiency in creating a temporary Picture
for every glyph at rendering time. My measurements with an i965
showed the previous patch causing a 10-15% slowdown for NoAccel
and XAA cases, (while providing an 18% speedup for EXA).
With this change, the NoAccel and XAA performance regression is
eliminated, and the overall EXA speedup, (before any of the
glyphs-as-pixmaps work), is now 32%.
2007-08-02 22:49:56 -07:00
a2af34d5a8
Use per-screen Pixmaps for glyphs
...
Instead of system-memory data which prevents accelerated
compositing of glyphs, (at least without forcing an upload
of the glyph data before compositing).
2007-08-02 22:49:56 -07:00
19b3b1fd8f
Use strong hash (SHA1) for glyphs
...
Using a cryptographically strong hash means that comparing the
hash alone is sufficient for determining glyph equality (no need
to compare the glyph bits directly). This will allow us to replace
system-memory copies of the glyph bits, (which we've only been
holding onto for comparisons), with Pixmaps.
2007-08-02 22:49:56 -07:00
516b96387b
ProcRenderAddGlyphs: Avoid allocating a glyph just to find it cached
...
This is a cleanup without any real savings (yet). Previously, the
implementation would allocate a new glyph, then (often) find it in
the cache, and immediately discard the allocated object. This
re-organization first uses a new FindGlyphByHash function and only
allocates the glyph if nothing is found.
This isn't a real savings yet, since FindGlyphByHash currently still
does a temporary glyph allocation, but this is expected to be replaced
immediately as we switch to an alternate hashing mechanism (SHA1).
2007-08-02 22:49:56 -07:00
4c6abe1c7c
Split HashGlyph functionality out into HashGlyphInfoAndBits
...
This is in preparation for a future change that will take advantage
of being able to compute a hash for a separate xGlyphInfo and chunk
of bits without a combined Glyph object.
2007-08-02 22:49:56 -07:00
363d764ea3
ProcRenderAddGlyphs: Take advantage of the for loops to simplify the code a bit
2007-08-02 22:49:56 -07:00
dc8a528cd6
ProcRenderAddGlyphs: Convert while loops to for loops where more natural
2007-08-02 22:49:56 -07:00
57b5b97a07
ReduceCompositeOp returns a Render op, not a boolean.
2007-07-29 11:02:47 -04:00
4d76075dbb
Death to RCS tags.
2007-06-29 14:06:52 -04:00
1f97a76476
Merge branch 'master' into mpx
...
Conflicts:
dix/devices.c
hw/xfree86/common/xf86Xinput.c
hw/xfree86/loader/xf86sym.c
mi/mieq.c
2007-06-19 17:20:52 +09:30
42c2e14b25
swap xOrigin and yOrigin in SProcRenderSetPictureClipRectangles.
...
Fixes Xrender clipping rectangles when X server and client are of
different endianness, shown by xterm 225 among others.
2007-06-15 00:14:02 +02:00
54e023cec0
Don't pass regions to pixman_image_composite() anymore.
2007-06-11 09:43:15 -04:00
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
2a960c442b
Port renderedge.c to pixman
2007-05-23 13:08:26 -04:00
0fcd17c918
Use pixman short formats, revert the gradient_stop change
2007-05-15 17:59:13 -04:00
f4c1d5fc28
Use pixman types for transforms and vectors
2007-05-15 17:12:22 -04:00
f2e30e7d0a
Use the pixman fixed point types and macros
2007-05-15 16:51:21 -04:00
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
f28eea0647
Merge branch 'master' into mpx
...
Conflicts:
dix/devices.c
dix/events.c
2007-04-27 16:34:36 +09:30
b5e1f7869b
Remove #if 0'ed merge leftovers
2007-04-23 14:16:30 -04:00
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
0a9239ec25
Merge David Reveman's gradient optimization patch from pixman
2007-04-19 18:19:34 -04:00
d4dad6f84f
Merge branch 'master' into mpx
...
Conflicts:
configure.ac
dix/events.c
hw/xfree86/common/xf86Xinput.c
2007-04-12 11:11:03 +09:30
1f6741db19
Bug #10560 : Code-Cleanup: function declarations () -> (void)
...
X.Org Bugzilla #10560 : <https://bugs.freedesktop.org/show_bug.cgi?id=10560 >
Patch #9511 <https://bugs.freedesktop.org/attachment.cgi?id=9511 >
2007-04-09 14:33:15 -07:00
7f36ba5706
Allow for multiple animated cursors.
2007-04-04 17:38:10 +09:30
e8777a91f3
Merge branch 'master' into mpx
...
Conflicts:
Xi/closedev.c
Xi/exevents.c
Xi/extinit.c
Xi/listdev.c
dix/window.c
hw/xfree86/common/xf86Xinput.c
include/extinit.h
mi/mipointer.c
2007-04-02 15:36:26 +09:30
9a0f25de7c
Static cleanups, dead code deletion.
2007-03-25 12:27:01 -04:00
15a81b6325
Merge branch 'master'
2007-01-28 17:18:57 +10:30
e3aa6ad201
Multiple integer overflows in dbe and render extensions
...
CVE IDs: CVE-2006-6101 CVE-2006-6102 CVE-2006-6103
2007-01-09 14:14:19 +01:00
2d0a63126b
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver
2006-12-19 10:31:40 +10:30
51b69ff499
Remove instances of macro SECURITY_VERIFY_DRAWABLE.
2006-12-14 17:53:43 -05:00
6c46645cfc
Naming change: Security*Access -> Dix*Access
2006-12-14 14:45:42 -05:00
1c7568b8a1
mi: closing memory leak, miPointer is freed in miPointerCloseScreen
...
bugfix: uninitialized pPointer in miPointerGetPosition ifndef MPX
adding DeviceIntPtr parameter to ScreenRec's cursor functions.
cleanup of miPointer code to use same scheme in each function
dix: MPHasCursor() function determines checking whether to invoke
cursor rendering.
animcur: adding DeviceIntPtr parameter to cursor functions but animcur relies
on the core pointer right now.
xfixes: adding DeviceIntPtr parameter to cursor functions but xfixes relies on
the core pointer right now.
rac: adding DeviceIntPtr parameter to cursor functions but RAC relies on
the core pointer right now.
ramdac: adding DeviceIntPtr parameter to cursor functions but ramdac relies on
the core pointer right now.
2006-11-23 17:15:14 +10:30
594d4019c6
transformIsIdentity() now doesn't accept a zero matrix as the identity.
...
Added a non-zero test for one of the diagonal values.
2006-09-12 01:15:40 +02:00
fc30370d14
Bug #8226 : Fixed SetPictureTransform()'s handling of the argument matrix.
...
It now recognizes scaled variants of the identity matrix, too.
2006-09-11 19:43:09 +02:00
0aaac95b0d
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
84683f19b4
get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
...
Get rid of almost all uses of these definitions. They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build. As well as
for miinitext.c. But largely gone.
2006-07-18 18:17:38 -04:00
25d871d984
Fix source picture filter check for multiple screens.
...
Now, we only check for filter commonality if we're operating on a source
picture, and we compare the id (screen-independent index of the filter name)
rather than the pointer to the filter (per-screen state).
2006-07-03 19:22:26 +02:00
f5e92542a1
Bug #7366 : Fix crashes when setting filters on source pictures.
...
Now, filters may only be set on source pictures when the filter is common to
all screens. Also, like SetPictureTransform, ChangePictureFilter is now not
called on source pictures.
2006-07-03 16:40:59 +02:00
6ef4579139
Bug #7366 : Fix two crashes in operations on source pictures.
...
A screen's ChangePictureTransform now isn't called when changing the transform,
as source pictures aren't associated with screens. Also, attempting to set
an AlphaMap to a source picture will fail with BadMatch just like a Window
would, preventing another crash.
2006-07-03 16:40:11 +02:00
c7ac485a59
Remove the default case from fbcompose.c switches which should cover all cases.
...
Instead, stick the NULL return default case afterwards, so that the compiler can
warn us when we've got unimplemented cases. Removes some unimplemented and
unused 8bpp, depth 4 picture format names.
2006-06-23 13:56:20 -07:00
e1672a12eb
Convert PICT_* names from #defines to an enum to aid in debugging.
2006-06-19 15:11:55 -07:00
ab1a0249ba
Bug #6867 : Yet another Render crash fix. (Michel Dänzer)
2006-05-09 22:36:01 +00:00
b9a9cf6185
Typo in ALLLOCATE_LOCAL() arguments, causing mis-computation of the buffer.
...
Bugzilla #6642 .
2006-05-02 14:09:30 +00:00
b37c515320
Add support for x4a4 format (depth 4 at 8bpp). Bug #6325 .
2006-04-19 21:56:13 +00:00
7deaaa797c
Big old pile of warning fixes.
2006-03-28 01:21:00 +00:00
65aa33f917
render/picture.c Initialize the format of a source picture to
...
PICT_a8r8g8b8. Fixes a failure in the gradients test of rendercheck. In
the long term we could do better by setting the format to something
without alpha whenever the gradient doesn't contain colors with alpha.
This triggers a reduction of the over operation to a pure source
operation.
2006-03-08 06:19:37 +00:00
0693083335
render/picture.c Correctly initialize devPrivates variable in source only
...
pictures to 0
miext/cw/cw.h Don't try to access devPrivates of source only pictures
2006-03-06 21:00:09 +00:00
f105b8da11
Mark everything in dixsym.c as _X_EXPORT.
2006-02-15 20:44:13 +00:00
3fe482c77e
Mark everything in misym.c as _X_EXPORT.
2006-02-15 19:05:55 +00:00
83dd6241c8
Reverted, did nothing anyway, I'm not smart today.
2006-02-13 18:55:44 +00:00
4a7f6f53ca
Further op reduction when both src and dst alpha are absent.
2006-02-13 18:09:51 +00:00
34d0b9228f
Simplify ops that would use the alpha channel when an alpha channel is
...
always 1.0, and short circuit PictOpDst for good measure.
2006-02-12 20:53:35 +00:00
c3d1403672
Remove libcwrapper usage from xorg server modules. The libcwrapper is only
...
of (marginal) use in the drivers, and that usage remains.
2006-02-10 22:00:30 +00:00
506eca5f57
Wrap sdk_HEADERS in if XORG as otherwise installing non-xorg servers
...
breaks.
2006-01-18 06:56:52 +00:00
b6b88d2f62
Correct rounding in divide-by-255 code. Obtained from xserver.
2006-01-04 00:05:16 +00:00
601ab861b4
Add glyph privates for Xgl, which uses them to implement a glyph cache. EXA
...
would probably also like to do this. This breaks module ABI for EXA and
XAA, and likely breaks proprietary drivers as well.
2006-01-03 22:06:23 +00:00
08708f7d61
Merge from xserver: Make the existing ChangePictureFilter and
...
ChangePictureTransform screen hooks get called at appropriate times.
2005-12-28 11:48:14 +00:00
62f3ef930a
Bug #5258 : Restore binary compatibility with 6.8.2's PictureRec. (Aaron
...
Plattner)
2005-12-09 18:35:21 +00:00
7c00afd0ec
Define XFree86Server only where it is required.
2005-12-02 06:02:45 +00:00
da5d66f2ff
Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update loadable
...
module builds to reflect this change.
2005-11-29 16:39:33 +00:00
5f30a7b102
Bug #4689 : Treat DirectColor as TrueColor in Render. It fixes some crashes
...
with xcompmgr when using apps that use a DirectColor visual for their
windows
2005-10-06 08:08:04 +00:00
20813d3af0
Bug #3974 : Fix unaligned memory access on LP64. (Matthieu Herrb)
2005-08-28 19:47:39 +00:00
825a95a1fa
Remove use of dix-config and xorg-config.h from public headers.
2005-08-24 11:18:35 +00:00
1dc3e96e40
Fix compilation where uint is not defined.
2005-07-13 16:30:53 +00:00
4ef813961d
provide the uint datatype on WIN32
2005-07-04 09:01:43 +00:00
0bb669638f
Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".
2005-07-03 08:53:54 +00:00
46b64bd5c6
Fix more include paths; add dix-config.h to XKB code.
2005-07-03 07:37:35 +00:00
Adam Jackson
Eamon Walsh
Aaron Plattner
Peter Hutterer
Daniel Stone
Bernardo Innocenti
Matthias Hopf
Eric Anholt
Adam Jackson
Carl Worth
Alan Hourihane
Søren Sandmann Pedersen
Matthieu Herrb
Soren Sandmann Pedersen
Keith Packard
Stefan Huehner
Matthieu Herrb
Tilman Sauerbeck
Adam Jackson
Eric Anholt
Adam Jackson
Matthieu Herrb
Lars Knoll
Dave Airlie
Kevin E Martin
Benjamin Herrenschmidt
Torrey Lyons
Alexander Gottwald