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

..

.gitignore

Add some missing .gitignore stuff for Mesa symlinks and other generated files.

2006-06-18 19:47:51 -07:00

extension_string.c

Implement GLX_SGI_swap_control.

2006-08-31 13:54:10 -07:00

extension_string.h

Add support for AIGLX drivers to enable GLX extensions that they support.

2006-08-29 14:35:08 -07:00

g_disptab.h

glx: drop duplicate GetDrawableAttributesSGIX declarations.

2007-10-15 11:32:08 +03:00

glxbyteorder.h

glx fixes for XDarwin

2007-02-17 00:55:32 -08:00

glxcmds.c

Add CreatePixmap allocation hints.

2007-11-04 16:11:28 -08:00

glxcmdsswap.c

Fix GLX byteswapping.

2007-10-14 14:59:12 -04:00

glxcontext.h

Weed out some unused fluff from __GLXcontext.

2007-10-26 11:25:57 -04:00

glxdrawable.h

Introduce a new "GlxVisuals" option that controls which visuals are added.

2007-10-18 21:03:43 -04:00

glxdri.c

Weed out some unused fluff from __GLXcontext.

2007-10-26 11:25:57 -04:00

glxext.c

Merge branch 'master' into XACE-SELINUX

2007-11-05 19:08:36 -05:00

glxext.h

Fix GLX byteswapping.

2007-10-14 14:59:12 -04:00

glxglcore.c

GL: fix crash at mesa destruction time

2007-11-05 17:33:01 +01:00

glxscreens.c

Merge branch 'master' into XACE-SELINUX

2007-12-13 18:38:25 -05:00

glxscreens.h

Separate handling of GLX visuals and GLX FBConfigs.

2007-10-18 21:03:43 -04:00

glxserver.h

Introduce a new "GlxVisuals" option that controls which visuals are added.

2007-10-18 21:03:43 -04:00

glxutil.c

Implement ChangeDrawableAttributes so we can support GLX_EVENT_MASK.

2007-10-12 19:15:05 -04:00

glxutil.h

Implement GLX pbuffers.

2007-10-12 19:12:26 -04:00

indirect_dispatch_swap.c

Regenerate GLX dispatch code for recent gl_API.xml changes (#12935).

2007-11-09 05:49:26 -05:00

indirect_dispatch.c

Regenerate GLX dispatch code for recent gl_API.xml changes (#12935).

2007-11-09 05:49:26 -05:00

indirect_dispatch.h

Regenerate GLX dispatch code for recent gl_API.xml changes (#12935).

2007-11-09 05:49:26 -05:00

indirect_program.c

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver

2007-01-04 15:01:38 -08:00

indirect_reqsize.c

Regenerate from Mesa scripts.

2007-01-04 14:55:51 -08:00

indirect_reqsize.h

Regenerate from Mesa scripts.

2007-01-04 14:55:51 -08:00

indirect_size_get.c

Regenerate GLX dispatch code for recent gl_API.xml changes (#12935).

2007-11-09 05:49:26 -05:00

indirect_size_get.h

Fix bug #8608.

2006-10-11 15:41:22 -07:00

indirect_table.c

Regenerate GLX dispatch code for recent gl_API.xml changes (#12935).

2007-11-09 05:49:26 -05:00

indirect_table.h

Fix __glXDispatchInfo::dispatch_functions and

2006-08-23 16:00:48 -07:00

indirect_texture_compression.c

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver

2007-01-04 15:01:38 -08:00

indirect_util.c

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver

2007-01-04 15:01:38 -08:00

indirect_util.h

Convert protocol decode tables for Single, VendorPrivate, and

2006-08-23 13:30:13 -07:00

Makefile.am

Simplify and clean up GLX visual initialization.

2007-10-18 21:03:43 -04:00

render2.c

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

render2swap.c

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

renderpix.c

Death to RCS tags.

2007-06-29 14:06:52 -04:00

renderpixswap.c

Death to RCS tags.

2007-06-29 14:06:52 -04:00

rensize.c

Rename __glXDrawArraysSize to __glXDrawArraysReqSize. This makes its

2006-08-23 14:24:34 -07:00

single2.c

Enable vertex and fragment programs.

2006-08-25 12:05:16 -07:00

single2swap.c

Enable vertex and fragment programs.

2006-08-25 12:05:16 -07:00

singlepix.c

Death to RCS tags.

2007-06-29 14:06:52 -04:00

singlepixswap.c

Fix bug #8608.

2006-10-11 15:41:22 -07:00

singlesize.c

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

singlesize.h

Death to RCS tags.

2007-06-29 14:06:52 -04:00

swap_interval.c

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver

2007-01-04 15:01:38 -08:00

unpack.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

xfont.c

Death to RCS tags.

2007-06-29 14:06:52 -04:00