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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								497aba8949 
								
							 
						 
						
							
							
								
								Weed out some unused fluff from __GLXcontext.  
							
							
							
						 
						
							2007-10-26 11:25:57 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								30bcaa966d 
								
							 
						 
						
							
							
								
								Make glx destroy path handle cases where the X window goes away first.  
							
							
							
						 
						
							2007-10-25 18:49:02 -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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								c6d36b1cee 
								
							 
						 
						
							
							
								
								GLX: Don't crash on unused client array members when switching to/from console.  
							
							
							
						 
						
							2007-10-22 18:28:03 +02:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								50b27e1ad2 
								
							 
						 
						
							
							
								
								devPrivates rework: update new GL/glxext code.  
							
							... 
							
							
							
							Need to merge so this type of thing stops happening. 
							
						 
						
							2007-10-17 16:09:40 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								9dde53ed17 
								
							 
						 
						
							
							
								
								Fix walking of GLX providers.  
							
							
							
						 
						
							2007-10-16 19:55:56 +01:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								d7ded953c4 
								
							 
						 
						
							
							
								
								Implment GLXPixmaps.  
							
							
							
						 
						
							2007-10-12 18:26:55 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								600028305c 
								
							 
						 
						
							
							
								
								Move hyperpipe and swapbarrier extension funcs to screen private struct.  
							
							... 
							
							
							
							This gets rid of a couple more global arrays and gets the two extensions
more in line with the general extension mechanism. 
							
						 
						
							2007-10-12 16:18:23 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								781515bb63 
								
							 
						 
						
							
							
								
								Convert GLX module to use screen private indexes like everything else.  
							
							
							
						 
						
							2007-10-12 16:18:19 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								72a3d68a2f 
								
							 
						 
						
							
							
								
								Update the AIGLX DRI loader to use the new DRI interface.  
							
							... 
							
							
							
							This lets us drop a bunch of workarounds and use the new DRI extension
mechanism. 
							
						 
						
							2007-10-12 15:51:47 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								161624a5a4 
								
							 
						 
						
							
							
								
								GLX: Only build code dealing with GLXPixmap damage field when DRI is enabled.  
							
							
							
						 
						
							2007-07-10 09:02:40 +02:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								4abd00dab7 
								
							 
						 
						
							
							
								
								Make sure DRI drawables are cleaned up when client dies.  
							
							... 
							
							
							
							The previous scheme didn't work when the client didn't create the core drawable,
e.g. the root or composite overlay window. Use refcounting via special client
resources to fix that. 
							
						 
						
							2007-07-10 09:02:08 +02:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								6324bfc468 
								
							 
						 
						
							
							
								
								AIGLX: Zero-copy texture-from-pixmap.  
							
							... 
							
							
							
							When available, use the 2D driver texOffsetStart hook and the 3D driver
setTexOffset hook to save the overhead of passing the pixmap data to
glTex(Sub)Image.
The basic idea is to update the driver specific 'offset' for bound pixmaps
before dispatching a GLX render request and to flush immediately afterwards
if there are any pixmaps bound. This should ensure that the 3D driver can
use pixmaps for texturing directly regardless of the X server moving them
around. 
							
						 
						
							2007-05-22 10:51:53 +02:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								a4e2fc7034 
								
							 
						 
						
							
							
								
								glx: Remove stray __GLinterface.  
							
							... 
							
							
							
							__GLinterface was droped from glcore.h 
							
						 
						
							2007-04-05 19:13:47 +03:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								f17e3c34df 
								
							 
						 
						
							
							
								
								Fix GL context destruction with AIGLX.  
							
							... 
							
							
							
							The logic for freeing GL contexts introduced by "Fix AIGLX VT switching." is
inverted. As it is now, GL context destruction is deferred for glxDRIEnterVT(). 
							
						 
						
							2006-11-16 22:14:53 +02:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								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 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								77d315bd2f 
								
							 
						 
						
							
							
								
								Remove __glXNoSuchRenderOpcode because it is no longer used.  
							
							
							
						 
						
							2006-08-29 13:30:20 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								d7a7f12361 
								
							 
						 
						
							
							
								
								Convert protocol decode tables for Single, VendorPrivate, and  
							
							... 
							
							
							
							VendorPrivateWithReply message to use nice, compact N-way search trees
generated by scripts in Mesa.
The Render protocol decode tables are next... 
							
						 
						
							2006-08-23 13:30:13 -07:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								8977b07434 
								
							 
						 
						
							
							
								
								glx: fix typo from tag removal  
							
							
							
						 
						
							2006-07-23 03:50:52 +10:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0aaac95b0d 
								
							 
						 
						
							
							
								
								Remove RCS tags.  Fix Xprint makefile braindamage.  
							
							
							
						 
						
							2006-07-21 17:56:00 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								8b5bc6a9ab 
								
							 
						 
						
							
							
								
								Drop global GLX error integer variables and use __glXError() instead.  
							
							... 
							
							
							
							Also drop glxerror.h (__glXError is now declared in glxserver.h)
and global.c (last remaining globals are in glxext.c now).
With this change we now support all GLX 1.3 error codes. 
							
						 
						
							2006-07-06 00:28:53 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								54d9acd511 
								
							 
						 
						
							
							
								
								Add damage tracking to GLX_EXT_tfp implementation.  
							
							... 
							
							
							
							- Only update when pixmap content actually change;
- Only update the regions that acutally changed.
This is a worthwhile optimization, but it doesn't completely remove
the bottleneck, as mesa still uploads then entire texture whenever
it changes. 
							
						 
						
							2006-06-27 19:44:52 -04:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								2d2d38d17c 
								
							 
						 
						
							
							
								
								Check for glproto when building GLX and make sure we have at least 1.4.6.  
							
							... 
							
							
							
							Drop glx_ansic.h wrapper and call xalloc, xrealloc, xfree and str-funcs
    directly. 
							
						 
						
							2006-03-17 01:47:25 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								c3342c8000 
								
							 
						 
						
							
							
								
								Merge accel_indirect branch to HEAD.  
							
							
							
						 
						
							2006-03-12 00:11:34 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								61cd478b54 
								
							 
						 
						
							
							
								
								Bug  #3652 : Server-side GLX support for GLX_SGIX_swap_barrier and  
							
							... 
							
							
							
							GLX_SGIX_hyperpipe extensions. (Eric Kunze, SGI) 
							
						 
						
							2005-10-05 22:39:41 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								e03198972c 
								
							 
						 
						
							
							
								
								Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.  
							
							... 
							
							
							
							Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
    source files in the xserver/xorg tree, predicated on defines of
    HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
    <X11/fonts/foo.h>. 
							
						 
						
							2005-07-03 07:02:09 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								547c47aaea 
								
							 
						 
						
							
							
								
								Bug  #3407 : Clean out ancient #ifdef X11R5 conditionals.  
							
							
							
						 
						
							2005-05-30 18:36:19 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								799208dd44 
								
							 
						 
						
							
							
								
								Bug  #377 : Make lib{glx,GLcore,dri} work when compiled as dlloader modules.  
							
							
							
						 
						
							2004-07-26 19:06:04 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								2e1868b560 
								
							 
						 
						
							
							
								
								DRI trunk-20040613 import  
							
							
							
						 
						
							2004-06-16 09:25:21 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								22bad9474b 
								
							 
						 
						
							
							
								
								DRI XFree86-4_3_99_12-merge import  
							
							
							
						 
						
							2004-06-16 09:22:17 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								0664db19bf 
								
							 
						 
						
							
							
								
								Merging XORG-CURRENT into trunk  
							
							
							
						 
						
							2004-04-23 18:54:16 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								dae90c3af9 
								
							 
						 
						
							
							
								
								Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004  
							
							
							
						 
						
							2004-03-14 08:34:49 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								867451f1ab 
								
							 
						 
						
							
							
								
								Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004  
							
							
							
						 
						
							2004-03-03 12:12:50 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								df0313d35b 
								
							 
						 
						
							
							
								
								readding XFree86's cvs IDs  
							
							
							
						 
						
							2004-02-26 13:36:15 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								147aae87fd 
								
							 
						 
						
							
							
								
								Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004  
							
							
							
						 
						
							2004-02-26 09:23:53 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								4ee0a53de8 
								
							 
						 
						
							
							
								
								Import most of XFree86 4.4RC3. This import excludes files which have the  
							
							... 
							
							
							
							new license. If we want to, later we can import 4.4RC3 again and pick
    up the files that have the new license, but for now the vendor branch
    is "pure." 
							
						 
						
							2004-02-23 20:35:22 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								adc7f9a4eb 
								
							 
						 
						
							
							
								
								XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks  
							
							
							
						 
						
							2003-11-25 19:29:01 +00:00 
							 
					 
				
					
						
							
							
								 
						
							
							
							
							
								
							
							
								9508a382f8 
								
							 
						 
						
							
							
								
								Initial revision  
							
							
							
						 
						
							2003-11-14 16:48:57 +00:00