mesa/src/glx/x11
Brian Paul a04af335a4 Merge branch 'mesa_7_5_branch'
Conflicts:

	src/mesa/drivers/dri/i915/i915_tex_layout.c
	src/mesa/drivers/dri/i965/brw_wm_glsl.c
	src/mesa/drivers/dri/intel/intel_buffer_objects.c
	src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
	src/mesa/drivers/dri/intel/intel_pixel_draw.c
	src/mesa/main/enums.c
	src/mesa/main/texstate.c
	src/mesa/vbo/vbo_exec_array.c
2009-06-24 08:54:37 -06:00
..
clientattrib.c Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
compsize.c Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
dri2.c DRI2: Implement protocol for DRI2GetBuffersWithFormat 2009-04-24 12:48:20 -07:00
dri2.h DRI2: Implement protocol for DRI2GetBuffersWithFormat 2009-04-24 12:48:20 -07:00
dri2_glx.c dri2: Refresh the fake front contents after glXSwapBuffers(). 2009-06-23 19:31:12 -07:00
dri_common.c Disable SGI_swap_control extension for DRI2 2009-06-22 15:15:20 -07:00
dri_common.h Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
dri_glx.c glx: replace Xmalloc() calls with Xcalloc() 2009-05-04 07:52:55 -06:00
drisw_glx.c Initialize psp->waitX/waitGL for swrast_dri.so. 2009-05-18 12:47:00 +02:00
eval.c Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
glcontextmodes.c Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
glcontextmodes.h Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
glx_pbuffer.c glx: remove unused local var in determineTextureFormat() 2009-04-03 09:07:04 -06:00
glx_query.c glx: no graphics context during initialization 2008-11-26 10:02:11 -07:00
glxclient.h glx: MakeCurrent fixes. 2009-04-02 11:33:20 +02:00
glxcmds.c Also release direct rendering resources in glXDestroyGLXPixmap. 2009-06-19 18:00:49 +02:00
glxcurrent.c GLX: attempt to fix glean makeCurrent test cases. 2009-06-17 08:03:19 -06:00
glxext.c mesa: Resurrect SPARC asm code. 2009-02-26 18:29:48 -07:00
glxextensions.c Make GLX_SGIX_pbuffer mandatory 2009-01-28 16:28:11 -08:00
glxextensions.h Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
glxhash.c Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
glxhash.h Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
indirect.c Thank you git for doing the right thing. 2009-06-03 17:55:42 +01:00
indirect.h regenerate glapi 2009-03-12 15:04:47 +01:00
indirect_init.c regenerate glapi 2009-03-12 15:04:47 +01:00
indirect_init.h Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
indirect_size.c regenerate glapi 2009-03-12 15:04:47 +01:00
indirect_size.h restore FASTCALL stuff 2005-10-20 22:51:50 +00:00
indirect_texture_compression.c Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
indirect_transpose_matrix.c Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
indirect_vertex_array.c Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
indirect_vertex_array.h Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
indirect_vertex_array_priv.h Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
indirect_vertex_program.c define __builtin_expect for non-gcc compilers in two more glx files 2009-03-25 11:07:31 -07:00
indirect_window_pos.c Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
Makefile mesa: Remove left over merge conflicts 2008-09-22 12:47:57 +02:00
packrender.h Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
packsingle.h Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
pixel.c Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
pixelstore.c define __builtin_expect for non-gcc compilers in two more glx files 2009-03-25 11:07:31 -07:00
render2.c Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
renderpix.c Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
single2.c glx: no graphics context during initialization 2008-11-26 10:02:11 -07:00
singlepix.c Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
vertarr.c Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
XF86dri.c Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
xf86dri.h Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
xf86dristr.h Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00
xfont.c Don't mess with emacs tab width. 2008-11-11 13:41:43 -05:00