projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2b20b60 6487174)
Merge branch 'mesa_7_7_branch'
authorBrian Paul <brianp@vmware.com>
Fri, 22 Jan 2010 19:17:02 +0000 (12:17 -0700)
committerBrian Paul <brianp@vmware.com>
Fri, 22 Jan 2010 19:17:02 +0000 (12:17 -0700)
commitcd8614b0287dc5a69725ec4ee0208fad61f7789e
tree3ee089b8384e7a60c5c3a3cc87f2a633bd724bbetree
parent2b20b604277e3cdf7afb2431b50dbb05da12ff1ccommit | diff
parent64871747bb7b611ffe429fbf1724bd98ee25dd84commit | diff
Merge branch 'mesa_7_7_branch'

Conflicts:
src/gallium/auxiliary/draw/draw_context.c
src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
src/gallium/auxiliary/pipebuffer/Makefile
src/gallium/auxiliary/pipebuffer/SConscript
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/auxiliary/tgsi/tgsi_scan.c
src/gallium/drivers/i915/i915_surface.c
src/gallium/drivers/i915/i915_texture.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
src/gallium/drivers/llvmpipe/lp_texture.c
src/gallium/drivers/softpipe/sp_prim_vbuf.c
src/gallium/state_trackers/xorg/xorg_dri2.c
src/gallium/winsys/drm/intel/gem/intel_drm_api.c
src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
src/gallium/winsys/drm/radeon/core/radeon_drm.c
src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c
src/mesa/state_tracker/st_cb_clear.c
116 files changed:
src/gallium/auxiliary/Makefile diff1 | diff2 | blob | history
src/gallium/auxiliary/draw/draw_context.c diff1 | diff2 | blob | history
src/gallium/auxiliary/draw/draw_pt.c diff1 | diff2 | blob | history
src/gallium/auxiliary/draw/draw_pt_fetch.c diff1 | diff2 | blob | history
src/gallium/auxiliary/draw/draw_pt_post_vs.c diff1 | diff2 | blob | history
src/gallium/auxiliary/draw/draw_vs_varient.c diff1 | diff2 | blob | history
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c diff1 | diff2 | blob | history
src/gallium/auxiliary/tgsi/tgsi_scan.c diff1 | diff2 | blob | history
src/gallium/auxiliary/util/u_blit.c diff1 | diff2 | blob | history
src/gallium/auxiliary/util/u_gen_mipmap.c diff1 | diff2 | blob | history
src/gallium/drivers/i915/i915_context.c diff1 | diff2 | blob | history
src/gallium/drivers/i915/i915_state.c diff1 | diff2 | blob | history
src/gallium/drivers/i915/i915_state_derived.c diff1 | diff2 | blob | history
src/gallium/drivers/i915/i915_state_sampler.c diff1 | diff2 | blob | history
src/gallium/drivers/i915/i915_surface.c diff1 | diff2 | blob | history
src/gallium/drivers/i915/i915_texture.c diff1 | diff2 | blob | history
src/gallium/drivers/llvmpipe/lp_bld_arit.c diff1 | diff2 | blob | history
src/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c diff1 | diff2 | blob | history
src/gallium/drivers/llvmpipe/lp_draw_arrays.c diff1 | diff2 | blob | history
src/gallium/drivers/llvmpipe/lp_jit.c diff1 | diff2 | blob | history
src/gallium/drivers/llvmpipe/lp_state_fs.c diff1 | diff2 | blob | history
src/gallium/drivers/llvmpipe/lp_state_surface.c diff1 | diff2 | blob | history
src/gallium/drivers/llvmpipe/lp_test_blend.c diff1 | diff2 | blob | history
src/gallium/drivers/llvmpipe/lp_tex_cache.c diff1 | diff2 | blob | history
src/gallium/drivers/llvmpipe/lp_texture.c diff1 | diff2 | blob | history
src/gallium/drivers/llvmpipe/lp_tile_cache.c diff1 | diff2 | blob | history
src/gallium/drivers/softpipe/sp_context.c diff1 | diff2 | blob | history
src/gallium/drivers/softpipe/sp_flush.c diff1 | diff2 | blob | history
src/gallium/drivers/softpipe/sp_prim_vbuf.c diff1 | diff2 | blob | history
src/gallium/drivers/softpipe/sp_quad_depth_test.c diff1 | diff2 | blob | history
src/gallium/drivers/softpipe/sp_setup.c diff1 | diff2 | blob | history
src/gallium/drivers/softpipe/sp_state_surface.c diff1 | diff2 | blob | history
src/gallium/drivers/softpipe/sp_tex_tile_cache.c diff1 | diff2 | blob | history
src/gallium/drivers/softpipe/sp_texture.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_pipe_constants.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_pipe_draw.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_pipe_sampler.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_pipe_vertex.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_pipe_vs.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_screen_buffer.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_screen_texture.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_swtnl_draw.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_swtnl_state.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_tgsi_decl_sm20.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_tgsi_decl_sm30.c diff1 | diff2 | blob | history
src/gallium/include/state_tracker/drm_api.h diff1 | diff2 | blob | history
src/gallium/state_trackers/dri/dri_context.c diff1 | diff2 | blob | history
src/gallium/state_trackers/dri/dri_drawable.c diff1 | diff2 | blob | history
src/gallium/state_trackers/dri/dri_screen.c diff1 | diff2 | blob | history
src/gallium/state_trackers/dri/dri_screen.h diff1 | diff2 | blob | history
src/gallium/state_trackers/wgl/stw_pixelformat.c diff1 | diff2 | blob | history
src/gallium/state_trackers/xorg/xorg_composite.c diff1 | diff2 | blob | history
src/gallium/state_trackers/xorg/xorg_dri2.c diff1 | diff2 | blob | history
src/gallium/state_trackers/xorg/xorg_exa.c diff1 | diff2 | blob | history
src/gallium/state_trackers/xorg/xorg_xv.c diff1 | diff2 | blob | history
src/gallium/winsys/drm/intel/gem/intel_drm_api.c diff1 | diff2 | blob | history
src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c diff1 | diff2 | blob | history
src/gallium/winsys/drm/radeon/core/radeon_drm.c diff1 | diff2 | blob | history
src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c diff1 | diff2 | blob | history
src/gallium/winsys/xlib/xlib_softpipe.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/ffb/ffb_bitmap.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/ffb/ffb_clear.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/ffb/ffb_depth.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/ffb/ffb_span.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/ffb/ffb_state.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/ffb/ffb_stencil.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/ffb/ffb_xmesa.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i810/i810context.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i810/i810screen.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i810/i810state.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i810/i810tex.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/mach64/mach64_context.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/mach64/mach64_lock.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/mach64/mach64_screen.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/mach64/mach64_span.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/mach64/mach64_state.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/mach64/mach64_tex.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/r600/r600_texstate.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/r600/r700_state.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/unichrome/via_context.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/unichrome/via_ioctl.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/unichrome/via_screen.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/unichrome/via_state.c diff1 | diff2 | blob | history
src/mesa/main/attrib.c diff1 | diff2 | blob | history
src/mesa/main/blend.c diff1 | diff2 | blob | history
src/mesa/main/dlist.c diff1 | diff2 | blob | history
src/mesa/main/enable.c diff1 | diff2 | blob | history
src/mesa/main/fbobject.c diff1 | diff2 | blob | history
src/mesa/main/image.c diff1 | diff2 | blob | history
src/mesa/main/texgetimage.c diff1 | diff2 | blob | history
src/mesa/main/texobj.c diff1 | diff2 | blob | history
src/mesa/main/texparam.c diff1 | diff2 | blob | history
src/mesa/shader/arbprogparse.c diff1 | diff2 | blob | history
src/mesa/shader/prog_execute.c diff1 | diff2 | blob | history
src/mesa/shader/slang/slang_compile.c diff1 | diff2 | blob | history
src/mesa/shader/slang/slang_emit.c diff1 | diff2 | blob | history
src/mesa/shader/slang/slang_link.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_atom_framebuffer.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_atom_pixeltransfer.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_atom_sampler.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_atom_shader.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_cb_accum.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_cb_bitmap.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_cb_clear.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_cb_drawpixels.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_cb_fbo.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_cb_program.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_cb_queryobj.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_cb_readpixels.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_cb_texture.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_context.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_draw_feedback.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_extensions.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_format.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_gen_mipmap.c diff1 | diff2 | blob | history
src/mesa/swrast/s_span.c diff1 | diff2 | blob | history