Commit Graph

2475 Commits

Author SHA1 Message Date
Zephaniah E. Hull
8d709f0280 Remove a merge artifact so that we can compile. 2006-09-10 15:48:35 -04:00
Zephaniah E. Hull
60db190ecf Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-09-10 03:49:17 -04:00
Drew Parsons
65256109bb * Define XPSERVERLIST with /etc/init.d/xprint get_xpserverlist
instead of `/bin/sh /etc/init.d/xprint get_xpserverlist`
	- allows the initscript to set its own different shell under #!
	- allows disabling of XPSERVERLIST by making the script non-executable
* Allow files to be installed by using dist_*_DATA instead of EXTRA_DIST.
  Also, use dist_*_SCRIPTS to install scripts.
* Fix minor typos in man pages.
2006-09-10 17:40:37 +10:00
Kristian Høgsberg
86450998da Fix AIGLX VT switching.
See https://bugs.freedesktop.org/show_bug.cgi?id=7916

There may be a simpler, less intrusive fix that involves just rearranging
DRI locking between 2D and 3D drivers around VT switch.
2006-09-07 15:35:16 -04:00
Daniel Stone
5e9d33fe87 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-09-07 15:43:31 +03:00
Daniel Stone
629798c73a XkbCopyKeymap/SrvXkbCopyKeymap: free geom harder, add cheery comments
Unconditionally free geometry when copying the keymap (so we have none on
core, oh well), add a couple of heartening comments.
2006-09-07 15:17:04 +03:00
Ian Romanick
64479fffa2 Remove prototypes and externs for non-existant functions and variables. 2006-09-06 16:13:21 -07:00
Ian Romanick
a0179281a6 Remove prototypes for non-existant functions. 2006-09-06 15:45:48 -07:00
Michel Dänzer
8356be492c Make sure _XSERVER64 is defined when it should be and gets tested. 2006-09-06 15:20:55 +02:00
Michel Dänzer
f6ce0839ba Fix #include paths for fontcacheproto headers. 2006-09-06 13:18:02 +02:00
Aaron Plattner
410e5b1d73 (unsigned long)(1 << 31) = bad news on x86_64. 2006-09-05 15:23:54 -07:00
Ian Romanick
c2813514cf Add missing file from previous commit. 2006-08-31 15:36:13 -07:00
Ian Romanick
0f9cfb2f75 Implement GLX_SGI_swap_control.
Regenerate from glX_API.xml 1.2.  Add infrastructure to support
GLX_SGI_swap_control for AIGLX when the DRI driver enables it.  Tested
with R300.
2006-08-31 13:54:10 -07:00
Ian Romanick
a9ef586291 Fix problems with vertex program protocol
There were two sets of bugs in the vertex program (ARB and NV)
protocol.  First, several of the ARB functions were missing the
'doubles_in_order="true"' annotation.  Second, after the ARB decided
that glVertexAttrib*ARB functions must not alias fixed-function state
for GLSL, Nvidia re-assigned GLX protocol opcodes for
glVertexAttrib*NV (circa Septeber 2004).  For some reason gl_API.xml
was never updated to reflect this, and the updated version of the
GL_NV_vertex_program spec never made into the registry.

This is just a server-side regeneration from gl_API.xml version 1.68.
2006-08-31 13:47:50 -07:00
Matthew Allum
69d5becce4 Fix previous commit breaking other kdrives pulling in fbdev.a 2006-08-31 17:30:24 +01:00
Matthew Allum
fd609956f2 Add framebuffer device command line switch for Xfbdev 2006-08-31 17:18:57 +01:00
Ian Romanick
2fb7b8795a Minor extension tweaks.
GLX_EXT_texture_from_pixmap should always be enabled.
GLX_SGI_video_sync is only for direct rendering and should never
appear in the server's string.
2006-08-29 16:35:32 -07:00
Ian Romanick
1c8851ad49 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-08-29 16:34:04 -07:00
Ian Romanick
d59b52fc08 Make sure unsupported extensions are disabled.
GLX protocol isn't supported for GLX_SGI_swap_control or
GLX_SGI_video_sync.  Remove them from the list of available extensions
until they are supported.
2006-08-29 14:40:13 -07:00
Ian Romanick
db6d04d4b8 Add support for AIGLX drivers to enable GLX extensions that they support. 2006-08-29 14:35:08 -07:00
Matthew Allum
5ddbf4bcd4 Re-add support for tslib (1.0 release) and Xcalibrate extension. 2006-08-29 22:07:15 +01:00
Daniel Stone
4524a2bf6f configure.ac: move tslib from KDRIVE_PURE_LIBS to KDRIVE_LIBS
Yeah.  That was dumb.
2006-08-29 23:49:26 +03:00
Ian Romanick
942b436999 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-08-29 13:30:37 -07:00
Ian Romanick
77d315bd2f Remove __glXNoSuchRenderOpcode because it is no longer used. 2006-08-29 13:30:20 -07:00
Daniel Stone
260c3f32b6 configure.ac: fix XSDL test 2006-08-29 23:18:12 +03:00
Daniel Stone
393dc0a338 kdrive: remove @KDRIVE_LIBS@ from Xfoo_DEPENDENCIES 2006-08-29 22:53:54 +03:00
Daniel Stone
cff23616fe configure.ac: allow disabling of XSDL 2006-08-29 22:44:09 +03:00
Daniel Stone
89d272bb18 [PATCH] kdrive/linux keyboard: remove more debugging spew 2006-08-29 15:18:25 +03:00
Daniel Stone
bd6f539ff9 [PATCH] kdrive/linux keyboard: silence excessive debugging noise 2006-08-29 15:18:23 +03:00
Daniel Stone
5436fce090 [PATCH] GetKeyboardValutorEvents: be even more careful
Don't accept devices without a keyboard feedback class.
2006-08-29 15:18:06 +03:00
Daniel Stone
0eb7299f44 [PATCH] XkbCopyKeymap: still more range fixes
Make sure we don't stomp preserve if it doesn't already exist, and fix a
couple of range-related thinkos in level name copying.
2006-08-29 15:17:56 +03:00
Daniel Stone
7fa3383e3c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-08-29 15:16:01 +03:00
Adam Jackson
ebbdc1342a Remove calls to LoaderCheckUnresolved(), since it's now a stub. 2006-08-28 18:17:32 -04:00
Daniel Stone
8d77d44fda Merge branch 'origin' into input-hotplug 2006-08-27 23:08:49 +03:00
Ian Romanick
2fde560bbb Enable GL_EXT_texture_filter_anisotropic and GL_EXT_blend_equation_separate.
Re-generate from gl_API.xml 1.65.  This provides the missing bits for
GL_EXT_texture_filter_anisotropic and GL_EXT_blend_equation_separate.
Enable those extensions.
2006-08-25 13:01:51 -07:00
Ian Romanick
e2d529963e Enable vertex and fragment programs.
Implement glGetProgramStringARB and glGetProgramStringNV.  With these
functions implemented, GL_ARB_{vertex,fragment}_program,
GL_NV_{vertex,fragment}_program, and related extensions can be enabled.
2006-08-25 12:05:16 -07:00
Daniel Stone
d6f36bd280 xfree86/parser: use 'kbd' driver when 'keyboard' specified
Now that we've completely ditched the old driver, we should probably make a
best-effort attempt to keep configs working.
2006-08-25 12:43:17 +03:00
Daniel Stone
7c4167f0d6 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-08-25 11:15:33 +03:00
Daniel Stone
393f8347ed xorgconf.cpp: kbd, not keyboard 2006-08-25 10:46:32 +03:00
Ian Romanick
c33e39c86b Finish support for GL_ARB_texture_compression.
Fill in __glXDisp_GetCompressedTexImageARB and
__glXDispSwap_GetCompressedTexImageARB to finish support for
GL_ARB_texture_compression.  With this extension (and the related
compression extensions), the server-side GLX supports all of the
protocol for GL 1.4.  w00t!

The bad news is that this has received only minimal testing, and Mesa
does not contain any good tests for GL_ARB_texture_compression.
2006-08-24 20:33:57 -07:00
Ian Romanick
cd2da4e41e Remove GL/glx/g_disptab.c, GL/glx/g_disptab_EXT.c, and
GL/glx/g_disptab_EXT.h.  Unfortunately GL/glx/g_disptab.h has to be
kept around a bit longer.
2006-08-24 18:00:16 -07:00
Ian Romanick
a29e6dd2d2 Add some missing bits of GL_SGI_color_table. 2006-08-24 17:58:52 -07:00
Ian Romanick
ae608b2071 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-08-24 14:56:33 -07:00
Ian Romanick
2c865277fe Regenerate from gl_API.xml 1.63. Enable extensions.
gl_API.xml 1.63 corrects some problems with GLX protocol for
GL_EXT_paletted_texture and GL_SGI_color_table.  Regenerate from that
file, and enable those extensions and GL_EXT_shared_texture_palette.
2006-08-24 14:54:49 -07:00
Ian Romanick
7d5de5c665 Regenerate from gl_API.xml 1.62. Functions move, no real changes. 2006-08-24 14:49:46 -07:00
Daniel Stone
3a36b0a24a Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-08-24 23:35:28 +03:00
Daniel Stone
db1ab1bdb2 XkbCopyKeymap: fix various range issues
Fix a bunch of range issues caused by incorrect assumptions (e.g. that the
design was at least halfway sensible), and copy types by hand, instead of
just blindly memcpy()ing the lot, since it itself cleverly contains a ton
of allocated pointers.
2006-08-24 23:33:59 +03:00
Daniel Stone
5fb8d947bb configure.ac: more thinkos
Fix auto tests for vidmode and xf86dga.  I win at life.
2006-08-24 23:16:43 +03:00
Daniel Stone
4e37c07ba6 config: clean up debugging messages, make failure to acquire name fatal
Bomb with FatalError when we can't acquire the bus and name.
Clean up a bunch of debugging ErrorFs to be hidden behind #ifdef DEBUG.
2006-08-24 23:16:17 +03:00
Adam Jackson
b879356ce9 More #ifdef USE_DEPRECATED_KEYBOARD_DRIVER. 2006-08-24 15:50:15 -04:00