Commit graph

4122 commits

Author SHA1 Message Date
Alan Hourihane
08896805cb Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2
Conflicts:

	render/picture.c
	render/picture.h
2007-10-26 00:07:07 +01:00
Kristian Høgsberg
f62277d421 Clean up unused pVisual part of __GLXcontext. 2007-10-25 18:49:02 -04:00
Kristian Høgsberg
30bcaa966d Make glx destroy path handle cases where the X window goes away first. 2007-10-25 18:49:02 -04:00
Naoki Hamada
242f56f722 Input: Fix key down test (bug #12858)
Fix the botched previous key_is_down test, which would give false positives.
Also move key_autorepeats to a separate inline function.
2007-10-25 18:46:27 +03:00
Matthias Hopf
48ca5961ca Prefer configured DisplaySize to probed DDC data, if available.
Based on patch by Hong Liu <hong.liu@intel.com>.
2007-10-24 20:31:51 +02:00
Pierre Willenbrock
d502521c36 EXA: Fix off-by-one in polyline drawing. 2007-10-23 16:45:13 +02:00
Matthias Hopf
a8a148919b Superfluous ','. 2007-10-23 16:23:28 +02:00
Matthias Hopf
75f05086d0 Get rid of unnecessary GNU extended variadic macro. 2007-10-23 15:39:23 +02:00
Alan Hourihane
57d8fd992f Move xglCreateSolidAlphaPicture 2007-10-23 09:05:50 +01:00
David Nusinow
d808d653d1 Define PCI_TXT_IDS_DIR more cleanly 2007-10-22 21:30:04 -04:00
Keith Packard
29e0e18072 Leave hardware-specified preferred modes alone when user preference exists.
Instead of removing the preference bit marking the hardware declared mode
preference, leave it in place and just move the user preferred mode to the
front of the list while marking it with the USERPREF bit which will cause it
to be selected by the initial mode selection code.
2007-10-22 13:38:16 -07:00
Michel Dänzer
fbe19c66c3 GLX: Fix leak of X pixmaps associated with GLX pixmaps. 2007-10-22 18:28:03 +02:00
Michel Dänzer
c6d36b1cee GLX: Don't crash on unused client array members when switching to/from console. 2007-10-22 18:28:03 +02:00
David Nusinow
be9b0e558d Add a note as to why the text file based PCI ID scheme is present at all 2007-10-21 23:49:14 -04:00
David Nusinow
b79b965bd9 Fix compilation issue on FreeBSD (bug #12841)
Hide getline call by checking for glibc. If not, use fgetln instead. Even
though this section is now #ifdef'ed for linux only, this should help make
it more portable if non-linux folks end up wanting it.
2007-10-21 23:46:54 -04:00
David Nusinow
7f5e71fa73 Make PCI text file directory configurable 2007-10-21 23:41:49 -04:00
Eric Anholt
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
Eric Anholt
a3a95d3475 Merge branch 'master' into glyph-pixmaps
Conflicts:

	configure.ac
2007-10-19 15:44:17 -07:00
Eric Anholt
7e1cada6c6 Disable debian pci-id-list autoconfig code on non-linux.
It contains static paths, fails to build on non-glibc, and apparently just
exists to support distributions managing binary drivers and open-source drivers
together.  Also restores previous code for fallback to vesa if nothing is
detected.
2007-10-19 15:16:19 -07:00
Alan Hourihane
16b9d28c55 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2
Conflicts:

	GL/glx/glxglcore.c
	GL/glx/glxscreens.c
2007-10-19 21:32:06 +01:00
Kristian Høgsberg
89c6108531 Fix software GL to provide a list of supported fbconfigs like the DRI case. 2007-10-19 16:22:33 -04:00
Matthias Hopf
74e84b8d89 Only issue XF86_APM_CAPABILITY_CHANGED for video change ACPI events (not e.g. brightness etc.). 2007-10-19 17:28:15 +02:00
Matthias Hopf
6fdf3ddfef Fix ids of ACPI events according to ACPI spec. 2007-10-19 17:20:21 +02:00
Alan Hourihane
b534a4d8b8 update Xgl 2007-10-19 12:04:51 +01:00
Alan Hourihane
8e4190627e Missed a rename 2007-10-19 12:00:17 +01:00
Alan Hourihane
b45d236590 Fix recent merge problems and add enter/leave wrapper
from Jose's code.
2007-10-19 11:46:01 +01:00
Kristian Høgsberg
69f5760aec Introduce a new "GlxVisuals" option that controls which visuals are added.
Right now we default to "all" which gives us a situation much like before,
but when the "typical" option is implemented, we can change the default and
reduce the number of visuals the GLX module bloats the X server with.
2007-10-19 11:08:38 +01:00
Kristian Høgsberg
9a289a6e3e Add code to set up GLX visuals and add one for the first double buffered FBConfig. 2007-10-19 11:08:38 +01:00
Kristian Høgsberg
994bec4675 Separate handling of GLX visuals and GLX FBConfigs.
XIDs for GLX visuals and FBConfigs used to be interchangable and the list of
GLX visuals was identical to the list for FBConfigs.  This patch splits handling
of these two data types and allows the X server to pick and choose the FBConfigs
that are exposed as visuals.
2007-10-19 11:08:37 +01:00
Kristian Høgsberg
6a310bf763 Drop VisualConfigPriv support from the DRI module.
No DDX driver uses this, and this patch stops the DRI module from
poking around GLX module data structures.
2007-10-19 11:08:37 +01:00
Kristian Høgsberg
2a5c2bdfd5 Simplify and clean up GLX visual initialization.
Instead of the fragile setup where we filter the modes common between the
DDX generated GLX visuals and the DRI driver generated fbconfigs, we now
just take the fbconfigs returned by the DRI driver to be our supported set.
2007-10-19 11:08:37 +01:00
Eric Anholt
08be775434 Add a quirk for Philips 107P5 which lacks the preferred bit on detailed timing.
Also fix the prefer-large-75 quirk if the prefer-first-detailed bit was set,
though it's not the case for the existing prefer-large-75 consumer.
2007-10-19 11:08:37 +01:00
Michel Dänzer
c3f909c5d3 EXA: Skip empty glyphs. 2007-10-19 11:08:37 +01:00
Michel Dänzer
fe31564f10 EXA: Don't attempt to move in pixmaps that can't be accelerated.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=12815 .
2007-10-19 11:08:36 +01:00
Keith Packard
502c757e79 Make config file preferred mode override monitor preferred mode.
Add a new even-more-preferred bit to each mode which is used to make config
file preferences selected instead of the monitor preferred mode.
2007-10-19 11:08:36 +01:00
Keith Packard
3b73eaf577 KDRIVE_LOCAL_LIBS includes some system libraries, not just internal x server libs 2007-10-19 11:08:36 +01:00
Kristian Høgsberg
8e3c1dfc48 Introduce a new "GlxVisuals" option that controls which visuals are added.
Right now we default to "all" which gives us a situation much like before,
but when the "typical" option is implemented, we can change the default and
reduce the number of visuals the GLX module bloats the X server with.
2007-10-18 21:03:43 -04:00
Kristian Høgsberg
9e3cfd950d Add code to set up GLX visuals and add one for the first double buffered FBConfig. 2007-10-18 21:03:43 -04:00
Kristian Høgsberg
8fc635e6a8 Separate handling of GLX visuals and GLX FBConfigs.
XIDs for GLX visuals and FBConfigs used to be interchangable and the list of
GLX visuals was identical to the list for FBConfigs.  This patch splits handling
of these two data types and allows the X server to pick and choose the FBConfigs
that are exposed as visuals.
2007-10-18 21:03:43 -04:00
Kristian Høgsberg
0af8180683 Drop VisualConfigPriv support from the DRI module.
No DDX driver uses this, and this patch stops the DRI module from
poking around GLX module data structures.
2007-10-18 21:03:43 -04:00
Kristian Høgsberg
7d74690536 Simplify and clean up GLX visual initialization.
Instead of the fragile setup where we filter the modes common between the
DDX generated GLX visuals and the DRI driver generated fbconfigs, we now
just take the fbconfigs returned by the DRI driver to be our supported set.
2007-10-18 21:03:43 -04:00
Eric Anholt
ab4bce02a9 Add a quirk for Philips 107P5 which lacks the preferred bit on detailed timing.
Also fix the prefer-large-75 quirk if the prefer-first-detailed bit was set,
though it's not the case for the existing prefer-large-75 consumer.
2007-10-18 15:22:42 -07:00
Michel Dänzer
ce50bfd336 EXA: Skip empty glyphs. 2007-10-18 17:44:48 +02:00
Michel Dänzer
5d74416740 EXA: Don't attempt to move in pixmaps that can't be accelerated.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=12815 .
2007-10-18 17:44:14 +02:00
José Fonseca
2b5ac0eafd Fix Xgl build. 2007-10-18 10:39:41 +01:00
Alan Hourihane
8cd2200498 ensure finish is called for front buffer rendering. 2007-10-17 11:23:59 +01:00
Alan Hourihane
e4fdef9ec2 Glucose -> GLucose 2007-10-17 10:53:13 +01:00
Keith Packard
feac075952 Make config file preferred mode override monitor preferred mode.
Add a new even-more-preferred bit to each mode which is used to make config
file preferences selected instead of the monitor preferred mode.
2007-10-17 11:42:28 +08:00
Keith Packard
f2da10f7bc KDRIVE_LOCAL_LIBS includes some system libraries, not just internal x server libs 2007-10-17 10:51:02 +08:00
Alan Hourihane
0521f56260 Fix problems after master merge. 2007-10-16 20:02:17 +01:00