[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

mesa: Changes to 'ubuntu'



 ChangeLog                                                 | 3092 ++++++++++++++
 Makefile                                                  |    2 
 SConstruct                                                |    2 
 configs/darwin                                            |    2 
 configs/default                                           |    2 
 debian/changelog                                          |   46 
 debian/control                                            |    4 
 debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch      |    2 
 debian/patches/03_optional-progs-and-install.patch        |    2 
 debian/patches/05_hurd-ftbfs.diff                         |   31 
 debian/patches/06_kfreebsd-ftbfs.diff                     |    8 
 debian/rules                                              |    4 
 docs/envvars.html                                         |   19 
 docs/lists.html                                           |   31 
 docs/news.html                                            |    6 
 docs/relnotes-7.6.1.html                                  |    2 
 docs/relnotes-7.7.1.html                                  |   51 
 docs/relnotes-7.7.html                                    |    2 
 docs/relnotes.html                                        |    1 
 progs/demos/Makefile                                      |    7 
 progs/demos/engine.c                                      |   18 
 progs/demos/fbotexture.c                                  |    1 
 progs/demos/fire.c                                        |   10 
 progs/demos/geartrain.c                                   |   21 
 progs/demos/isosurf.c                                     |    9 
 progs/demos/morph3d.c                                     |    1 
 progs/demos/shadowtex.c                                   |    1 
 progs/demos/terrain.c                                     |    5 
 progs/glsl/convolutions.c                                 |    2 
 progs/glsl/shtest.c                                       |   10 
 progs/glsl/vert-tex.c                                     |    9 
 progs/redbook/aapoly.c                                    |    1 
 progs/samples/olympic.c                                   |   20 
 progs/samples/overlay.c                                   |   18 
 progs/samples/rgbtoppm.c                                  |   31 
 progs/samples/sphere.c                                    |   30 
 progs/samples/star.c                                      |   20 
 progs/samples/stretch.c                                   |   20 
 progs/samples/wave.c                                      |    2 
 progs/util/readtex.c                                      |   20 
 progs/xdemos/corender.c                                   |    1 
 progs/xdemos/glsync.c                                     |    2 
 progs/xdemos/glxgears.c                                   |    1 
 progs/xdemos/glxheads.c                                   |   32 
 progs/xdemos/manywin.c                                    |   34 
 progs/xdemos/sharedtex_mt.c                               |    4 
 src/gallium/auxiliary/draw/draw_context.c                 |    3 
 src/gallium/auxiliary/draw/draw_pipe.c                    |   44 
 src/gallium/auxiliary/draw/draw_pt.c                      |    1 
 src/gallium/auxiliary/draw/draw_pt_fetch.c                |    1 
 src/gallium/auxiliary/draw/draw_pt_fetch_shade_emit.c     |    1 
 src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c |    1 
 src/gallium/auxiliary/draw/draw_pt_post_vs.c              |    1 
 src/gallium/auxiliary/draw/draw_vs_varient.c              |    1 
 src/gallium/auxiliary/pipebuffer/Makefile                 |    1 
 src/gallium/auxiliary/pipebuffer/SConscript               |    1 
 src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c       | 1068 +++-
 src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.h       |   37 
 src/gallium/auxiliary/pipebuffer/pb_bufmgr.h              |    4 
 src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c        |    3 
 src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c       |  152 
 src/gallium/auxiliary/pipebuffer/pb_validate.c            |    1 
 src/gallium/auxiliary/rbug/rbug_context.h                 |    2 
 src/gallium/auxiliary/rbug/rbug_proto.h                   |    2 
 src/gallium/auxiliary/rtasm/rtasm_execmem.c               |   32 
 src/gallium/auxiliary/tgsi/tgsi_exec.c                    |    8 
 src/gallium/auxiliary/tgsi/tgsi_scan.c                    |   10 
 src/gallium/auxiliary/tgsi/tgsi_sse2.c                    |   50 
 src/gallium/auxiliary/tgsi/tgsi_ureg.c                    |    8 
 src/gallium/auxiliary/util/Makefile                       |    1 
 src/gallium/auxiliary/util/u_bitmask.c                    |   32 
 src/gallium/auxiliary/util/u_blit.c                       |    4 
 src/gallium/auxiliary/util/u_clear.h                      |    2 
 src/gallium/auxiliary/util/u_debug.c                      |    6 
 src/gallium/auxiliary/util/u_debug.h                      |    2 
 src/gallium/auxiliary/util/u_debug_memory.c               |    8 
 src/gallium/auxiliary/util/u_format.h                     |    2 
 src/gallium/auxiliary/util/u_gen_mipmap.c                 |    4 
 src/gallium/auxiliary/util/u_network.c                    |    8 
 src/gallium/auxiliary/util/u_network.h                    |    2 
 src/gallium/auxiliary/util/u_stream_stdc.c                |    2 
 src/gallium/auxiliary/util/u_tile.c                       |    2 
 src/gallium/auxiliary/util/u_upload_mgr.c                 |    4 
 src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c          |   11 
 src/gallium/drivers/i915/i915_buffer.c                    |    1 
 src/gallium/drivers/i915/i915_clear.c                     |    1 
 src/gallium/drivers/i915/i915_context.c                   |    3 
 src/gallium/drivers/i915/i915_debug.c                     |    1 
 src/gallium/drivers/i915/i915_debug_fp.c                  |    1 
 src/gallium/drivers/i915/i915_state.c                     |    6 
 src/gallium/drivers/i915/i915_state_derived.c             |    1 
 src/gallium/drivers/i915/i915_state_sampler.c             |    1 
 src/gallium/drivers/i915/i915_surface.c                   |    6 
 src/gallium/drivers/i915/i915_texture.c                   |    2 
 src/gallium/drivers/llvmpipe/lp_bld_alpha.c               |    1 
 src/gallium/drivers/llvmpipe/lp_bld_arit.c                |   12 
 src/gallium/drivers/llvmpipe/lp_bld_blend_aos.c           |    2 
 src/gallium/drivers/llvmpipe/lp_bld_blend_soa.c           |    1 
 src/gallium/drivers/llvmpipe/lp_bld_conv.c                |    2 
 src/gallium/drivers/llvmpipe/lp_bld_depth.c               |    2 
 src/gallium/drivers/llvmpipe/lp_bld_flow.c                |    2 
 src/gallium/drivers/llvmpipe/lp_bld_format_aos.c          |    3 
 src/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c            |   13 
 src/gallium/drivers/llvmpipe/lp_debug.h                   |   71 
 src/gallium/drivers/llvmpipe/lp_draw_arrays.c             |   10 
 src/gallium/drivers/llvmpipe/lp_flush.c                   |    2 
 src/gallium/drivers/llvmpipe/lp_jit.c                     |    3 
 src/gallium/drivers/llvmpipe/lp_prim_vbuf.c               |    1 
 src/gallium/drivers/llvmpipe/lp_screen.c                  |   80 
 src/gallium/drivers/llvmpipe/lp_setup.c                   |    1 
 src/gallium/drivers/llvmpipe/lp_state_blend.c             |   18 
 src/gallium/drivers/llvmpipe/lp_state_fs.c                |  159 
 src/gallium/drivers/llvmpipe/lp_state_rasterizer.c        |    9 
 src/gallium/drivers/llvmpipe/lp_state_surface.c           |    3 
 src/gallium/drivers/llvmpipe/lp_state_vertex.c            |    1 
 src/gallium/drivers/llvmpipe/lp_state_vs.c                |   13 
 src/gallium/drivers/llvmpipe/lp_test_blend.c              |    1 
 src/gallium/drivers/llvmpipe/lp_test_conv.c               |    2 
 src/gallium/drivers/llvmpipe/lp_tex_cache.c               |    1 
 src/gallium/drivers/llvmpipe/lp_tex_cache.h               |    2 
 src/gallium/drivers/llvmpipe/lp_tex_sample_c.c            |    3 
 src/gallium/drivers/llvmpipe/lp_tex_sample_llvm.c         |    1 
 src/gallium/drivers/llvmpipe/lp_texture.c                 |    2 
 src/gallium/drivers/llvmpipe/lp_tile_cache.c              |    2 
 src/gallium/drivers/llvmpipe/lp_tile_soa.h                |    2 
 src/gallium/drivers/llvmpipe/lp_winsys.h                  |    2 
 src/gallium/drivers/nv50/nv50_query.c                     |    2 
 src/gallium/drivers/r300/r300_cs.h                        |    2 
 src/gallium/drivers/r300/r300_emit.c                      |    4 
 src/gallium/drivers/r300/r300_flush.c                     |    1 
 src/gallium/drivers/r300/r300_reg.h                       |   16 
 src/gallium/drivers/r300/r300_state_derived.c             |    2 
 src/gallium/drivers/softpipe/sp_context.c                 |    1 
 src/gallium/drivers/softpipe/sp_flush.c                   |    2 
 src/gallium/drivers/softpipe/sp_prim_vbuf.c               |    3 
 src/gallium/drivers/softpipe/sp_quad_blend.c              |    3 
 src/gallium/drivers/softpipe/sp_quad_depth_test.c         |    4 
 src/gallium/drivers/softpipe/sp_quad_fs.c                 |    2 
 src/gallium/drivers/softpipe/sp_setup.c                   |    1 
 src/gallium/drivers/softpipe/sp_state_blend.c             |    5 
 src/gallium/drivers/softpipe/sp_state_fs.c                |   11 
 src/gallium/drivers/softpipe/sp_state_rasterizer.c        |    9 
 src/gallium/drivers/softpipe/sp_state_surface.c           |    3 
 src/gallium/drivers/softpipe/sp_state_vertex.c            |    1 
 src/gallium/drivers/softpipe/sp_tex_tile_cache.c          |    1 
 src/gallium/drivers/softpipe/sp_texture.c                 |    1 
 src/gallium/drivers/svga/svga_context.c                   |   45 
 src/gallium/drivers/svga/svga_context.h                   |   13 
 src/gallium/drivers/svga/svga_draw.c                      |    3 
 src/gallium/drivers/svga/svga_draw_arrays.c               |    1 
 src/gallium/drivers/svga/svga_draw_elements.c             |    1 
 src/gallium/drivers/svga/svga_pipe_blend.c                |    8 
 src/gallium/drivers/svga/svga_pipe_constants.c            |    3 
 src/gallium/drivers/svga/svga_pipe_depthstencil.c         |    1 
 src/gallium/drivers/svga/svga_pipe_draw.c                 |    4 
 src/gallium/drivers/svga/svga_pipe_flush.c                |    5 
 src/gallium/drivers/svga/svga_pipe_fs.c                   |   12 
 src/gallium/drivers/svga/svga_pipe_misc.c                 |    6 
 src/gallium/drivers/svga/svga_pipe_query.c                |    1 
 src/gallium/drivers/svga/svga_pipe_rasterizer.c           |    1 
 src/gallium/drivers/svga/svga_pipe_sampler.c              |    3 
 src/gallium/drivers/svga/svga_pipe_vertex.c               |    4 
 src/gallium/drivers/svga/svga_pipe_vs.c                   |   11 
 src/gallium/drivers/svga/svga_screen.c                    |    4 
 src/gallium/drivers/svga/svga_screen.h                    |    6 
 src/gallium/drivers/svga/svga_screen_buffer.c             |  166 
 src/gallium/drivers/svga/svga_screen_buffer.h             |    8 
 src/gallium/drivers/svga/svga_screen_texture.c            |   72 
 src/gallium/drivers/svga/svga_state_framebuffer.c         |    2 
 src/gallium/drivers/svga/svga_state_fs.c                  |  139 
 src/gallium/drivers/svga/svga_state_rss.c                 |    3 
 src/gallium/drivers/svga/svga_state_tss.c                 |    2 
 src/gallium/drivers/svga/svga_state_vs.c                  |   24 
 src/gallium/drivers/svga/svga_swtnl_backend.c             |   15 
 src/gallium/drivers/svga/svga_swtnl_draw.c                |    1 
 src/gallium/drivers/svga/svga_swtnl_state.c               |    1 
 src/gallium/drivers/svga/svga_tgsi.c                      |    2 
 src/gallium/drivers/svga/svga_tgsi.h                      |    1 
 src/gallium/drivers/svga/svga_tgsi_decl_sm20.c            |    3 
 src/gallium/drivers/svga/svga_tgsi_decl_sm30.c            |   16 
 src/gallium/drivers/svga/svga_tgsi_insn.c                 |   34 
 src/gallium/drivers/svga/svga_winsys.h                    |    6 
 src/gallium/drivers/trace/tr_context.c                    |    2 
 src/gallium/drivers/trace/tr_drm.c                        |    1 
 src/gallium/drivers/trace/tr_dump.c                       |    4 
 src/gallium/drivers/trace/tr_rbug.c                       |    6 
 src/gallium/drivers/trace/tr_state.h                      |    2 
 src/gallium/include/pipe/p_inlines.h                      |   41 
 src/gallium/include/pipe/p_screen.h                       |    5 
 src/gallium/include/state_tracker/drm_api.h               |    5 
 src/gallium/state_trackers/dri/dri_context.c              |    6 
 src/gallium/state_trackers/dri/dri_drawable.c             |   19 
 src/gallium/state_trackers/dri/dri_drawable.h             |    3 
 src/gallium/state_trackers/dri/dri_screen.c               |   16 
 src/gallium/state_trackers/dri/dri_screen.h               |    1 
 src/gallium/state_trackers/egl/egl_surface.c              |    4 
 src/gallium/state_trackers/egl/egl_tracker.c              |    3 
 src/gallium/state_trackers/glx/xlib/glx_api.c             |    1 
 src/gallium/state_trackers/python/SConscript              |    1 
 src/gallium/state_trackers/python/retrace/interpreter.py  |    2 
 src/gallium/state_trackers/vega/api_path.c                |    3 
 src/gallium/state_trackers/vega/arc.c                     |    2 
 src/gallium/state_trackers/vega/bezier.c                  |    1 
 src/gallium/state_trackers/vega/shader.c                  |    4 
 src/gallium/state_trackers/vega/stroker.c                 |    4 
 src/gallium/state_trackers/vega/vg_tracker.c              |    1 
 src/gallium/state_trackers/wgl/stw_pixelformat.c          |    5 
 src/gallium/state_trackers/xorg/xorg_composite.c          |    3 
 src/gallium/state_trackers/xorg/xorg_crtc.c               |   14 
 src/gallium/state_trackers/xorg/xorg_dri2.c               |   50 
 src/gallium/state_trackers/xorg/xorg_driver.c             |  129 
 src/gallium/state_trackers/xorg/xorg_exa.c                |    5 
 src/gallium/state_trackers/xorg/xorg_exa_tgsi.c           |   35 
 src/gallium/state_trackers/xorg/xorg_output.c             |    2 
 src/gallium/state_trackers/xorg/xorg_renderer.c           |    1 
 src/gallium/state_trackers/xorg/xorg_tracker.h            |    1 
 src/gallium/state_trackers/xorg/xorg_winsys.h             |    1 
 src/gallium/state_trackers/xorg/xorg_xv.c                 |   10 
 src/gallium/winsys/drm/intel/gem/intel_drm_api.c          |    1 
 src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c      |    1 
 src/gallium/winsys/drm/radeon/core/radeon_drm.c           |    1 
 src/gallium/winsys/drm/vmware/core/vmw_context.c          |  114 
 src/gallium/winsys/drm/vmware/core/vmw_screen.h           |    4 
 src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c       |   86 
 src/gallium/winsys/drm/vmware/core/vmw_screen_pools.c     |   22 
 src/gallium/winsys/drm/vmware/core/vmwgfx_drm.h           |   43 
 src/gallium/winsys/drm/vmware/xorg/SConscript             |    1 
 src/gallium/winsys/drm/vmware/xorg/vmw_video.c            |    3 
 src/gallium/winsys/drm/vmware/xorg/vmw_xorg.c             |   10 
 src/gallium/winsys/gdi/SConscript                         |    2 
 src/gallium/winsys/xlib/xlib_brw_context.c                |  209 
 src/gallium/winsys/xlib/xlib_softpipe.c                   |   40 
 src/glu/sgi/libnurbs/interface/bezierPatchMesh.h          |    1 
 src/glu/sgi/libnurbs/interface/glsurfeval.h               |    2 
 src/glu/sgi/libnurbs/internals/arcsorter.h                |    1 
 src/glu/sgi/libnurbs/internals/displaylist.h              |    1 
 src/glu/sgi/libnurbs/internals/gridvertex.h               |    2 
 src/glu/sgi/libnurbs/internals/knotvector.cc              |    3 
 src/glu/sgi/libnurbs/internals/mesher.cc                  |    3 
 src/glu/sgi/libnurbs/internals/reader.cc                  |    2 
 src/glu/sgi/libnurbs/internals/reader.h                   |   14 
 src/glu/sgi/libnurbs/internals/renderhints.cc             |    4 
 src/glu/sgi/libnurbs/internals/simplemath.h               |    2 
 src/glu/sgi/libnurbs/internals/slicer.cc                  |    4 
 src/glu/sgi/libnurbs/internals/subdivider.cc              |    6 
 src/glu/sgi/libnurbs/internals/varray.cc                  |    8 
 src/glu/sgi/libnurbs/nurbtess/directedLine.cc             |   32 
 src/glu/sgi/libnurbs/nurbtess/monoChain.cc                |    1 
 src/glu/sgi/libnurbs/nurbtess/partitionY.cc               |    4 
 src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc            |    4 
 src/glu/sgi/libnurbs/nurbtess/sampleCompTop.cc            |    4 
 src/glu/sgi/libnurbs/nurbtess/sampledLine.cc              |    3 
 src/glx/x11/dri2.c                                        |    4 
 src/glx/x11/dri2_glx.c                                    |   13 
 src/glx/x11/dri_glx.c                                     |   13 
 src/glx/x11/glxcmds.c                                     |    4 
 src/glx/x11/glxcurrent.c                                  |    8 
 src/glx/x11/glxext.c                                      |    5 
 src/glx/x11/xf86dri.h                                     |    4 
 src/mesa/Makefile                                         |    2 
 src/mesa/drivers/common/meta.c                            |   47 
 src/mesa/drivers/dri/common/spantmp2.h                    |    2 
 src/mesa/drivers/dri/ffb/ffb_bitmap.c                     |    1 
 src/mesa/drivers/dri/ffb/ffb_clear.c                      |    3 
 src/mesa/drivers/dri/ffb/ffb_dd.c                         |    4 
 src/mesa/drivers/dri/ffb/ffb_depth.c                      |    1 
 src/mesa/drivers/dri/ffb/ffb_lines.c                      |    4 
 src/mesa/drivers/dri/ffb/ffb_points.c                     |    2 
 src/mesa/drivers/dri/ffb/ffb_span.c                       |    2 
 src/mesa/drivers/dri/ffb/ffb_state.c                      |    5 
 src/mesa/drivers/dri/ffb/ffb_stencil.c                    |    2 
 src/mesa/drivers/dri/ffb/ffb_tris.c                       |    2 
 src/mesa/drivers/dri/ffb/ffb_vb.c                         |    2 
 src/mesa/drivers/dri/ffb/ffb_xmesa.c                      |    2 
 src/mesa/drivers/dri/i810/i810context.c                   |    3 
 src/mesa/drivers/dri/i810/i810render.c                    |    1 
 src/mesa/drivers/dri/i810/i810screen.c                    |    4 
 src/mesa/drivers/dri/i810/i810state.c                     |    2 
 src/mesa/drivers/dri/i810/i810tex.c                       |    2 
 src/mesa/drivers/dri/i810/i810tex.h                       |    1 
 src/mesa/drivers/dri/i810/i810texmem.c                    |    1 
 src/mesa/drivers/dri/i810/i810vb.c                        |    1 
 src/mesa/drivers/dri/i915/i830_context.c                  |    3 
 src/mesa/drivers/dri/i915/i915_context.c                  |    5 
 src/mesa/drivers/dri/i915/i915_debug_fp.c                 |    3 
 src/mesa/drivers/dri/i915/i915_program.c                  |    2 
 src/mesa/drivers/dri/i915/i915_texstate.c                 |    7 
 src/mesa/drivers/dri/i915/i915_vtbl.c                     |    1 
 src/mesa/drivers/dri/i915/intel_render.c                  |    4 
 src/mesa/drivers/dri/i915/intel_tris.c                    |    1 
 src/mesa/drivers/dri/i965/brw_cc.c                        |    2 
 src/mesa/drivers/dri/i965/brw_clip_line.c                 |    1 
 src/mesa/drivers/dri/i965/brw_clip_point.c                |    1 
 src/mesa/drivers/dri/i965/brw_clip_state.c                |    1 
 src/mesa/drivers/dri/i965/brw_clip_tri.c                  |    1 
 src/mesa/drivers/dri/i965/brw_clip_unfilled.c             |    1 
 src/mesa/drivers/dri/i965/brw_clip_util.c                 |    1 
 src/mesa/drivers/dri/i965/brw_context.c                   |    9 
 src/mesa/drivers/dri/i965/brw_disasm.c                    |    1 
 src/mesa/drivers/dri/i965/brw_draw.c                      |    2 
 src/mesa/drivers/dri/i965/brw_draw_upload.c               |   10 
 src/mesa/drivers/dri/i965/brw_eu_emit.c                   |    4 
 src/mesa/drivers/dri/i965/brw_fallback.c                  |    1 
 src/mesa/drivers/dri/i965/brw_gs_emit.c                   |    1 
 src/mesa/drivers/dri/i965/brw_gs_state.c                  |    1 
 src/mesa/drivers/dri/i965/brw_program.c                   |    1 
 src/mesa/drivers/dri/i965/brw_sf_state.c                  |    1 
 src/mesa/drivers/dri/i965/brw_state.h                     |    2 
 src/mesa/drivers/dri/i965/brw_vs_surface_state.c          |    1 
 src/mesa/drivers/dri/i965/brw_vtbl.c                      |    1 
 src/mesa/drivers/dri/i965/brw_wm.c                        |    1 
 src/mesa/drivers/dri/i965/brw_wm_emit.c                   |    4 
 src/mesa/drivers/dri/i965/brw_wm_glsl.c                   |    2 
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c          |   50 
 src/mesa/drivers/dri/intel/intel_blit.c                   |    1 
 src/mesa/drivers/dri/intel/intel_buffers.c                |    2 
 src/mesa/drivers/dri/intel/intel_clear.c                  |    3 
 src/mesa/drivers/dri/intel/intel_context.c                |    1 
 src/mesa/drivers/dri/intel/intel_context.h                |    8 
 src/mesa/drivers/dri/intel/intel_pixel.c                  |    7 
 src/mesa/drivers/dri/intel/intel_pixel_bitmap.c           |    6 
 src/mesa/drivers/dri/intel/intel_pixel_draw.c             |    3 
 src/mesa/drivers/dri/intel/intel_pixel_read.c             |    1 
 src/mesa/drivers/dri/intel/intel_regions.c                |    1 
 src/mesa/drivers/dri/intel/intel_screen.c                 |    3 
 src/mesa/drivers/dri/intel/intel_state.c                  |    2 
 src/mesa/drivers/dri/intel/intel_swapbuffers.c            |    1 
 src/mesa/drivers/dri/intel/intel_tex_copy.c               |    8 
 src/mesa/drivers/dri/intel/intel_tex_image.c              |    1 
 src/mesa/drivers/dri/intel/intel_tex_validate.c           |    2 
 src/mesa/drivers/dri/mach64/mach64_context.c              |    2 
 src/mesa/drivers/dri/mach64/mach64_dd.c                   |    3 
 src/mesa/drivers/dri/mach64/mach64_lock.c                 |    1 
 src/mesa/drivers/dri/mach64/mach64_screen.c               |    2 
 src/mesa/drivers/dri/mach64/mach64_span.c                 |    1 
 src/mesa/drivers/dri/mach64/mach64_state.c                |    3 
 src/mesa/drivers/dri/mach64/mach64_tex.c                  |    5 
 src/mesa/drivers/dri/mach64/mach64_texmem.c               |    3 
 src/mesa/drivers/dri/mach64/mach64_texstate.c             |    2 
 src/mesa/drivers/dri/mach64/mach64_vb.c                   |    1 
 src/mesa/drivers/dri/mga/mga_xmesa.c                      |    2 
 src/mesa/drivers/dri/mga/mgadd.c                          |    5 
 src/mesa/drivers/dri/mga/mgaioctl.c                       |    3 
 src/mesa/drivers/dri/mga/mgarender.c                      |    1 
 src/mesa/drivers/dri/mga/mgatex.c                         |    3 
 src/mesa/drivers/dri/mga/mgatris.c                        |    1 
 src/mesa/drivers/dri/mga/mgavb.c                          |    1 
 src/mesa/drivers/dri/r200/r200_state_init.c               |    3 
 src/mesa/drivers/dri/r200/r200_vertprog.c                 |    2 
 src/mesa/drivers/dri/r300/compiler/memory_pool.c          |    4 
 src/mesa/drivers/dri/r300/compiler/radeon_code.c          |    3 
 src/mesa/drivers/dri/r300/compiler/radeon_compiler.c      |   11 
 src/mesa/drivers/dri/r300/compiler/radeon_program.c       |    6 
 src/mesa/drivers/dri/r300/compiler/radeon_program_alu.c   |   30 
 src/mesa/drivers/dri/r300/r300_cmdbuf.c                   |    3 
 src/mesa/drivers/dri/r300/r300_context.c                  |    5 
 src/mesa/drivers/dri/r300/r300_draw.c                     |    3 
 src/mesa/drivers/dri/r300/r300_emit.c                     |    6 
 src/mesa/drivers/dri/r300/r300_fragprog_common.c          |    2 
 src/mesa/drivers/dri/r300/r300_ioctl.c                    |    2 
 src/mesa/drivers/dri/r300/r300_render.c                   |    6 
 src/mesa/drivers/dri/r300/r300_state.c                    |    4 
 src/mesa/drivers/dri/r300/r300_tex.c                      |    5 
 src/mesa/drivers/dri/r300/r300_texstate.c                 |    2 
 src/mesa/drivers/dri/r300/r300_vertprog.c                 |    1 
 src/mesa/drivers/dri/r600/r600_context.c                  |   16 
 src/mesa/drivers/dri/r600/r600_context.h                  |    1 
 src/mesa/drivers/dri/r600/r600_tex.h                      |    2 
 src/mesa/drivers/dri/r600/r600_texstate.c                 |   82 
 src/mesa/drivers/dri/r600/r700_assembler.c                |   35 
 src/mesa/drivers/dri/r600/r700_assembler.h                |    1 
 src/mesa/drivers/dri/r600/r700_chip.c                     |    5 
 src/mesa/drivers/dri/r600/r700_state.c                    |    6 
 src/mesa/drivers/dri/r600/r700_vertprog.c                 |    8 
 src/mesa/drivers/dri/r600/r700_vertprog.h                 |    1 
 src/mesa/drivers/dri/radeon/radeon_common.c               |    3 
 src/mesa/drivers/dri/radeon/radeon_cs_legacy.c            |    3 
 src/mesa/drivers/dri/radeon/radeon_lighting.c             |  681 ---
 src/mesa/drivers/dri/radeon/radeon_tcl.c                  |    1 
 src/mesa/drivers/dri/savage/savagedd.c                    |    4 
 src/mesa/drivers/dri/savage/savageioctl.c                 |    2 
 src/mesa/drivers/dri/savage/savagerender.c                |    1 
 src/mesa/drivers/dri/savage/savagespan.c                  |    1 
 src/mesa/drivers/dri/savage/savagetex.c                   |    2 
 src/mesa/drivers/dri/savage/savagetris.c                  |    1 
 src/mesa/drivers/dri/sis/sis6326_state.c                  |    2 
 src/mesa/drivers/dri/sis/sis_context.c                    |    5 
 src/mesa/drivers/dri/sis/sis_dd.c                         |    2 
 src/mesa/drivers/dri/sis/sis_fog.c                        |    1 
 src/mesa/drivers/dri/sis/sis_screen.c                     |    1 
 src/mesa/drivers/dri/sis/sis_state.c                      |    4 
 src/mesa/drivers/dri/sis/sis_tex.c                        |    1 
 src/mesa/drivers/dri/sis/sis_texstate.c                   |    1 
 src/mesa/drivers/dri/sis/sis_tris.c                       |    1 
 src/mesa/drivers/dri/tdfx/tdfx_dd.c                       |    9 
 src/mesa/drivers/dri/tdfx/tdfx_lock.c                     |    1 
 src/mesa/drivers/dri/tdfx/tdfx_pixels.c                   |    1 
 src/mesa/drivers/dri/tdfx/tdfx_screen.c                   |    2 
 src/mesa/drivers/dri/tdfx/tdfx_state.c                    |    4 
 src/mesa/drivers/dri/tdfx/tdfx_tex.c                      |    2 
 src/mesa/drivers/dri/tdfx/tdfx_texman.c                   |    1 
 src/mesa/drivers/dri/tdfx/tdfx_texstate.c                 |    3 
 src/mesa/drivers/dri/tdfx/tdfx_vb.c                       |    5 
 src/mesa/drivers/dri/unichrome/via_context.c              |    3 
 src/mesa/drivers/dri/unichrome/via_ioctl.c                |    1 
 src/mesa/drivers/dri/unichrome/via_render.c               |    1 
 src/mesa/drivers/dri/unichrome/via_screen.c               |    4 
 src/mesa/drivers/dri/unichrome/via_state.c                |    3 
 src/mesa/drivers/dri/unichrome/via_tex.c                  |    2 
 src/mesa/drivers/dri/unichrome/via_texcombine.c           |    1 
 src/mesa/drivers/windows/gdi/mesa.def                     |    4 
 src/mesa/drivers/windows/gdi/wmesa.c                      |   12 
 src/mesa/glapi/ARB_sync.xml                               |    4 
 src/mesa/glapi/gl_x86_asm.py                              |    2 
 src/mesa/main/api_validate.c                              |    9 
 src/mesa/main/attrib.c                                    |   48 
 src/mesa/main/blend.c                                     |    1 
 src/mesa/main/buffers.c                                   |    2 
 src/mesa/main/context.c                                   |    4 
 src/mesa/main/convolve.c                                  |    1 
 src/mesa/main/debug.c                                     |    4 
 src/mesa/main/depthstencil.c                              |    1 
 src/mesa/main/dispatch.c                                  |    4 
 src/mesa/main/dlist.c                                     |   21 
 src/mesa/main/drawpix.c                                   |    1 
 src/mesa/main/enable.c                                    |    1 
 src/mesa/main/enums.c                                     |  465 +-
 src/mesa/main/fbobject.c                                  |   30 
 src/mesa/main/formats.c                                   |    2 
 src/mesa/main/image.c                                     |    3 
 src/mesa/main/lines.c                                     |    2 
 src/mesa/main/mipmap.c                                    |    1 
 src/mesa/main/pixel.c                                     |    1 
 src/mesa/main/pixelstore.c                                |    3 
 src/mesa/main/points.c                                    |    1 
 src/mesa/main/polygon.c                                   |    1 
 src/mesa/main/scissor.c                                   |    6 
 src/mesa/main/state.c                                     |    7 
 src/mesa/main/texcompress.c                               |    3 
 src/mesa/main/texformat.c                                 |    2 
 src/mesa/main/texgetimage.c                               |    4 
 src/mesa/main/teximage.c                                  |    1 
 src/mesa/main/texobj.c                                    |    1 
 src/mesa/main/texparam.c                                  |    2 
 src/mesa/main/texstate.c                                  |    2 
 src/mesa/main/texstore.c                                  |    4 
 src/mesa/main/version.h                                   |    8 
 src/mesa/main/vtxfmt.c                                    |    2 
 src/mesa/shader/arbprogparse.c                            |    3 
 src/mesa/shader/arbprogram.c                              |   33 
 src/mesa/shader/nvfragparse.c                             |    2 
 src/mesa/shader/nvvertparse.c                             |    1 
 src/mesa/shader/prog_execute.c                            |   67 
 src/mesa/shader/prog_optimize.c                           |    2 
 src/mesa/shader/prog_parameter.c                          |    8 
 src/mesa/shader/prog_parameter_layout.c                   |   16 
 src/mesa/shader/prog_statevars.c                          |    1 
 src/mesa/shader/program_parse.tab.c                       |  627 +-
 src/mesa/shader/program_parse.tab.h                       |    2 
 src/mesa/shader/program_parse.y                           |   95 
 src/mesa/shader/program_parser.h                          |    6 
 src/mesa/shader/shader_api.c                              |    2 
 src/mesa/shader/slang/slang_builtin.c                     |    1 
 src/mesa/shader/slang/slang_codegen.c                     |   15 
 src/mesa/shader/slang/slang_codegen.h                     |    1 
 src/mesa/shader/slang/slang_compile.c                     |    6 
 src/mesa/shader/slang/slang_compile_operation.c           |    1 
 src/mesa/shader/slang/slang_emit.c                        |    1 
 src/mesa/shader/slang/slang_link.c                        |    1 
 src/mesa/shader/slang/slang_log.c                         |    1 
 src/mesa/shader/slang/slang_preprocess.c                  |   32 
 src/mesa/state_tracker/st_atom_framebuffer.c              |    1 
 src/mesa/state_tracker/st_atom_pixeltransfer.c            |    1 
 src/mesa/state_tracker/st_atom_sampler.c                  |    1 
 src/mesa/state_tracker/st_atom_scissor.c                  |   17 
 src/mesa/state_tracker/st_atom_shader.c                   |    3 
 src/mesa/state_tracker/st_cb_accum.c                      |    2 
 src/mesa/state_tracker/st_cb_bitmap.c                     |   15 
 src/mesa/state_tracker/st_cb_blit.c                       |    4 
 src/mesa/state_tracker/st_cb_bufferobjects.c              |   49 
 src/mesa/state_tracker/st_cb_clear.c                      |   11 
 src/mesa/state_tracker/st_cb_drawpixels.c                 |    6 
 src/mesa/state_tracker/st_cb_fbo.c                        |    1 
 src/mesa/state_tracker/st_cb_feedback.c                   |    3 
 src/mesa/state_tracker/st_cb_program.c                    |    1 
 src/mesa/state_tracker/st_cb_queryobj.c                   |    1 
 src/mesa/state_tracker/st_cb_rasterpos.c                  |    1 
 src/mesa/state_tracker/st_cb_readpixels.c                 |    2 
 src/mesa/state_tracker/st_cb_strings.c                    |    1 
 src/mesa/state_tracker/st_cb_texture.c                    |   60 
 src/mesa/state_tracker/st_cb_viewport.c                   |    7 
 src/mesa/state_tracker/st_context.c                       |    6 
 src/mesa/state_tracker/st_draw.c                          |    3 
 src/mesa/state_tracker/st_draw_feedback.c                 |    1 
 src/mesa/state_tracker/st_extensions.c                    |    1 
 src/mesa/state_tracker/st_format.c                        |    8 
 src/mesa/state_tracker/st_framebuffer.c                   |    4 
 src/mesa/state_tracker/st_gen_mipmap.c                    |    2 
 src/mesa/state_tracker/st_inlines.h                       |   10 
 src/mesa/state_tracker/st_mesa_to_tgsi.c                  |   21 
 src/mesa/state_tracker/st_program.c                       |    1 
 src/mesa/state_tracker/st_texture.c                       |    1 
 src/mesa/swrast/s_accum.c                                 |    1 
 src/mesa/swrast/s_atifragshader.c                         |    1 
 src/mesa/swrast/s_bitmap.c                                |    1 
 src/mesa/swrast/s_copypix.c                               |    2 
 src/mesa/swrast/s_depth.c                                 |   42 
 src/mesa/swrast/s_drawpix.c                               |    1 
 src/mesa/swrast/s_feedback.c                              |    1 
 src/mesa/swrast/s_fragprog.c                              |    1 
 src/mesa/swrast/s_lines.c                                 |    1 
 src/mesa/swrast/s_points.c                                |    1 
 src/mesa/swrast/s_readpix.c                               |    1 
 src/mesa/swrast/s_span.c                                  |   17 
 src/mesa/swrast/s_texcombine.c                            |    1 
 src/mesa/tnl/t_context.c                                  |    1 
 src/mesa/tnl/t_draw.c                                     |    7 
 src/mesa/tnl/t_pipeline.c                                 |    1 
 src/mesa/tnl/t_rasterpos.c                                |    1 
 src/mesa/tnl/t_vb_program.c                               |    8 
 src/mesa/vbo/vbo_exec.c                                   |    3 
 src/mesa/vbo/vbo_exec_array.c                             |   47 
 src/mesa/vbo/vbo_exec_draw.c                              |    1 
 src/mesa/vbo/vbo_save.c                                   |    2 
 src/mesa/vbo/vbo_save_loopback.c                          |    1 
 src/mesa/vbo/vbo_split_copy.c                             |    3 
 src/mesa/x86/assyntax.h                                   |    4 
 src/mesa/x86/gen_matypes.c                                |   14 
 src/mesa/x86/glapi_x86.S                                  |    2 
 src/mesa/x86/read_rgba_span_x86.S                         |    4 
 src/mesa/x86/x86_xform.c                                  |    1 
 windows/VC8/mesa/gdi/gdi.vcproj                           |    8 
 windows/VC8/mesa/mesa/mesa.vcproj                         |   12 
 533 files changed, 7226 insertions(+), 3524 deletions(-)

New commits:
commit e09e7cc2b3706e1333fbca8fa15a4541d79fd7b2
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date:   Fri Feb 5 16:04:33 2010 +0200

    Merge from Debian experimental.

diff --git a/debian/changelog b/debian/changelog
index e85924d..53ad124 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (7.7-3ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from Debian experimental.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Fri, 05 Feb 2010 15:58:07 +0200
+
 mesa (7.7-3) experimental; urgency=low
 
   * Pull from upstream mesa_7_7_branch up to commit f5145a6e.

commit eef7b39a3618ca77dfb77111b4daad2acf2c1824
Author: Brice Goglin <bgoglin@debian.org>
Date:   Mon Feb 1 22:55:49 2010 +0100

    Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 0e7ebec..4a441c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-mesa (7.7-3) UNRELEASED; urgency=low
+mesa (7.7-3) experimental; urgency=low
 
   * Pull from upstream mesa_7_7_branch up to commit f5145a6e.
+  * Build against libdrm-radeon1 2.4.17 to get DRI2 support.
 
- -- Brice Goglin <bgoglin@debian.org>  Mon, 01 Feb 2010 22:37:33 +0100
+ -- Brice Goglin <bgoglin@debian.org>  Mon, 01 Feb 2010 22:55:36 +0100
 
 mesa (7.7-2) experimental; urgency=low
 

commit 04f4a8921b917b428bb63fe152f5b69c314075d0
Author: Brice Goglin <bgoglin@debian.org>
Date:   Mon Feb 1 22:38:35 2010 +0100

    New upstream snapshot

diff --git a/ChangeLog b/ChangeLog
index 1206f32..cef81d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,304 @@
+commit f5145a6ec3e9086988ab8ec004276f845fecc3d9
+Author: Jakob Bornecrantz <jakob@vmware.com>
+Date:   Fri Jan 29 17:11:36 2010 +0100
+
+    vmware/core: Remove old ioctl structs not used
+    
+    Leftover that was never used in this driver
+
+commit ddedfe12d41808c3caa77649e3a9a6c4c6253d69
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Thu Jan 28 20:51:52 2010 +0000
+
+    svga: Actually call fence_reference in texture downloads.
+
+commit cb5447f79ca03d29407e8db84166f5bddd8d4c59
+Author: Brian Paul <brianp@vmware.com>
+Date:   Fri Jan 29 08:26:23 2010 -0700
+
+    glsl: fix preprocessor bug involving //-style comments in macro definitions
+    
+    See comments for details.
+
+commit 9fd3c74724e557bc6ecc851d8552615ab3becfe2
+Author: Brian Paul <brianp@vmware.com>
+Date:   Thu Jan 28 13:05:36 2010 -0700
+
+    tnl: check that state is validated before drawing
+
+commit 4d1234e22242529c8d85f5ef0cf826af41a91570
+Author: Brian Paul <brianp@vmware.com>
+Date:   Thu Jan 28 13:05:23 2010 -0700
+
+    st/mesa: check that state is validated before drawing
+
+commit 3cba779e16935f7c3a0bfd8af48bd5e015068e96
+Author: Brian Paul <brianp@vmware.com>
+Date:   Thu Jan 28 13:04:16 2010 -0700
+
+    vbo: fix missing state validation bugs
+    
+    Commit 2708ddfb06a36d8568e2aa130bf1f7d551fcd309 caused a few regressions.
+    We need to check/validate state after calling bind_arrays() because
+    it might set the _NEW_ARRAYS flag if the varying VP inputs change.
+    
+    The symptom of this problem was some attribute arrays being ignored
+    (or interpreted as constant-valued) in glDrawRangeElements or
+    glMultiDrawElements.
+    
+    A follow-on patch will add some additional asserts to try to catch
+    this kind of thing in the future.
+
+commit 23eda89ec89e2bd5bc26077bd56e8d6b5d4040d4
+Author: Brian Paul <brianp@vmware.com>
+Date:   Thu Jan 28 13:02:40 2010 -0700
+
+    mesa: do state validation in _mesa_valid_to_render()
+    
+    ...rather than checking/validating before all the calls to
+    _mesa_valid_to_render() and valid_to_render().
+    
+    The next patch will actually fix some bugs...
+
+commit 6e68898b05dc957dc6cb92d2ff060589e5936650
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Sat Dec 26 21:05:31 2009 +0000
+
+    softpipe: Flush draw module when fragment pipeline state changes.
+
+commit 1befcd5a2ae8588f8d17d2ecea19dd4daccddb00
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Sat Dec 26 11:01:05 2009 +0000
+
+    softpipe: Flush draw module before switching framebuffer.
+    
+    Otherwise geometry might end up in the wrong rendertarget.
+
+commit 12ba3559785fa276b3b4b6fa06cfe551b87aecc3
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Mon Nov 23 11:21:11 2009 +0000
+
+    llvmpipe: Use assert instead of abort. Only verify functions on debug builds.
+
+commit a0907a645f7d832e7c53d14c2ed88080b456a1a5
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Sun Nov 15 06:46:48 2009 -0800
+
+    llvmpipe: Fix memory leak.
+
+commit 1acf7a09e762e6d8a26c8f0d919f5efa6df6e71f
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Tue Nov 10 17:52:53 2009 -0800
+
+    llvmpipe: Use the generic conversion routine for depths.
+    
+    This allows for z32f depth format to work correctly.
+
+commit 14dc02a1b2c52cf02b7f89885b61f42575834958
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Tue Nov 10 17:51:06 2009 -0800
+
+    llvmpipe: Be more conservative with the supported formats.
+    
+    We'll likely support much more formats, but doing this allows to run
+    more testsuites without immediately hit assertion failures.
+
+commit 88cf87bd5633c0e8155e4226fc49ab36f1abc335
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Mon Dec 28 22:52:41 2009 +0000
+
+    llvmpipe: Unmapping vertex/index buffers does NOT flush draw module anymore.
+    
+    Not since 6094e79f4e3350d123c7532b1c73faa60834a62d.
+    
+    Drivers now need to flush draw module explicitely (which explains why
+    all those previous commits adding draw_flushes calls were necessary).
+    
+    This is a good thing, but it's tricky to get this right in face of user buffers
+    (it's not even clear who has the responsibility to flush when a user buffer
+    is seen -- statetracker or pipe driver), so just force flush (temporarily)
+    since it's not a bottleneck now.
+
+commit 31b3420688dbf7fc2282f0d1fe13e51fe9e1f9b6
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Sat Dec 26 15:21:16 2009 +0000
+
+    llvmpipe: Treat state changes systematically.
+    
+    That is:
+    - check for no op
+    - update/flush draw module
+    - update bound state and mark it as dirty
+    
+    In particular flushing the draw module is important since it may contain
+    unflushed primitives which would otherwise be draw with wrong state.
+
+commit 4e95983fa832cf0808ccab64e9fbfb0fcdde8049
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Sat Dec 26 11:00:42 2009 +0000
+
+    llvmpipe: Flush draw module before switching framebuffer.
+    
+    Otherwise geometry will end up in the wrong rendertarget.
+
+commit 4e506eac8f11a23249a46265b796c4764d9d045e
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Wed Dec 16 15:06:02 2009 +0000
+
+    llvmpipe: add LP_DEBUG env var
+    
+    Cherry-picked from dec35d04aeb398eef159aaf8cde5e0d04622b811.
+
+commit 46167149ceac96cf91f2031d2c58346b80f0834d
+Author: Brian Paul <brianp@vmware.com>
+Date:   Mon Dec 14 15:27:35 2009 -0700
+
+    llvmpipe: fix broken TGSI_OPCODE_FRC codegen
+
+commit 96ec4eb755d0296c807ca5c89383a3b9f9fc1dbe
+Author: Brian Paul <brianp@vmware.com>
+Date:   Mon Dec 14 15:24:31 2009 -0700
+
+    llvmpipe: fix broken lp_build_abs()
+
+commit e20547042c03e22234c9580f005286552bd4ae18
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Tue Dec 15 14:46:43 2009 +0000
+
+    llvmpipe: Fix yet another copynpaste typo in lp_build_log2_approx.
+    
+    Now fslight looks perfect.
+
+commit 0451d0fd01bdd4ee6a2497a3a1c749446739602e
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Tue Dec 15 14:15:52 2009 +0000
+
+    llvmpipe: Fix lp_build_polynomial comment.
+
+commit aa8b23e077f8c4f4c517e58533a72db0fb861091
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Tue Dec 15 13:58:53 2009 +0000
+
+    llvmpipe: Fix typo in lp_build_log constant.
+
+commit 4eb48a3af78beda4ee1628d0ecd6a437a0721a72
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Tue Dec 15 12:13:43 2009 +0000
+
+    llvmpipe: Fix bad SI -> FP conversion into lp_build_log2_approx.
+    
+    It should be a bitcast  as the integer value is actually an encoded FP
+    already.
+
+commit 8db8adfd01a1ff1e2a160ae3b0199bd3daa4191a
+Author: Jakob Bornecrantz <jakob@vmware.com>
+Date:   Thu Jan 28 17:59:26 2010 +0100
+
+    st/xorg: Update to new libkms interface but be backwards compatible
+
+commit 8e240d7e0eb640cc954f6d81119136e2d546d618
+Author: Keith Whitwell <keithw@vmware.com>
+Date:   Mon Aug 10 18:45:07 2009 +0100
+
+    svga: remove sleep in DEBUG_FLUSH path
+
+commit 40298bf272c7fbb289b442b4424c2c17402ae322
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Thu Jan 28 17:11:02 2010 +0000
+
+    python/retrace: Dump all vertices for verbosity level 3.
+
+commit a0518e66b2960d3bab386985e24ccbc9c51abf97
+Author: Brian Paul <brianp@vmware.com>
+Date:   Wed Jan 27 17:08:03 2010 -0700
+
+    docs: Fixed Windows build for 7.7.1
+
+commit 82c76cd16f35f4d903f49761af7eb28a755ad299
+Author: Brian Paul <brianp@vmware.com>
+Date:   Wed Jan 27 16:25:59 2010 -0700
+
+    windows: assorted build fixes
+    
+    These changes were originally submitted by Karl Schultz for Mesa 7.7-rc2
+    but weren't applied.
+
+commit 50e890bc51cfc278378f25cb70be79f1bad0b6b6
+Author: Rodolfo Ribeiro Gomes <rodolforg@gmail.com>
+Date:   Tue Jan 26 14:20:06 2010 -0700
+
+    glx: fix possible memory leaks in dri2CreateScreen()
+    
+    Original patch fixed up by Brian Paul.
+
+commit bba95570196dad29880426152a1b7fb77619296d
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Wed Jan 27 12:18:02 2010 -0500
+
+    r600: fix warning
+
+commit 2041d3e4b76009687bb2a7752c3ee94e5c160357
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Wed Jan 27 12:16:50 2010 -0500
+
+    r600: rv670 support 8 tex instructions just like other r6xx
+    
+    also clarify some other const values.
+
+commit 77b7b3a1ab36f1dafa905dbe709d0d72dbc9d54d
+Author: Andre Maasikas <amaasikas@gmail.com>
+Date:   Wed Jan 27 11:22:56 2010 +0200
+
+    r600: increase max texture units to 16
+
+commit 0dab80fbfb5703bfbeed691051c353aeca3aaa7a
+Author: Andre Maasikas <amaasikas@gmail.com>
+Date:   Wed Jan 27 10:20:15 2010 +0200
+
+    r600: fix XPD with writemask
+    
+    same variable used for 2 different temp registers
+    fixes e.g. glsl/bump
+
+commit e3257912e006120f6ab611e77005eed1a464030a
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Wed Jan 27 16:25:31 2010 +0000
+
+    mesa: Warn when indices are out of bounds, but do not skip the draw in debug builds.
+    
+    The driver (or preferably the hardware) should handle out of bounds
+    indices.
+    
+    If there are problems then it's better to detect those in the debug
+    builds.
+
+commit 15fe4918223f04fa89d523220609abea0cac34e2
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Wed Jan 27 15:41:25 2010 +0000
+
+    svga: Prevent buffer overflow in buffer ranges.
+    
+    Do this by extending the nearest range to cover the new range.
+    
+    This fixes an access fault in Call of Duty which was doing many disjoint
+    glBufferSubData calls.
+
+commit ac597f5acc8886a0c44aaa4f2484f9d569ae5d6d
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Wed Jan 27 14:45:56 2010 +0000
+
+    svga: Fix PIPE_LOGICOP_INVERT.
+    
+    Actually the current XOR implementation is an INVERT.
+    
+    This fixes rectangle selection in Maya.
+
+commit 5cb255f0d7ab048355b454d69e44ab9735c8921e
+Author: Keith Whitwell <keithw@vmware.com>
+Date:   Wed Jan 27 13:48:21 2010 +0000
+
+    svga: better path for generating white pixels for xor logicop workaround
+
 commit 2f28ca0a27cb0c539affb22c487c4bb44b6d54b4
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Wed Jan 27 11:46:26 2010 +1000
diff --git a/debian/changelog b/debian/changelog
index 656e050..0e7ebec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (7.7-3) UNRELEASED; urgency=low
+
+  * Pull from upstream mesa_7_7_branch up to commit f5145a6e.
+
+ -- Brice Goglin <bgoglin@debian.org>  Mon, 01 Feb 2010 22:37:33 +0100
+
 mesa (7.7-2) experimental; urgency=low
 
   [ Julien Cristau ]

commit f5145a6ec3e9086988ab8ec004276f845fecc3d9
Author: Jakob Bornecrantz <jakob@vmware.com>
Date:   Fri Jan 29 17:11:36 2010 +0100

    vmware/core: Remove old ioctl structs not used
    
    Leftover that was never used in this driver

diff --git a/src/gallium/winsys/drm/vmware/core/vmwgfx_drm.h b/src/gallium/winsys/drm/vmware/core/vmwgfx_drm.h
index 2be7e12..681d6b5 100644
--- a/src/gallium/winsys/drm/vmware/core/vmwgfx_drm.h
+++ b/src/gallium/winsys/drm/vmware/core/vmwgfx_drm.h
@@ -87,49 +87,6 @@ struct drm_vmw_getparam_arg {
 
 /*************************************************************************/
 /**
- * DRM_VMW_EXTENSION - Query device extensions.
- */
-
-/**
- * struct drm_vmw_extension_rep
- *
- * @exists: The queried extension exists.
- * @driver_ioctl_offset: Ioctl number of the first ioctl in the extension.
- * @driver_sarea_offset: Offset to any space in the DRI SAREA
- * used by the extension.
- * @major: Major version number of the extension.
- * @minor: Minor version number of the extension.
- * @pl: Patch level version number of the extension.
- *
- * Output argument to the DRM_VMW_EXTENSION Ioctl.
- */
-
-struct drm_vmw_extension_rep {
-	int32_t exists;
-	uint32_t driver_ioctl_offset;
-	uint32_t driver_sarea_offset;
-	uint32_t major;
-	uint32_t minor;
-	uint32_t pl;
-	uint32_t pad64;
-};
-
-/**
- * union drm_vmw_extension_arg
- *
- * @extension - Ascii name of the extension to be queried. //In
- * @rep - Reply as defined above. //Out
- *
- * Argument to the DRM_VMW_EXTENSION Ioctl.
- */
-
-union drm_vmw_extension_arg {
-	char extension[DRM_VMW_EXT_NAME_LEN];
-	struct drm_vmw_extension_rep rep;
-};
-
-/*************************************************************************/
-/**
  * DRM_VMW_CREATE_CONTEXT - Create a host context.
  *
  * Allocates a device unique context id, and queues a create context command

commit ddedfe12d41808c3caa77649e3a9a6c4c6253d69
Author: José Fonseca <jfonseca@vmware.com>
Date:   Thu Jan 28 20:51:52 2010 +0000

    svga: Actually call fence_reference in texture downloads.

diff --git a/src/gallium/drivers/svga/svga_screen_texture.c b/src/gallium/drivers/svga/svga_screen_texture.c
index 9ad4eda..c381988 100644
--- a/src/gallium/drivers/svga/svga_screen_texture.c
+++ b/src/gallium/drivers/svga/svga_screen_texture.c
@@ -203,7 +203,7 @@ svga_transfer_dma(struct svga_transfer *st,
       if(transfer == SVGA3D_READ_HOST_VRAM) {
          svga_screen_flush(screen, &fence);
          sws->fence_finish(sws, fence, 0);
-         //sws->fence_reference(sws, &fence, NULL);
+         sws->fence_reference(sws, &fence, NULL);
       }
    }
    else {
@@ -232,7 +232,7 @@ svga_transfer_dma(struct svga_transfer *st,
             if(y) {
                svga_screen_flush(screen, &fence);
                sws->fence_finish(sws, fence, 0);
-               //sws->fence_reference(sws, &fence, NULL);
+               sws->fence_reference(sws, &fence, NULL);
             }
 


Reply to: