rpms/mesa/F-12 mesa-7.7.1-fixes.patch,1.1,1.2 mesa.spec,1.262,1.263
Dave Airlie
airlied at fedoraproject.org
Wed Jan 27 02:53:20 UTC 2010
Author: airlied
Update of /cvs/pkgs/rpms/mesa/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15527
Modified Files:
mesa-7.7.1-fixes.patch mesa.spec
Log Message:
* Wed Jan 27 2010 Dave Airlie <airlied at redhat.com> 7.7-3
- update 7.7 branch stable fixes (r100 colors for sure).
mesa-7.7.1-fixes.patch:
b/Makefile | 2
b/configs/darwin | 2
b/configs/default | 2
b/docs/envvars.html | 19
b/docs/lists.html | 31
b/docs/news.html | 6
b/docs/relnotes-7.6.1.html | 12
b/docs/relnotes-7.7.1.html | 50
b/docs/relnotes-7.7.html | 12
b/docs/relnotes.html | 1
b/include/GL/gl_mangle.h | 43
b/progs/demos/Makefile | 7
b/progs/demos/engine.c | 18
b/progs/demos/fbotexture.c | 1
b/progs/demos/fire.c | 10
b/progs/demos/geartrain.c | 21
b/progs/demos/isosurf.c | 9
b/progs/demos/morph3d.c | 1
b/progs/demos/shadowtex.c | 1
b/progs/demos/terrain.c | 5
b/progs/glsl/convolutions.c | 2
b/progs/glsl/shtest.c | 10
b/progs/glsl/vert-tex.c | 9
b/progs/redbook/aapoly.c | 1
b/progs/samples/olympic.c | 20
b/progs/samples/overlay.c | 18
b/progs/samples/rgbtoppm.c | 31
b/progs/samples/sphere.c | 30
b/progs/samples/star.c | 20
b/progs/samples/stretch.c | 20
b/progs/samples/wave.c | 2
b/progs/util/readtex.c | 20
b/progs/xdemos/corender.c | 1
b/progs/xdemos/glsync.c | 2
b/progs/xdemos/glxgears.c | 1
b/progs/xdemos/glxheads.c | 32
b/progs/xdemos/manywin.c | 34
b/progs/xdemos/sharedtex_mt.c | 4
b/src/gallium/auxiliary/draw/draw_context.c | 3
b/src/gallium/auxiliary/draw/draw_pipe.c | 44
b/src/gallium/auxiliary/draw/draw_pt.c | 1
b/src/gallium/auxiliary/draw/draw_pt_fetch.c | 1
b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_emit.c | 1
b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c | 1
b/src/gallium/auxiliary/draw/draw_pt_post_vs.c | 1
b/src/gallium/auxiliary/draw/draw_vs_varient.c | 1
b/src/gallium/auxiliary/pipebuffer/Makefile | 1
b/src/gallium/auxiliary/pipebuffer/SConscript | 1
b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c | 1068 ++++++++----
b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.h | 37
b/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h | 4
b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c | 3
b/src/gallium/auxiliary/pipebuffer/pb_validate.c | 1
b/src/gallium/auxiliary/rbug/rbug_context.h | 2
b/src/gallium/auxiliary/rbug/rbug_proto.h | 2
b/src/gallium/auxiliary/rtasm/rtasm_execmem.c | 32
b/src/gallium/auxiliary/tgsi/tgsi_exec.c | 8
b/src/gallium/auxiliary/tgsi/tgsi_scan.c | 10
b/src/gallium/auxiliary/tgsi/tgsi_sse2.c | 50
b/src/gallium/auxiliary/tgsi/tgsi_ureg.c | 8
b/src/gallium/auxiliary/util/Makefile | 1
b/src/gallium/auxiliary/util/u_bitmask.c | 32
b/src/gallium/auxiliary/util/u_blit.c | 4
b/src/gallium/auxiliary/util/u_clear.h | 2
b/src/gallium/auxiliary/util/u_debug.c | 6
b/src/gallium/auxiliary/util/u_debug.h | 2
b/src/gallium/auxiliary/util/u_debug_memory.c | 8
b/src/gallium/auxiliary/util/u_format.h | 2
b/src/gallium/auxiliary/util/u_gen_mipmap.c | 4
b/src/gallium/auxiliary/util/u_network.c | 8
b/src/gallium/auxiliary/util/u_network.h | 2
b/src/gallium/auxiliary/util/u_stream_stdc.c | 2
b/src/gallium/auxiliary/util/u_tile.c | 2
b/src/gallium/auxiliary/util/u_upload_mgr.c | 4
b/src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c | 11
b/src/gallium/drivers/i915/i915_buffer.c | 1
b/src/gallium/drivers/i915/i915_clear.c | 1
b/src/gallium/drivers/i915/i915_context.c | 3
b/src/gallium/drivers/i915/i915_debug.c | 1
b/src/gallium/drivers/i915/i915_debug_fp.c | 1
b/src/gallium/drivers/i915/i915_state.c | 6
b/src/gallium/drivers/i915/i915_state_derived.c | 1
b/src/gallium/drivers/i915/i915_state_sampler.c | 1
b/src/gallium/drivers/i915/i915_surface.c | 6
b/src/gallium/drivers/i915/i915_texture.c | 2
b/src/gallium/drivers/llvmpipe/lp_bld_alpha.c | 1
b/src/gallium/drivers/llvmpipe/lp_bld_arit.c | 1
b/src/gallium/drivers/llvmpipe/lp_bld_blend_aos.c | 2
b/src/gallium/drivers/llvmpipe/lp_bld_blend_soa.c | 1
b/src/gallium/drivers/llvmpipe/lp_bld_conv.c | 2
b/src/gallium/drivers/llvmpipe/lp_bld_depth.c | 2
b/src/gallium/drivers/llvmpipe/lp_bld_flow.c | 2
b/src/gallium/drivers/llvmpipe/lp_bld_format_aos.c | 3
b/src/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c | 11
b/src/gallium/drivers/llvmpipe/lp_draw_arrays.c | 2
b/src/gallium/drivers/llvmpipe/lp_flush.c | 2
b/src/gallium/drivers/llvmpipe/lp_jit.c | 1
b/src/gallium/drivers/llvmpipe/lp_prim_vbuf.c | 1
b/src/gallium/drivers/llvmpipe/lp_setup.c | 1
b/src/gallium/drivers/llvmpipe/lp_state_fs.c | 3
b/src/gallium/drivers/llvmpipe/lp_state_surface.c | 1
b/src/gallium/drivers/llvmpipe/lp_state_vertex.c | 1
b/src/gallium/drivers/llvmpipe/lp_test_blend.c | 1
b/src/gallium/drivers/llvmpipe/lp_test_conv.c | 2
b/src/gallium/drivers/llvmpipe/lp_tex_cache.c | 1
b/src/gallium/drivers/llvmpipe/lp_tex_cache.h | 2
b/src/gallium/drivers/llvmpipe/lp_tex_sample_c.c | 3
b/src/gallium/drivers/llvmpipe/lp_tex_sample_llvm.c | 1
b/src/gallium/drivers/llvmpipe/lp_texture.c | 2
b/src/gallium/drivers/llvmpipe/lp_tile_cache.c | 2
b/src/gallium/drivers/llvmpipe/lp_tile_soa.h | 2
b/src/gallium/drivers/llvmpipe/lp_winsys.h | 2
b/src/gallium/drivers/nv50/nv50_query.c | 2
b/src/gallium/drivers/r300/r300_cs.h | 2
b/src/gallium/drivers/r300/r300_emit.c | 4
b/src/gallium/drivers/r300/r300_flush.c | 1
b/src/gallium/drivers/r300/r300_reg.h | 16
b/src/gallium/drivers/r300/r300_state_derived.c | 2
b/src/gallium/drivers/softpipe/sp_context.c | 1
b/src/gallium/drivers/softpipe/sp_flush.c | 2
b/src/gallium/drivers/softpipe/sp_prim_vbuf.c | 3
b/src/gallium/drivers/softpipe/sp_quad_blend.c | 3
b/src/gallium/drivers/softpipe/sp_quad_depth_test.c | 4
b/src/gallium/drivers/softpipe/sp_quad_fs.c | 2
b/src/gallium/drivers/softpipe/sp_setup.c | 1
b/src/gallium/drivers/softpipe/sp_state_surface.c | 1
b/src/gallium/drivers/softpipe/sp_state_vertex.c | 1
b/src/gallium/drivers/softpipe/sp_tex_tile_cache.c | 1
b/src/gallium/drivers/softpipe/sp_texture.c | 1
b/src/gallium/drivers/svga/svga_context.c | 44
b/src/gallium/drivers/svga/svga_context.h | 9
b/src/gallium/drivers/svga/svga_draw.c | 3
b/src/gallium/drivers/svga/svga_draw_arrays.c | 1
b/src/gallium/drivers/svga/svga_draw_elements.c | 1
b/src/gallium/drivers/svga/svga_pipe_blend.c | 1
b/src/gallium/drivers/svga/svga_pipe_constants.c | 3
b/src/gallium/drivers/svga/svga_pipe_depthstencil.c | 1
b/src/gallium/drivers/svga/svga_pipe_draw.c | 1
b/src/gallium/drivers/svga/svga_pipe_flush.c | 5
b/src/gallium/drivers/svga/svga_pipe_fs.c | 12
b/src/gallium/drivers/svga/svga_pipe_misc.c | 6
b/src/gallium/drivers/svga/svga_pipe_query.c | 1
b/src/gallium/drivers/svga/svga_pipe_rasterizer.c | 1
b/src/gallium/drivers/svga/svga_pipe_sampler.c | 3
b/src/gallium/drivers/svga/svga_pipe_vertex.c | 4
b/src/gallium/drivers/svga/svga_pipe_vs.c | 11
b/src/gallium/drivers/svga/svga_screen.c | 4
b/src/gallium/drivers/svga/svga_screen.h | 6
b/src/gallium/drivers/svga/svga_screen_buffer.c | 104 -
b/src/gallium/drivers/svga/svga_screen_buffer.h | 8
b/src/gallium/drivers/svga/svga_screen_texture.c | 68
b/src/gallium/drivers/svga/svga_state_framebuffer.c | 2
b/src/gallium/drivers/svga/svga_state_fs.c | 41
b/src/gallium/drivers/svga/svga_state_rss.c | 3
b/src/gallium/drivers/svga/svga_state_tss.c | 2
b/src/gallium/drivers/svga/svga_state_vs.c | 24
b/src/gallium/drivers/svga/svga_swtnl_backend.c | 15
b/src/gallium/drivers/svga/svga_swtnl_draw.c | 1
b/src/gallium/drivers/svga/svga_swtnl_state.c | 1
b/src/gallium/drivers/svga/svga_tgsi.c | 2
b/src/gallium/drivers/svga/svga_tgsi_decl_sm20.c | 3
b/src/gallium/drivers/svga/svga_tgsi_decl_sm30.c | 1
b/src/gallium/drivers/svga/svga_winsys.h | 6
b/src/gallium/drivers/trace/tr_context.c | 2
b/src/gallium/drivers/trace/tr_drm.c | 1
b/src/gallium/drivers/trace/tr_dump.c | 4
b/src/gallium/drivers/trace/tr_rbug.c | 6
b/src/gallium/drivers/trace/tr_state.h | 2
b/src/gallium/include/pipe/p_inlines.h | 41
b/src/gallium/include/pipe/p_screen.h | 5
b/src/gallium/include/state_tracker/drm_api.h | 5
b/src/gallium/state_trackers/dri/dri_context.c | 6
b/src/gallium/state_trackers/dri/dri_drawable.c | 19
b/src/gallium/state_trackers/dri/dri_drawable.h | 3
b/src/gallium/state_trackers/dri/dri_screen.c | 16
b/src/gallium/state_trackers/dri/dri_screen.h | 1
b/src/gallium/state_trackers/egl/egl_surface.c | 4
b/src/gallium/state_trackers/egl/egl_tracker.c | 3
b/src/gallium/state_trackers/glx/xlib/glx_api.c | 1
b/src/gallium/state_trackers/python/SConscript | 1
b/src/gallium/state_trackers/vega/api_path.c | 3
b/src/gallium/state_trackers/vega/arc.c | 2
b/src/gallium/state_trackers/vega/bezier.c | 1
b/src/gallium/state_trackers/vega/shader.c | 4
b/src/gallium/state_trackers/vega/stroker.c | 4
b/src/gallium/state_trackers/vega/vg_tracker.c | 1
b/src/gallium/state_trackers/wgl/stw_pixelformat.c | 5
b/src/gallium/state_trackers/xorg/xorg_composite.c | 3
b/src/gallium/state_trackers/xorg/xorg_crtc.c | 10
b/src/gallium/state_trackers/xorg/xorg_dri2.c | 50
b/src/gallium/state_trackers/xorg/xorg_driver.c | 125 +
b/src/gallium/state_trackers/xorg/xorg_exa.c | 5
b/src/gallium/state_trackers/xorg/xorg_exa_tgsi.c | 35
b/src/gallium/state_trackers/xorg/xorg_output.c | 2
b/src/gallium/state_trackers/xorg/xorg_renderer.c | 1
b/src/gallium/state_trackers/xorg/xorg_tracker.h | 1
b/src/gallium/state_trackers/xorg/xorg_winsys.h | 1
b/src/gallium/state_trackers/xorg/xorg_xv.c | 10
b/src/gallium/winsys/drm/intel/gem/intel_drm_api.c | 1
b/src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c | 1
b/src/gallium/winsys/drm/radeon/core/radeon_drm.c | 1
b/src/gallium/winsys/drm/vmware/core/vmw_context.c | 114 +
b/src/gallium/winsys/drm/vmware/core/vmw_screen.h | 4
b/src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c | 86
b/src/gallium/winsys/drm/vmware/core/vmw_screen_pools.c | 22
b/src/gallium/winsys/drm/vmware/xorg/vmw_video.c | 3
b/src/gallium/winsys/drm/vmware/xorg/vmw_xorg.c | 10
b/src/gallium/winsys/gdi/SConscript | 2
b/src/gallium/winsys/xlib/xlib_brw_context.c | 209 ++
b/src/gallium/winsys/xlib/xlib_softpipe.c | 40
b/src/glu/sgi/libnurbs/interface/bezierPatchMesh.h | 1
b/src/glu/sgi/libnurbs/interface/glsurfeval.h | 2
b/src/glu/sgi/libnurbs/internals/arcsorter.h | 1
b/src/glu/sgi/libnurbs/internals/displaylist.h | 1
b/src/glu/sgi/libnurbs/internals/gridvertex.h | 2
b/src/glu/sgi/libnurbs/internals/knotvector.cc | 3
b/src/glu/sgi/libnurbs/internals/mesher.cc | 3
b/src/glu/sgi/libnurbs/internals/reader.cc | 2
b/src/glu/sgi/libnurbs/internals/reader.h | 14
b/src/glu/sgi/libnurbs/internals/renderhints.cc | 4
b/src/glu/sgi/libnurbs/internals/simplemath.h | 2
b/src/glu/sgi/libnurbs/internals/slicer.cc | 4
b/src/glu/sgi/libnurbs/internals/subdivider.cc | 6
b/src/glu/sgi/libnurbs/internals/varray.cc | 8
b/src/glu/sgi/libnurbs/nurbtess/directedLine.cc | 32
b/src/glu/sgi/libnurbs/nurbtess/monoChain.cc | 1
b/src/glu/sgi/libnurbs/nurbtess/partitionY.cc | 4
b/src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc | 4
b/src/glu/sgi/libnurbs/nurbtess/sampleCompTop.cc | 4
b/src/glu/sgi/libnurbs/nurbtess/sampledLine.cc | 3
b/src/glx/x11/dri2.c | 4
b/src/glx/x11/dri_glx.c | 13
b/src/glx/x11/glxcmds.c | 4
b/src/glx/x11/glxcurrent.c | 8
b/src/glx/x11/glxext.c | 5
b/src/glx/x11/xf86dri.h | 4
b/src/mesa/Makefile | 2
b/src/mesa/drivers/common/meta.c | 47
b/src/mesa/drivers/dri/common/spantmp2.h | 2
b/src/mesa/drivers/dri/ffb/ffb_bitmap.c | 1
b/src/mesa/drivers/dri/ffb/ffb_clear.c | 3
b/src/mesa/drivers/dri/ffb/ffb_dd.c | 4
b/src/mesa/drivers/dri/ffb/ffb_depth.c | 1
b/src/mesa/drivers/dri/ffb/ffb_lines.c | 4
b/src/mesa/drivers/dri/ffb/ffb_points.c | 2
b/src/mesa/drivers/dri/ffb/ffb_span.c | 2
b/src/mesa/drivers/dri/ffb/ffb_state.c | 5
b/src/mesa/drivers/dri/ffb/ffb_stencil.c | 2
b/src/mesa/drivers/dri/ffb/ffb_tris.c | 2
b/src/mesa/drivers/dri/ffb/ffb_vb.c | 2
b/src/mesa/drivers/dri/ffb/ffb_xmesa.c | 2
b/src/mesa/drivers/dri/i810/i810context.c | 3
b/src/mesa/drivers/dri/i810/i810render.c | 1
b/src/mesa/drivers/dri/i810/i810screen.c | 4
b/src/mesa/drivers/dri/i810/i810state.c | 2
b/src/mesa/drivers/dri/i810/i810tex.c | 2
b/src/mesa/drivers/dri/i810/i810tex.h | 1
b/src/mesa/drivers/dri/i810/i810texmem.c | 1
b/src/mesa/drivers/dri/i810/i810vb.c | 1
b/src/mesa/drivers/dri/i915/i830_context.c | 3
b/src/mesa/drivers/dri/i915/i915_context.c | 5
b/src/mesa/drivers/dri/i915/i915_debug_fp.c | 3
b/src/mesa/drivers/dri/i915/i915_program.c | 2
b/src/mesa/drivers/dri/i915/i915_texstate.c | 7
b/src/mesa/drivers/dri/i915/i915_vtbl.c | 1
b/src/mesa/drivers/dri/i915/intel_render.c | 4
b/src/mesa/drivers/dri/i915/intel_tris.c | 1
b/src/mesa/drivers/dri/i965/brw_cc.c | 2
b/src/mesa/drivers/dri/i965/brw_clip_line.c | 1
b/src/mesa/drivers/dri/i965/brw_clip_point.c | 1
b/src/mesa/drivers/dri/i965/brw_clip_state.c | 1
b/src/mesa/drivers/dri/i965/brw_clip_tri.c | 1
b/src/mesa/drivers/dri/i965/brw_clip_unfilled.c | 1
b/src/mesa/drivers/dri/i965/brw_clip_util.c | 1
b/src/mesa/drivers/dri/i965/brw_context.c | 9
b/src/mesa/drivers/dri/i965/brw_disasm.c | 1
b/src/mesa/drivers/dri/i965/brw_draw.c | 2
b/src/mesa/drivers/dri/i965/brw_draw_upload.c | 10
b/src/mesa/drivers/dri/i965/brw_eu_emit.c | 4
b/src/mesa/drivers/dri/i965/brw_fallback.c | 1
b/src/mesa/drivers/dri/i965/brw_gs_emit.c | 1
b/src/mesa/drivers/dri/i965/brw_gs_state.c | 1
b/src/mesa/drivers/dri/i965/brw_program.c | 1
b/src/mesa/drivers/dri/i965/brw_sf_state.c | 1
b/src/mesa/drivers/dri/i965/brw_state.h | 2
b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c | 1
b/src/mesa/drivers/dri/i965/brw_vtbl.c | 1
b/src/mesa/drivers/dri/i965/brw_wm.c | 1
b/src/mesa/drivers/dri/i965/brw_wm_emit.c | 4
b/src/mesa/drivers/dri/i965/brw_wm_glsl.c | 2
b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 50
b/src/mesa/drivers/dri/intel/intel_blit.c | 1
b/src/mesa/drivers/dri/intel/intel_buffers.c | 2
b/src/mesa/drivers/dri/intel/intel_clear.c | 3
b/src/mesa/drivers/dri/intel/intel_context.c | 1
b/src/mesa/drivers/dri/intel/intel_context.h | 8
b/src/mesa/drivers/dri/intel/intel_pixel.c | 7
b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c | 6
b/src/mesa/drivers/dri/intel/intel_pixel_draw.c | 3
b/src/mesa/drivers/dri/intel/intel_pixel_read.c | 1
b/src/mesa/drivers/dri/intel/intel_regions.c | 1
b/src/mesa/drivers/dri/intel/intel_screen.c | 3
b/src/mesa/drivers/dri/intel/intel_state.c | 2
b/src/mesa/drivers/dri/intel/intel_swapbuffers.c | 1
b/src/mesa/drivers/dri/intel/intel_tex_copy.c | 8
b/src/mesa/drivers/dri/intel/intel_tex_image.c | 1
b/src/mesa/drivers/dri/intel/intel_tex_validate.c | 2
b/src/mesa/drivers/dri/mach64/mach64_context.c | 2
b/src/mesa/drivers/dri/mach64/mach64_dd.c | 3
b/src/mesa/drivers/dri/mach64/mach64_lock.c | 1
b/src/mesa/drivers/dri/mach64/mach64_screen.c | 2
b/src/mesa/drivers/dri/mach64/mach64_span.c | 1
b/src/mesa/drivers/dri/mach64/mach64_state.c | 3
b/src/mesa/drivers/dri/mach64/mach64_tex.c | 5
b/src/mesa/drivers/dri/mach64/mach64_texmem.c | 3
b/src/mesa/drivers/dri/mach64/mach64_texstate.c | 2
b/src/mesa/drivers/dri/mach64/mach64_vb.c | 1
b/src/mesa/drivers/dri/mga/mga_xmesa.c | 2
b/src/mesa/drivers/dri/mga/mgadd.c | 5
b/src/mesa/drivers/dri/mga/mgaioctl.c | 3
b/src/mesa/drivers/dri/mga/mgarender.c | 1
b/src/mesa/drivers/dri/mga/mgatex.c | 3
b/src/mesa/drivers/dri/mga/mgatris.c | 1
b/src/mesa/drivers/dri/mga/mgavb.c | 1
b/src/mesa/drivers/dri/r200/r200_state_init.c | 3
b/src/mesa/drivers/dri/r200/r200_vertprog.c | 2
b/src/mesa/drivers/dri/r300/compiler/memory_pool.c | 4
b/src/mesa/drivers/dri/r300/compiler/radeon_code.c | 3
b/src/mesa/drivers/dri/r300/compiler/radeon_compiler.c | 11
b/src/mesa/drivers/dri/r300/compiler/radeon_program.c | 6
b/src/mesa/drivers/dri/r300/compiler/radeon_program_alu.c | 30
b/src/mesa/drivers/dri/r300/r300_cmdbuf.c | 3
b/src/mesa/drivers/dri/r300/r300_context.c | 5
b/src/mesa/drivers/dri/r300/r300_draw.c | 3
b/src/mesa/drivers/dri/r300/r300_emit.c | 6
b/src/mesa/drivers/dri/r300/r300_fragprog_common.c | 2
b/src/mesa/drivers/dri/r300/r300_ioctl.c | 2
b/src/mesa/drivers/dri/r300/r300_render.c | 6
b/src/mesa/drivers/dri/r300/r300_state.c | 4
b/src/mesa/drivers/dri/r300/r300_tex.c | 5
b/src/mesa/drivers/dri/r300/r300_texstate.c | 2
b/src/mesa/drivers/dri/r300/r300_vertprog.c | 1
b/src/mesa/drivers/dri/r600/r600_context.h | 1
b/src/mesa/drivers/dri/r600/r600_texstate.c | 82
b/src/mesa/drivers/dri/r600/r700_assembler.c | 20
b/src/mesa/drivers/dri/r600/r700_assembler.h | 1
b/src/mesa/drivers/dri/r600/r700_chip.c | 5
b/src/mesa/drivers/dri/r600/r700_state.c | 6
b/src/mesa/drivers/dri/r600/r700_vertprog.c | 8
b/src/mesa/drivers/dri/r600/r700_vertprog.h | 1
b/src/mesa/drivers/dri/radeon/radeon_common.c | 3
b/src/mesa/drivers/dri/radeon/radeon_cs_legacy.c | 3
b/src/mesa/drivers/dri/radeon/radeon_tcl.c | 1
b/src/mesa/drivers/dri/savage/savagedd.c | 4
b/src/mesa/drivers/dri/savage/savageioctl.c | 2
b/src/mesa/drivers/dri/savage/savagerender.c | 1
b/src/mesa/drivers/dri/savage/savagespan.c | 1
b/src/mesa/drivers/dri/savage/savagetex.c | 2
b/src/mesa/drivers/dri/savage/savagetris.c | 1
b/src/mesa/drivers/dri/sis/sis6326_state.c | 2
b/src/mesa/drivers/dri/sis/sis_context.c | 5
b/src/mesa/drivers/dri/sis/sis_dd.c | 2
b/src/mesa/drivers/dri/sis/sis_fog.c | 1
b/src/mesa/drivers/dri/sis/sis_screen.c | 1
b/src/mesa/drivers/dri/sis/sis_state.c | 4
b/src/mesa/drivers/dri/sis/sis_tex.c | 1
b/src/mesa/drivers/dri/sis/sis_texstate.c | 1
b/src/mesa/drivers/dri/sis/sis_tris.c | 1
b/src/mesa/drivers/dri/tdfx/tdfx_dd.c | 9
b/src/mesa/drivers/dri/tdfx/tdfx_lock.c | 1
b/src/mesa/drivers/dri/tdfx/tdfx_pixels.c | 1
b/src/mesa/drivers/dri/tdfx/tdfx_screen.c | 2
b/src/mesa/drivers/dri/tdfx/tdfx_state.c | 4
b/src/mesa/drivers/dri/tdfx/tdfx_tex.c | 2
b/src/mesa/drivers/dri/tdfx/tdfx_texman.c | 1
b/src/mesa/drivers/dri/tdfx/tdfx_texstate.c | 3
b/src/mesa/drivers/dri/tdfx/tdfx_vb.c | 5
b/src/mesa/drivers/dri/unichrome/via_context.c | 3
b/src/mesa/drivers/dri/unichrome/via_ioctl.c | 1
b/src/mesa/drivers/dri/unichrome/via_render.c | 1
b/src/mesa/drivers/dri/unichrome/via_screen.c | 4
b/src/mesa/drivers/dri/unichrome/via_state.c | 3
b/src/mesa/drivers/dri/unichrome/via_tex.c | 2
b/src/mesa/drivers/dri/unichrome/via_texcombine.c | 1
b/src/mesa/main/attrib.c | 48
b/src/mesa/main/blend.c | 1
b/src/mesa/main/buffers.c | 2
b/src/mesa/main/convolve.c | 1
b/src/mesa/main/debug.c | 4
b/src/mesa/main/depthstencil.c | 1
b/src/mesa/main/dispatch.c | 4
b/src/mesa/main/dlist.c | 21
b/src/mesa/main/drawpix.c | 1
b/src/mesa/main/enable.c | 1
b/src/mesa/main/enums.c | 465 ++---
b/src/mesa/main/fbobject.c | 30
b/src/mesa/main/formats.c | 2
b/src/mesa/main/image.c | 3
b/src/mesa/main/lines.c | 2
b/src/mesa/main/mipmap.c | 1
b/src/mesa/main/pixel.c | 1
b/src/mesa/main/pixelstore.c | 3
b/src/mesa/main/points.c | 1
b/src/mesa/main/polygon.c | 1
b/src/mesa/main/scissor.c | 6
b/src/mesa/main/state.c | 7
b/src/mesa/main/texcompress.c | 3
b/src/mesa/main/texformat.c | 2
b/src/mesa/main/texgetimage.c | 4
b/src/mesa/main/teximage.c | 1
b/src/mesa/main/texobj.c | 1
b/src/mesa/main/texparam.c | 2
b/src/mesa/main/texstate.c | 2
b/src/mesa/main/texstore.c | 4
b/src/mesa/main/version.h | 8
b/src/mesa/main/vtxfmt.c | 2
b/src/mesa/shader/arbprogparse.c | 3
b/src/mesa/shader/arbprogram.c | 33
b/src/mesa/shader/nvfragparse.c | 2
b/src/mesa/shader/nvvertparse.c | 1
b/src/mesa/shader/prog_execute.c | 67
b/src/mesa/shader/prog_optimize.c | 2
b/src/mesa/shader/prog_parameter.c | 8
b/src/mesa/shader/prog_parameter_layout.c | 16
b/src/mesa/shader/prog_print.c | 8
b/src/mesa/shader/prog_statevars.c | 1
b/src/mesa/shader/program_parse.tab.c | 627 +++----
b/src/mesa/shader/program_parse.tab.h | 2
b/src/mesa/shader/program_parse.y | 95 -
b/src/mesa/shader/program_parser.h | 6
b/src/mesa/shader/shader_api.c | 2
b/src/mesa/shader/slang/slang_builtin.c | 1
b/src/mesa/shader/slang/slang_codegen.c | 15
b/src/mesa/shader/slang/slang_codegen.h | 1
b/src/mesa/shader/slang/slang_compile.c | 6
b/src/mesa/shader/slang/slang_compile_operation.c | 1
b/src/mesa/shader/slang/slang_emit.c | 1
b/src/mesa/shader/slang/slang_link.c | 1
b/src/mesa/shader/slang/slang_log.c | 1
b/src/mesa/state_tracker/st_atom_framebuffer.c | 1
b/src/mesa/state_tracker/st_atom_pixeltransfer.c | 1
b/src/mesa/state_tracker/st_atom_sampler.c | 1
b/src/mesa/state_tracker/st_atom_scissor.c | 17
b/src/mesa/state_tracker/st_atom_shader.c | 3
b/src/mesa/state_tracker/st_cb_accum.c | 2
b/src/mesa/state_tracker/st_cb_bitmap.c | 15
b/src/mesa/state_tracker/st_cb_blit.c | 4
b/src/mesa/state_tracker/st_cb_bufferobjects.c | 65
b/src/mesa/state_tracker/st_cb_clear.c | 11
b/src/mesa/state_tracker/st_cb_drawpixels.c | 6
b/src/mesa/state_tracker/st_cb_fbo.c | 1
b/src/mesa/state_tracker/st_cb_feedback.c | 3
b/src/mesa/state_tracker/st_cb_program.c | 1
b/src/mesa/state_tracker/st_cb_queryobj.c | 1
b/src/mesa/state_tracker/st_cb_rasterpos.c | 1
b/src/mesa/state_tracker/st_cb_readpixels.c | 2
b/src/mesa/state_tracker/st_cb_strings.c | 1
b/src/mesa/state_tracker/st_cb_texture.c | 60
b/src/mesa/state_tracker/st_cb_viewport.c | 7
b/src/mesa/state_tracker/st_context.c | 6
b/src/mesa/state_tracker/st_draw_feedback.c | 1
b/src/mesa/state_tracker/st_extensions.c | 1
b/src/mesa/state_tracker/st_format.c | 8
b/src/mesa/state_tracker/st_framebuffer.c | 4
b/src/mesa/state_tracker/st_gen_mipmap.c | 2
b/src/mesa/state_tracker/st_inlines.h | 10
b/src/mesa/state_tracker/st_mesa_to_tgsi.c | 21
b/src/mesa/state_tracker/st_program.c | 1
b/src/mesa/state_tracker/st_texture.c | 1
b/src/mesa/swrast/s_accum.c | 1
b/src/mesa/swrast/s_atifragshader.c | 1
b/src/mesa/swrast/s_bitmap.c | 1
b/src/mesa/swrast/s_copypix.c | 2
b/src/mesa/swrast/s_depth.c | 42
b/src/mesa/swrast/s_drawpix.c | 1
b/src/mesa/swrast/s_feedback.c | 1
b/src/mesa/swrast/s_fragprog.c | 1
b/src/mesa/swrast/s_lines.c | 1
b/src/mesa/swrast/s_points.c | 1
b/src/mesa/swrast/s_readpix.c | 1
b/src/mesa/swrast/s_span.c | 17
b/src/mesa/swrast/s_texcombine.c | 1
b/src/mesa/tnl/t_context.c | 1
b/src/mesa/tnl/t_draw.c | 4
b/src/mesa/tnl/t_pipeline.c | 1
b/src/mesa/tnl/t_rasterpos.c | 1
b/src/mesa/tnl/t_vb_program.c | 8
b/src/mesa/vbo/vbo_exec.c | 3
b/src/mesa/vbo/vbo_exec_array.c | 15
b/src/mesa/vbo/vbo_exec_draw.c | 1
b/src/mesa/vbo/vbo_save.c | 2
b/src/mesa/vbo/vbo_save_loopback.c | 1
b/src/mesa/vbo/vbo_split_copy.c | 3
b/src/mesa/x86/assyntax.h | 4
b/src/mesa/x86/gen_matypes.c | 14
b/src/mesa/x86/glapi_x86.S | 2
b/src/mesa/x86/read_rgba_span_x86.S | 4
b/src/mesa/x86/x86_xform.c | 1
src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c | 152 -
src/mesa/drivers/dri/radeon/radeon_lighting.c | 681 -------
500 files changed, 3613 insertions(+), 3179 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 mesa-7.7.1-fixes.patchIndex: mesa-7.7.1-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-12/mesa-7.7.1-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mesa-7.7.1-fixes.patch 11 Jan 2010 03:44:35 -0000 1.1
+++ mesa-7.7.1-fixes.patch 27 Jan 2010 02:53:19 -0000 1.2
@@ -7,7 +7,7 @@ index e927cb9..b10d1fe 100644
# Rules for making release tarballs
-VERSION=7.7
-+VERSION=7.7.1
++VERSION=7.7.1-devel
DIRECTORY = Mesa-$(VERSION)
LIB_NAME = MesaLib-$(VERSION)
DEMO_NAME = MesaDemos-$(VERSION)
@@ -37,6 +37,94 @@ index 9af816c..c9616bb 100644
MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
# external projects. This should be useless now that we use libdrm.
+diff --git a/docs/envvars.html b/docs/envvars.html
+index b2c0e01..bb1c914 100644
+--- a/docs/envvars.html
++++ b/docs/envvars.html
+@@ -51,5 +51,24 @@ See the <A HREF="xlibdriver.html">Xlib software driver page</A> for details.
+ </ul>
+
+
++<p>
++These environment variables are for the Intel i945/i965 drivers:
++</p>
++<ul>
++<li>INTEL_STRICT_CONFORMANCE - if set to 1, enable sw fallbacks to improve
++ OpenGL conformance. If set to 2, always use software rendering.
++<li>INTEL_NO_BLIT - if set, disable hardware-accelerated glBitmap,
++ glCopyPixels, glDrawPixels.
++</ul>
++
++
++<p>
++These environment variables are for the Radeon R300 driver:
++</p>
++<ul>
++<li>R300_NO_TCL - if set, disable hardware-accelerated Transform/Clip/Lighting.
++</ul>
++
++
+ </BODY>
+ </HTML>
+diff --git a/docs/lists.html b/docs/lists.html
+index 5227fbd..9c17a9f 100644
+--- a/docs/lists.html
++++ b/docs/lists.html
+@@ -13,36 +13,41 @@
+ </p>
+
+ <ul>
+-<li><a href="https://lists.sourceforge.net/lists/listinfo/mesa3d-announce"
+-target="_parent">mesa3d-announce</a> - announcements of new Mesa
+-versions are sent to this list.
+-</li>
+-<br>
+ <li><a href="https://lists.sourceforge.net/lists/listinfo/mesa3d-users"
+-target="_parent">mesa3d-users</a> - intended for users of the Mesa and DRI.
+-Newbie questions are appropriate, but please try the general OpenGL
++target="_parent">mesa3d-users</a> - intended for end-users of Mesa and DRI
++drivers. Newbie questions are OK, but please try the general OpenGL
+ resources and Mesa/DRI documentation first.
+ </li>
+ <br>
+ <li><a href="https://lists.sourceforge.net/lists/listinfo/mesa3d-dev"
+-target="_parent">mesa3d-dev</a> - for discussion of Mesa and Direct Rendering
+-Infrastructure development. Not for beginners.
++target="_parent">mesa3d-dev</a> - for Mesa, Gallium and DRI development
++discussion. Not for beginners.
+ </li>
+ <br>
+ <li><a href="http://lists.freedesktop.org/mailman/listinfo/mesa-commit"
+ target="_parent">mesa-commit</a> - relays git check-in messages
+ (for developers).
++In general, people should not post to this list.
++</li>
+ <br>
+-Note: the old mesa3d-cvs list is no longer in use.
++<li><a href="https://lists.sourceforge.net/lists/listinfo/mesa3d-announce"
++target="_parent">mesa3d-announce</a> - announcements of new Mesa
++versions are sent to this list. Very low traffic.
+ </li>
+ </ul>
+
++<p>
++Follow the links above for list archives.
++</p>
++
+ <p>For mailing lists about Direct Rendering Modules (drm) in Linux/BSD
+-kernels, see <a href="http://dri.freedesktop.org/wiki/MailingLists">wiki</a>.
++kernels, see the
++<a href="http://dri.freedesktop.org/wiki/MailingLists" target="_parent">
++DRI wiki</a>.
++</p>
+
+ <p>
+-<b>Notice</b>: non-member posts to any of these lists will be automatically
+-rejected.
++<b>Notice</b>: You must subscribe to these lists in order to post to them.
+ </p>
+
+
diff --git a/docs/news.html b/docs/news.html
index 2abec2e..0a0be71 100644
--- a/docs/news.html
@@ -450,6 +538,24 @@ index 59f6149..b292840 100644
#define glViewport MANGLE(Viewport)
#define glWaitSync MANGLE(WaitSync)
#define glWeightbvARB MANGLE(WeightbvARB)
+diff --git a/progs/demos/Makefile b/progs/demos/Makefile
+index 65fdbaa..f21d916 100644
+--- a/progs/demos/Makefile
++++ b/progs/demos/Makefile
+@@ -124,13 +124,6 @@ reflect.o: reflect.c showbuffer.h
+ $(APP_CC) -c -I$(INCDIR) $(CFLAGS) reflect.c
+
+
+-shadowtex: shadowtex.o showbuffer.o
+- $(APP_CC) $(CFLAGS) $(LDFLAGS) shadowtex.o showbuffer.o $(LIBS) -o $@
+-
+-shadowtex.o: shadowtex.c showbuffer.h
+- $(APP_CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c
+-
+-
+ gloss: gloss.o trackball.o readtex.o
+ $(APP_CC) $(CFLAGS) $(LDFLAGS) gloss.o trackball.o readtex.o $(LIBS) -o $@
+
diff --git a/progs/demos/engine.c b/progs/demos/engine.c
index 3cf311e..838d28c 100644
--- a/progs/demos/engine.c
@@ -493,6 +599,18 @@ index 3cf311e..838d28c 100644
}
};
+diff --git a/progs/demos/fbotexture.c b/progs/demos/fbotexture.c
+index 5648266..46bf1c5 100644
+--- a/progs/demos/fbotexture.c
++++ b/progs/demos/fbotexture.c
+@@ -14,7 +14,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <math.h>
+ #include "extfuncs.h"
+
+ /* For debug */
diff --git a/progs/demos/fire.c b/progs/demos/fire.c
index dd70f61..475582c 100644
--- a/progs/demos/fire.c
@@ -603,10 +721,18 @@ index 8fe405e..e6567dd 100644
{
printf ("\nError opening file !\n");
diff --git a/progs/demos/isosurf.c b/progs/demos/isosurf.c
-index 2e9dff1..dd56965 100644
+index 2e9dff1..d9e50a3 100644
--- a/progs/demos/isosurf.c
+++ b/progs/demos/isosurf.c
-@@ -132,9 +132,11 @@ static void read_surface( char *filename )
+@@ -27,7 +27,6 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+-#include <string.h>
+ #include <math.h>
+ #ifdef _WIN32
+ #include <windows.h>
+@@ -132,9 +131,11 @@ static void read_surface( char *filename )
numverts = 0;
while (!feof(f) && numverts<maxverts) {
@@ -621,6 +747,30 @@ index 2e9dff1..dd56965 100644
numverts++;
}
numverts--;
+diff --git a/progs/demos/morph3d.c b/progs/demos/morph3d.c
+index 01a06ab..eab520a 100644
+--- a/progs/demos/morph3d.c
++++ b/progs/demos/morph3d.c
+@@ -137,7 +137,6 @@ So the angle is:
+ #endif
+ #include <GL/glut.h>
+ #include <math.h>
+-#include <string.h>
+
+ #define Scale 0.3
+
+diff --git a/progs/demos/shadowtex.c b/progs/demos/shadowtex.c
+index dc5a4bb..59d0070 100644
+--- a/progs/demos/shadowtex.c
++++ b/progs/demos/shadowtex.c
+@@ -38,7 +38,6 @@
+ #include <math.h>
+ #include <GL/glew.h>
[...10101 lines suppressed...]
+++ b/src/mesa/tnl/t_vb_program.c
-@@ -390,6 +390,13 @@ run_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage )
+@@ -40,7 +40,6 @@
+ #include "shader/prog_statevars.h"
+ #include "shader/prog_execute.h"
+ #include "swrast/s_context.h"
+-#include "swrast/s_texfilter.h"
+
+ #include "tnl/tnl.h"
+ #include "tnl/t_context.h"
+@@ -390,6 +389,13 @@ run_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage )
#endif
COPY_4V(store->results[attr].data[i], machine.Outputs[attr]);
}
@@ -9727,6 +17925,134 @@ index e69f7d5..a9dae7d 100644
#ifdef NAN_CHECK
ASSERT(machine.Outputs[0][3] != 0.0F);
#endif
+diff --git a/src/mesa/vbo/vbo_exec.c b/src/mesa/vbo/vbo_exec.c
+index e168a89..a057bef 100644
+--- a/src/mesa/vbo/vbo_exec.c
++++ b/src/mesa/vbo/vbo_exec.c
+@@ -28,9 +28,6 @@
+
+ #include "main/api_arrayelt.h"
+ #include "main/glheader.h"
+-#include "main/imports.h"
+-#include "main/context.h"
+-#include "main/macros.h"
+ #include "main/mtypes.h"
+ #include "main/vtxfmt.h"
+
+diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
+index 6de8f05..bd2fccd 100644
+--- a/src/mesa/vbo/vbo_exec_array.c
++++ b/src/mesa/vbo/vbo_exec_array.c
+@@ -35,7 +35,6 @@
+ #include "main/bufferobj.h"
+ #include "main/enums.h"
+ #include "main/macros.h"
+-#include "glapi/dispatch.h"
+
+ #include "vbo_context.h"
+
+@@ -689,6 +688,16 @@ vbo_exec_DrawRangeElementsBaseVertex(GLenum mode,
+ * or we can read/write out of memory in several different places!
+ */
+
++ /* Catch/fix some potential user errors */
++ if (type == GL_UNSIGNED_BYTE) {
++ start = MIN2(start, 0xff);
++ end = MIN2(end, 0xff);
++ }
++ else if (type == GL_UNSIGNED_SHORT) {
++ start = MIN2(start, 0xffff);
++ end = MIN2(end, 0xffff);
++ }
++
+ if (end >= ctx->Array.ArrayObj->_MaxElement) {
+ /* the max element is out of bounds of one or more enabled arrays */
+ warnCount++;
+@@ -739,6 +748,10 @@ vbo_exec_DrawRangeElementsBaseVertex(GLenum mode,
+ */
+ }
+ #endif
++
++ /* Set 'end' to the max possible legal value */
++ assert(ctx->Array.ArrayObj->_MaxElement >= 1);
++ end = ctx->Array.ArrayObj->_MaxElement - 1;
+ }
+ else if (0) {
+ _mesa_printf("glDraw[Range]Elements{,BaseVertex}"
+diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
+index 4f43856..d7dbbce 100644
+--- a/src/mesa/vbo/vbo_exec_draw.c
++++ b/src/mesa/vbo/vbo_exec_draw.c
+@@ -30,7 +30,6 @@
+ #include "main/context.h"
+ #include "main/enums.h"
+ #include "main/state.h"
+-#include "main/macros.h"
+
+ #include "vbo_context.h"
+
+diff --git a/src/mesa/vbo/vbo_save.c b/src/mesa/vbo/vbo_save.c
+index 9757c3d..10f705c 100644
+--- a/src/mesa/vbo/vbo_save.c
++++ b/src/mesa/vbo/vbo_save.c
+@@ -28,8 +28,6 @@
+
+ #include "main/mtypes.h"
+ #include "main/bufferobj.h"
+-#include "main/dlist.h"
+-#include "main/vtxfmt.h"
+ #include "main/imports.h"
+
+ #include "vbo_context.h"
+diff --git a/src/mesa/vbo/vbo_save_loopback.c b/src/mesa/vbo/vbo_save_loopback.c
+index b7a74e4..f13a16e 100644
+--- a/src/mesa/vbo/vbo_save_loopback.c
++++ b/src/mesa/vbo/vbo_save_loopback.c
+@@ -29,7 +29,6 @@
+ #include "main/glheader.h"
+ #include "main/enums.h"
+ #include "main/imports.h"
+-#include "main/macros.h"
+ #include "main/mtypes.h"
+ #include "glapi/dispatch.h"
+ #include "glapi/glapi.h"
+diff --git a/src/mesa/vbo/vbo_split_copy.c b/src/mesa/vbo/vbo_split_copy.c
+index c45190b..2ca1112 100644
+--- a/src/mesa/vbo/vbo_split_copy.c
++++ b/src/mesa/vbo/vbo_split_copy.c
+@@ -34,7 +34,6 @@
+ #include "main/imports.h"
+ #include "main/image.h"
+ #include "main/macros.h"
+-#include "main/enums.h"
+ #include "main/mtypes.h"
+
+ #include "vbo_split.h"
+@@ -221,8 +220,6 @@ begin( struct copy_context *copy, GLenum mode, GLboolean begin_flag )
+ {
+ struct _mesa_prim *prim = ©->dstprim[copy->dstprim_nr];
+
+-/* _mesa_printf("begin %s (%d)\n", _mesa_lookup_prim_by_nr(mode), begin_flag); */
+-
+ prim->mode = mode;
+ prim->begin = begin_flag;
+ }
+diff --git a/src/mesa/x86/assyntax.h b/src/mesa/x86/assyntax.h
+index 524944f..de1f6a4 100644
+--- a/src/mesa/x86/assyntax.h
++++ b/src/mesa/x86/assyntax.h
+@@ -1735,9 +1735,9 @@ SECTION _DATA public align=16 class=DATA use32 flat
+ * If we build with gcc's -fvisibility=hidden flag, we'll need to change
+ * the symbol visibility mode to 'default'.
+ */
+-#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__)
++#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)
+ # define HIDDEN(x) .hidden x
+-#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303 && !defined(__DJGPP__) && !defined(__MINGW32__)
++#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303 && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)
+ # pragma GCC visibility push(default)
+ # define HIDDEN(x) .hidden x
+ #else
diff --git a/src/mesa/x86/gen_matypes.c b/src/mesa/x86/gen_matypes.c
index d56b701..771d9df 100644
--- a/src/mesa/x86/gen_matypes.c
@@ -9755,3 +18081,50 @@ index d56b701..771d9df 100644
#define DEFINE( s, d ) \
printf( "#define %s\t0x%x\n", s, d );
+diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
+index 0da924c..849fbce 100644
+--- a/src/mesa/x86/glapi_x86.S
++++ b/src/mesa/x86/glapi_x86.S
+@@ -46,7 +46,7 @@
+
+ #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))
+
+-#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__)
++#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)
+ #define GLOBL_FN(x) GLOBL x ; .type x, function
+ #else
+ #define GLOBL_FN(x) GLOBL x
+diff --git a/src/mesa/x86/read_rgba_span_x86.S b/src/mesa/x86/read_rgba_span_x86.S
+index 92b1c2d..3886a51 100644
+--- a/src/mesa/x86/read_rgba_span_x86.S
++++ b/src/mesa/x86/read_rgba_span_x86.S
+@@ -31,7 +31,7 @@
+ */
+
+ .file "read_rgba_span_x86.S"
+-#if !defined(__DJGPP__) && !defined(__MINGW32__) /* this one cries for assyntax.h */
++#if !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__) /* this one cries for assyntax.h */
+ /* Kevin F. Quinn 2nd July 2006
+ * Replaced data segment constants with text-segment instructions.
+ */
+@@ -671,7 +671,7 @@ _generic_read_RGBA_span_RGB565_MMX:
+ emms
+ #endif
+ ret
+-#endif /* !defined(__DJGPP__) && !defined(__MINGW32__) */
++#endif /* !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__) */
+
+ #if defined (__ELF__) && defined (__linux__)
+ .section .note.GNU-stack,"",%progbits
+diff --git a/src/mesa/x86/x86_xform.c b/src/mesa/x86/x86_xform.c
+index 52f6b25..c834e2b 100644
+--- a/src/mesa/x86/x86_xform.c
++++ b/src/mesa/x86/x86_xform.c
+@@ -30,7 +30,6 @@
+ #include "main/glheader.h"
+ #include "main/context.h"
+ #include "math/m_xform.h"
+-#include "tnl/t_context.h"
+
+ #include "x86_xform.h"
+ #include "common_x86_asm.h"
Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-12/mesa.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -p -r1.262 -r1.263
--- mesa.spec 11 Jan 2010 03:44:36 -0000 1.262
+++ mesa.spec 27 Jan 2010 02:53:20 -0000 1.263
@@ -21,7 +21,7 @@
Summary: Mesa graphics libraries
Name: mesa
Version: 7.7
-Release: 2%{?dist}
+Release: 3%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -393,6 +393,9 @@ rm -rf $RPM_BUILD_ROOT
%{demodir}
%changelog
+* Wed Jan 27 2010 Dave Airlie <airlied at redhat.com> 7.7-3
+- update 7.7 branch stable fixes (r100 colors for sure).
+
* Mon Jan 11 2010 Dave Airlie <airlied at redhat.com> 7.7-2
- add fixes from mesa 7.7 branch (fix r100 colors hopefully)
More information about the scm-commits
mailing list