git.libre-soc.org Git - mesa.git/commit

author	Dave Airlie <airlied@linux.ie>
	Sun, 24 Aug 2008 07:52:40 +0000 (17:52 +1000)
committer	Dave Airlie <airlied@linux.ie>
	Sun, 24 Aug 2008 07:52:40 +0000 (17:52 +1000)
commit	7c81124d7c4a4d1da9f48cbf7e82ab1a3a970a7a
tree	832251b8ecfc3282c1748187350ceb0e3a5cdc9f	tree
parent	a35002c1673a1a37ec79b237dda7e8f6b9c9962a	commit \| diff

Revert "Merge branch 'drm-gem'"

This reverts commit 53675e5c05c0598b7ea206d5c27dbcae786a2c03.

Conflicts:

src/mesa/drivers/dri/i965/brw_wm_surface_state.c

76 files changed:

src/mesa/drivers/dri/Makefile.template		diff \| blob \| history
src/mesa/drivers/dri/common/dri_bufmgr.c	[new file with mode: 0644]	blob
src/mesa/drivers/dri/common/dri_bufmgr.h	[new file with mode: 0644]	blob
src/mesa/drivers/dri/common/dri_bufmgr_fake.c	[new file with mode: 0644]	blob
src/mesa/drivers/dri/common/spantmp2.h		diff \| blob \| history
src/mesa/drivers/dri/i915/Makefile		diff \| blob \| history
src/mesa/drivers/dri/i915/i830_context.c		diff \| blob \| history
src/mesa/drivers/dri/i915/i830_reg.h		diff \| blob \| history
src/mesa/drivers/dri/i915/i830_vtbl.c		diff \| blob \| history
src/mesa/drivers/dri/i915/i915_context.c		diff \| blob \| history
src/mesa/drivers/dri/i915/i915_reg.h		diff \| blob \| history
src/mesa/drivers/dri/i915/i915_vtbl.c		diff \| blob \| history
src/mesa/drivers/dri/i915/intel_bufmgr_ttm.c	[new symlink]	blob
src/mesa/drivers/dri/i915/intel_pixel_read.c		diff \| blob \| history
src/mesa/drivers/dri/i915/intel_render.c		diff \| blob \| history
src/mesa/drivers/dri/i915/intel_tris.c		diff \| blob \| history
src/mesa/drivers/dri/i915/intel_tris.h		diff \| blob \| history
src/mesa/drivers/dri/i965/Makefile		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_cc.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_clip.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_clip_state.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_context.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_context.h		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_curbe.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_defines.h		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_draw.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_draw.h		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_draw_upload.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_fallback.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_gs.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_gs_state.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_misc_state.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_sf.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_sf_state.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_state.h		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_state_cache.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_state_upload.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_urb.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_vs.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_vs_constval.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_vs_state.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_vs_tnl.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_wm.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_wm_sampler_state.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_wm_state.c		diff \| blob \| history
src/mesa/drivers/dri/i965/brw_wm_surface_state.c		diff \| blob \| history
src/mesa/drivers/dri/i965/intel_bufmgr_ttm.c	[new symlink]	blob
src/mesa/drivers/dri/intel/intel_batchbuffer.c		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_batchbuffer.h		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_blit.c		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_blit.h		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_buffer_objects.c		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_buffers.c		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_bufmgr_ttm.c	[new file with mode: 0644]	blob
src/mesa/drivers/dri/intel/intel_bufmgr_ttm.h	[new file with mode: 0644]	blob
src/mesa/drivers/dri/intel/intel_context.c		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_context.h		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_decode.c		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_depthstencil.c		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_fbo.c		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_fbo.h		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_ioctl.c		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_ioctl.h		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_pixel_bitmap.c		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_pixel_copy.c		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_pixel_draw.c		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_reg.h		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_regions.c		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_regions.h		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_screen.c		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_screen.h		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_span.c		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_span.h		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_tex_copy.c		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_tex_image.c		diff \| blob \| history
src/mesa/drivers/dri/intel/intel_tex_validate.c		diff \| blob \| history

RSS Atom