Commit Graph

2255 Commits

Author SHA1 Message Date
oga
5f44320c03 Pull in some code from 2.8 and current so that dri2 works correctly with
xserver 1.6.2. When dri2 is not in use, this commit does nothing.

ok matthieu@
2009-08-06 16:02:07 +00:00
oga
9997d7a073 backport some code from mesa current (and 7.5) so that the dri2 protocol
is correctly handled. without fixes to mesa and the ddx, the so-called
backwards compat goop that was added just plain does not work and ends
up with rendering bullshit.
2009-08-06 15:50:02 +00:00
oga
11a94b33b4 update dri2proto to the latest version. (needed for dri2 with xserver
1.6.2 to work correctly)

ok matthieu@
2009-08-06 15:36:45 +00:00
todd
a428bddded sync 2009-08-04 21:52:36 +00:00
todd
5438d9bb14 sync 2009-08-04 20:54:46 +00:00
matthieu
7edc2b5a56 Enable XCB on architectures with shared libs.
requested by sthen@.
2009-08-04 15:45:41 +00:00
matthieu
9aa70ccd38 updates 2009-08-02 17:02:09 +00:00
matthieu
b9575da0ef OpenBSD's gcc 3.3 is capable of handling the MMX code of pixman.
Change the configure test so that it gets enabled.

Tested by marco@ ajacoutot@ ckuethe@ and others.
2009-07-28 19:01:29 +00:00
matthieu
63f17666fc updates 2009-07-24 19:51:21 +00:00
matthieu
8ab3717763 add -I${XCBUTIL}/${SUBLIB} to CPPFLAGS for gcc 2.95 2009-07-20 20:57:57 +00:00
matthieu
7d22228cff regen after gcc 2.95 build fix 2009-07-20 20:55:45 +00:00
matthieu
ee57c931d5 gcc 2.95 build fixes. 2009-07-20 20:55:10 +00:00
kettenis
276db15ee6 Disable hardware cursor before we exit. From NetBSD.
ok oga@
2009-07-19 14:46:59 +00:00
matthieu
160be1ef33 Initialize ed.used_stdout at the beginning of do_extract() to avoid
reading uninitialized memory later.
Reported by Philip Guenther. Thanks.
2009-07-19 08:12:09 +00:00
matthieu
0d63acfc0e Fix build when XSRCDIR is not defined in /etc/mk.conf.
Problem reported by Chris Kuethe. Thanks.
2009-07-18 20:54:10 +00:00
matthieu
07600073fd Correct patch for libpciaccess issue from X.Org bug 18122, by
Marien Zwart. Tested by Pierre Cardoso.
2009-07-18 20:16:00 +00:00
matthieu
386cb73aae Add XCBPROTO_VERSION substitution for xcb.pc.
Problem reported by David Coppa. Thanks.
2009-07-18 20:06:46 +00:00
oga
9a5da84da5 Since we don't accelerate trapesoid rendering under uxa yet anyway
software rasterise them THEN put them into buffer objects.
read-modify-write of graphics memory is expensive.

2.5x speed increase under heavy trap rendering measured.

Another upstream backport. ok matthieu@
2009-07-18 15:02:51 +00:00
oga
2b56f07bde Don't put glyphs pixmaps into buffer objects under uxa.
in the fastpath they're going straight to the glyph cache anyway and
doing so for small glyphs wastes memory since bos must be padded to page
size.

Backport from upstream (to aid gem development). ok matthieu@
2009-07-18 15:00:09 +00:00
oga
c349058b6d Fallback if we're vt switched and we're using GEM. We're not allowed to
access the hardware in this situation.

Backport from upstream CURRENT.

ok matthieu@.
2009-07-18 14:58:00 +00:00
oga
37a2f39d00 Accessing a pixmap in fallback if the prepare_access() callback failed
is verboten

So don't do it. Treat it the same as every other prepare access call in
uxa.  This patch sent upstream.

ok matthieu@
2009-07-18 14:56:03 +00:00
oga
6e3e5abe72 Fix libdrm for the buffer mapping strategy our GEM implementation will use
We always map through the gtt, never using the cpu mapping (this decreases
complexity a lot). Keep use of the original ioctl for this. Also don't bother
with userland domain setting, the kernel handles this correctly.

Finally, don't persist mapping across calls to unmap and remapping, this aids
with debugging, but may change later.

ok matthieu@.
2009-07-18 14:54:42 +00:00
matthieu
e7a3326e09 upstream updates 2009-07-18 07:37:15 +00:00
oga
251e57a556 Make the !privsep and privsep paths a little more similar (still
checking the list), this allows drm to work in -keepPriv situations.

This diff has been in my tree awaiting proper testing for months, now
i'm sure it works correctly in it goes.

ok matthieu@ an aeon ago.
2009-07-14 18:25:16 +00:00
todd
a3c2093094 sync (ok deraadt@ & matthieu@) 2009-06-30 22:22:00 +00:00
matthieu
4d65740941 Fix PCI card probe and chipset detection.
it appears that the chips&technologies X driver was partially broken
during libpciaccess conversion. Thanks to the analysis by Marien Swart
in bug #18122 and a similar fix by Mark Kettenis for the radeon
driver, this patch should fix it.
2009-06-30 18:39:19 +00:00
matthieu
3b890ddc49 Set default migration strategy to "greedy". ok oga@. 2009-06-29 21:26:43 +00:00
matthieu
7f4deab7fa update 2009-06-27 16:12:21 +00:00
matthieu
ffd83bca19 update to svn revision 753. This includes a few bug fixes that
make EXA work on my Chrome9 HC3 IGP. ok oga@
2009-06-27 10:11:47 +00:00
matthieu
9e42493983 Use the bsd.xorg.mk rules to install the pkgconfig file and
add the libdrm_intel.pc. with oga@.
2009-06-27 10:02:53 +00:00
oga
7230692acb use fnmatch to glob the entries in the exec menu.
allows shell globbing constructs such as *ctl, etc in the exec menu (m-?
by default).

Adapted from a diff from Thomas Pfaff, okan@ got almost the same diff as
me when reworking it, and oked this one.
2009-06-26 12:45:12 +00:00
todd
c4dd635c0a puffy 4.6 2009-06-26 12:33:59 +00:00
okan
d893a97dee static local functions and data; almost identical diff from Thomas Pfaff
ok oga@
2009-06-26 12:21:58 +00:00
matthieu
e70d43c060 I was supposed to remove the --enable-debug option before committing. 2009-06-25 21:28:57 +00:00
matthieu
855916fc83 update to openchrome.net svn commit 750.
This adds among others support for the VX800 chipset.
This has been in snapshots for weeks.
2009-06-25 21:27:18 +00:00
matthieu
42b052b942 update to xf86-video-intel 2.7.1. Tested by many. 2009-06-25 20:16:43 +00:00
okan
28840135ea tidy up startup/init routines
ok oga@
2009-06-23 21:52:38 +00:00
oga
c976b8a8ee Add support to the fake (non GEM) bufmgr for pinning and unpinning objects.
Makes overlay XV work with intel 2.7.1. ok matthieu@, tested by naddy@,
sturm@, matthieu@ and myself. This is most important for the x40 and
other 8xx chipset which lack textured video.
2009-06-21 17:39:53 +00:00
okan
e61fd04310 compact a bit by condensing a few if-else's; from Thomas Pfaff
"go on then" oga@
2009-06-20 00:55:41 +00:00
okan
a7dfb91b88 unroll XCALLOC/XMALLOC macros; since we use xcalloc/xmalloc all over the
place anyway, this makes things a bit more consistent; from Thomas Pfaff

ok oga@
2009-06-20 00:22:39 +00:00
okan
0230e26854 spacing 2009-06-20 00:19:56 +00:00
sobrado
9bc8348d66 `exec'' and `ssh'' are lowercase.
ok martynas@
2009-06-19 10:43:49 +00:00
sobrado
2de9f26c1d items on the first list should have full stops too.
ok martynas@
2009-06-18 20:44:40 +00:00
sobrado
b0a20e655b the on-line manual should use the same notation for key bindings
as the configuration file, this way writing configuration files is easier;
add a few missing interactive command (.Ic) macros to key bindings;
slightly improve spacing in the lists; other tweaks.

ok martynas@
2009-06-18 20:24:54 +00:00
okan
1183bd535d remove unnecessary casts; from Thomas Pfaff
ok oga@
2009-06-17 13:08:37 +00:00
okan
89d865166d re-factor parts of mouse move/resize bit to shrink and make more
readable; no behavior change

ok oga@
2009-06-17 12:45:01 +00:00
okan
96b7d95a17 move like defines to a central, logical location; no binary change.
aok oga@
2009-06-17 12:30:17 +00:00
matthieu
810f9ab0c6 Don't de-reference a NULL pointer in R128FreeScreen in the error path.
If R128PreInit() failed, R128FreeRec() was already called and info
will be NULL.
2009-06-13 17:18:21 +00:00
matthieu
787b897b8c Remove the xf86-video-suncg6 driver, which doesn't support acceleration
beside the hw cursor. The latter can be done in wsfb if someone manages
to prove miod@ that it's useful.
2009-06-12 19:59:00 +00:00
matthieu
406f757488 regen with autoconf 2.62p0. Fixes xserver build on macppc. 2009-06-12 19:33:24 +00:00