Module Name: xsrc
Committed By: mrg
Date: Thu Jun 11 01:03:01 UTC 2009
Modified Files:
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/mach64:
mach64_context.h
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200: r200_tcl.c
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/sis: sis_context.h
Removed Files:
xsrc/external/mit/MesaLib/dist/configs: darwin-static
darwin-static-x86ppc
xsrc/external/mit/MesaLib/dist/docs: MESA_packed_depth_stencil.spec
MESA_program_debug.spec MESA_sprite_point.spec MESA_trace.spec
memory.html
xsrc/external/mit/MesaLib/dist/include: GLView.h
xsrc/external/mit/MesaLib/dist/include/GL: amesa.h fxmesa.h
uglglutshapes.h uglmesa.h xmesa.h xmesa_x.h xmesa_xf86.h
xsrc/external/mit/MesaLib/dist/src/glx/x11: dri_glx.h
glx_texture_compression.c indirect_dispatch.c indirect_dispatch.h
indirect_dispatch_swap.c indirect_reqsize.c indirect_reqsize.h
indirect_size_get.c indirect_size_get.h indirect_table.c
indirect_va_private.h
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/common: sources
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/common:
dri_bufmgr.c dri_bufmgr.h dri_bufpool.h dri_drmpool.c
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/glcore: Makefile
glcore_driver.c
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915:
i915_texprog.c intel_batchbuffer.c intel_batchbuffer.h
intel_context.c intel_context.h intel_ioctl.c intel_ioctl.h
intel_pixel.c intel_reg.h intel_rotate.c intel_rotate.h
intel_screen.c intel_screen.h intel_span.c intel_span.h intel_tex.c
intel_tex.h intel_texmem.c
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/server:
i830_common.h i830_dri.h intel.h intel_dri.c
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex: Makefile
i830_context.c i830_context.h i830_metaops.c i830_reg.h
i830_state.c i830_tex.c i830_texblend.c i830_texstate.c i830_vtbl.c
i915_context.c i915_context.h i915_debug.c i915_fragprog.c
i915_metaops.c i915_program.c i915_program.h i915_reg.h
i915_state.c i915_tex.c i915_tex_layout.c i915_texstate.c
i915_vtbl.c intel_batchbuffer.c intel_batchbuffer.h
intel_batchpool.c intel_blit.c intel_blit.h intel_buffer_objects.c
intel_buffer_objects.h intel_buffers.c intel_buffers.h
intel_context.c intel_context.h intel_depthstencil.c
intel_depthstencil.h intel_fbo.c intel_fbo.h intel_ioctl.c
intel_ioctl.h intel_mipmap_tree.c intel_mipmap_tree.h intel_pixel.c
intel_pixel.h intel_pixel_bitmap.c intel_pixel_copy.c
intel_pixel_draw.c intel_pixel_read.c intel_reg.h intel_regions.c
intel_regions.h intel_render.c intel_rotate.c intel_rotate.h
intel_screen.c intel_screen.h intel_span.c intel_span.h
intel_state.c intel_structs.h intel_tex.c intel_tex.h
intel_tex_copy.c intel_tex_format.c intel_tex_image.c
intel_tex_subimage.c intel_tex_validate.c intel_tris.c intel_tris.h
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/server:
i830_common.h i830_dri.h intel.h intel_dri.c
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965: brw_aub.c
brw_aub.h brw_aub_playback.c brw_exec_generic.c brw_hal.c brw_hal.h
brw_metaops.c brw_state_pool.c brw_vs_tnl.c bufmgr.h bufmgr_fake.c
intel_batchbuffer.c intel_batchbuffer.h intel_blit.c intel_blit.h
intel_buffer_objects.c intel_buffer_objects.h intel_buffers.c
intel_context.c intel_context.h intel_ioctl.c intel_ioctl.h
intel_mipmap_tree.c intel_mipmap_tree.h intel_pixel_bitmap.c
intel_pixel_copy.c intel_reg.h intel_regions.c intel_regions.h
intel_screen.c intel_screen.h intel_span.c intel_span.h intel_tex.c
intel_tex.h intel_tex_validate.c
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/server:
i830_common.h i830_dri.h intel.h intel_dri.c
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau: Makefile
nouveau_bufferobj.c nouveau_bufferobj.h nouveau_buffers.c
nouveau_buffers.h nouveau_card.c nouveau_card.h nouveau_card_list.h
nouveau_context.c nouveau_context.h nouveau_ctrlreg.h nouveau_dri.h
nouveau_driver.c nouveau_driver.h nouveau_fifo.c nouveau_fifo.h
nouveau_lock.c nouveau_lock.h nouveau_msg.h nouveau_object.c
nouveau_object.h nouveau_query.c nouveau_query.h nouveau_reg.h
nouveau_screen.c nouveau_screen.h nouveau_shader.c nouveau_shader.h
nouveau_shader_0.c nouveau_shader_1.c nouveau_shader_2.c
nouveau_span.c nouveau_span.h nouveau_state.c nouveau_state.h
nouveau_state_cache.c nouveau_state_cache.h nouveau_swtcl.c
nouveau_swtcl.h nouveau_sync.c nouveau_sync.h nouveau_tex.c
nouveau_tex.h nv04_state.c nv04_swtcl.c nv04_swtcl.h nv10_state.c
nv10_swtcl.c nv10_swtcl.h nv20_shader.h nv20_state.c
nv20_vertprog.c nv30_fragprog.c nv30_shader.h nv30_state.c
nv30_vertprog.c nv40_fragprog.c nv40_shader.h nv40_vertprog.c
nv50_state.c
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r300:
r300_program.h
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/x11: sources
xsrc/external/mit/MesaLib/dist/src/mesa/glapi: sources
xsrc/external/mit/MesaLib/dist/src/mesa/main: api_eval.h sources
xsrc/external/mit/MesaLib/dist/src/mesa/math: sources
xsrc/external/mit/MesaLib/dist/src/mesa/shader: sources
xsrc/external/mit/MesaLib/dist/src/mesa/shader/grammar: sources
xsrc/external/mit/MesaLib/dist/src/mesa/shader/slang:
slang_library_noise.c slang_library_noise.h sources
xsrc/external/mit/MesaLib/dist/src/mesa/swrast: s_drawpix.h
s_pointtemp.h sources
xsrc/external/mit/MesaLib/dist/src/mesa/swrast_setup: sources
xsrc/external/mit/MesaLib/dist/src/mesa/tnl: sources
Log Message:
merge MesaLib 7.4.2
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/configs/darwin-static \
xsrc/external/mit/MesaLib/dist/configs/darwin-static-x86ppc
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/docs/MESA_packed_depth_stencil.spec \
xsrc/external/mit/MesaLib/dist/docs/MESA_program_debug.spec \
xsrc/external/mit/MesaLib/dist/docs/MESA_sprite_point.spec \
xsrc/external/mit/MesaLib/dist/docs/MESA_trace.spec \
xsrc/external/mit/MesaLib/dist/docs/memory.html
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/MesaLib/dist/include/GLView.h
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/MesaLib/dist/include/GL/amesa.h \
xsrc/external/mit/MesaLib/dist/include/GL/fxmesa.h \
xsrc/external/mit/MesaLib/dist/include/GL/uglglutshapes.h \
xsrc/external/mit/MesaLib/dist/include/GL/uglmesa.h \
xsrc/external/mit/MesaLib/dist/include/GL/xmesa.h \
xsrc/external/mit/MesaLib/dist/include/GL/xmesa_x.h \
xsrc/external/mit/MesaLib/dist/include/GL/xmesa_xf86.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/glx/x11/dri_glx.h \
xsrc/external/mit/MesaLib/dist/src/glx/x11/glx_texture_compression.c \
xsrc/external/mit/MesaLib/dist/src/glx/x11/indirect_dispatch.c \
xsrc/external/mit/MesaLib/dist/src/glx/x11/indirect_dispatch.h \
xsrc/external/mit/MesaLib/dist/src/glx/x11/indirect_dispatch_swap.c \
xsrc/external/mit/MesaLib/dist/src/glx/x11/indirect_reqsize.c \
xsrc/external/mit/MesaLib/dist/src/glx/x11/indirect_reqsize.h \
xsrc/external/mit/MesaLib/dist/src/glx/x11/indirect_size_get.c \
xsrc/external/mit/MesaLib/dist/src/glx/x11/indirect_size_get.h \
xsrc/external/mit/MesaLib/dist/src/glx/x11/indirect_table.c \
xsrc/external/mit/MesaLib/dist/src/glx/x11/indirect_va_private.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/common/sources
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/common/dri_bufmgr.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/common/dri_bufmgr.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/common/dri_bufpool.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/common/dri_drmpool.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/glcore/Makefile \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/glcore/glcore_driver.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/i915_texprog.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_batchbuffer.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_batchbuffer.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_context.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_context.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_ioctl.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_ioctl.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_pixel.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_reg.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_rotate.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_rotate.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_screen.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_screen.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_span.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_span.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_tex.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_tex.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_texmem.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/server/i830_common.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/server/i830_dri.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/server/intel.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/server/intel_dri.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/Makefile \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i830_context.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i830_context.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i830_metaops.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i830_reg.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i830_state.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i830_tex.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i830_texblend.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i830_texstate.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i830_vtbl.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i915_context.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i915_context.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i915_debug.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i915_fragprog.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i915_metaops.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i915_program.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i915_program.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i915_reg.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i915_state.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i915_tex.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i915_tex_layout.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i915_texstate.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/i915_vtbl.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_batchbuffer.h
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_batchpool.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_blit.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_blit.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_buffer_objects.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_buffer_objects.h
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_buffers.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_buffers.h
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_context.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_context.h
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_depthstencil.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_depthstencil.h
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_fbo.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_fbo.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_ioctl.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_ioctl.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_mipmap_tree.h
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_pixel.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_pixel.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_pixel_bitmap.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_pixel_copy.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_pixel_draw.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_pixel_read.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_reg.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_regions.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_regions.h
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_render.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_rotate.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_rotate.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_screen.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_screen.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_span.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_span.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_state.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_structs.h
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_tex.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_tex.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_tex_copy.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_tex_format.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_tex_image.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_tex_subimage.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_tex_validate.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_tris.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/intel_tris.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/server/i830_common.h
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/server/i830_dri.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/server/intel.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915tex/server/intel_dri.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/brw_aub.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/brw_aub.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/brw_aub_playback.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/brw_exec_generic.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/brw_hal.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/brw_hal.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/brw_metaops.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/brw_state_pool.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/brw_vs_tnl.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/bufmgr.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/bufmgr_fake.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_batchbuffer.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_batchbuffer.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_blit.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_blit.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_buffer_objects.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_buffer_objects.h
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_buffers.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_context.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_context.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_ioctl.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_ioctl.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_mipmap_tree.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_mipmap_tree.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_pixel_copy.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_reg.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_regions.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_regions.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_screen.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_screen.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_span.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_span.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_tex.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_tex.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/intel_tex_validate.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/server/i830_common.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/server/i830_dri.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/server/intel.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965/server/intel_dri.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/mach64/mach64_context.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/Makefile \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.h
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_buffers.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_buffers.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_card.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_card.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_card_list.h
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_context.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_context.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_ctrlreg.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_dri.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_driver.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_driver.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_fifo.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_fifo.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_lock.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_lock.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_msg.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_object.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_object.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_query.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_query.h
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_reg.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_screen.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_screen.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_shader.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_shader.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_shader_0.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_shader_1.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_shader_2.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_span.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_span.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_state.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_state.h
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_state_cache.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_state_cache.h
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_swtcl.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_swtcl.h
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_sync.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_sync.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_tex.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nouveau_tex.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nv04_state.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nv04_swtcl.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nv04_swtcl.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nv10_state.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nv10_swtcl.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nv10_swtcl.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nv20_shader.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nv20_state.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nv20_vertprog.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nv30_fragprog.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nv30_shader.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nv30_state.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nv30_vertprog.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nv40_fragprog.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nv40_shader.h \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nv40_vertprog.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau/nv50_state.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/r200_tcl.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r300/r300_program.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/sis/sis_context.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/x11/sources
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/glapi/sources
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/main/api_eval.h \
xsrc/external/mit/MesaLib/dist/src/mesa/main/sources
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/math/sources
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/shader/sources
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/shader/grammar/sources
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/shader/slang/slang_library_noise.c \
xsrc/external/mit/MesaLib/dist/src/mesa/shader/slang/slang_library_noise.h \
xsrc/external/mit/MesaLib/dist/src/mesa/shader/slang/sources
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/swrast/s_drawpix.h \
xsrc/external/mit/MesaLib/dist/src/mesa/swrast/s_pointtemp.h \
xsrc/external/mit/MesaLib/dist/src/mesa/swrast/sources
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/swrast_setup/sources
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/tnl/sources
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/mach64/mach64_context.h
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/mach64/mach64_context.h:1.2 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/mach64/mach64_context.h:1.3
--- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/mach64/mach64_context.h:1.2 Wed Oct 22 16:04:13 2008
+++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/mach64/mach64_context.h Thu Jun 11 01:02:58 2009
@@ -1,4 +1,4 @@
-/* $XFree86$ */ /* -*- mode: c; c-basic-offset: 3 -*- */
+/* -*- mode: c; c-basic-offset: 3 -*- */
/*
* Copyright 2000 Gareth Hughes
* All Rights Reserved.
@@ -36,7 +36,7 @@
#include "drm.h"
#include "mach64_drm.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
#include "mach64_reg.h"
@@ -263,8 +263,6 @@
/* VBI
*/
- GLuint vbl_seq;
- GLuint vblank_flags;
GLuint do_irqs;
/* Configuration cache
@@ -310,7 +308,13 @@
*(GLuint *)(x) = htole32( __tmp ); \
} while (0)
#else
+#ifndef __OpenBSD__
#include <byteswap.h>
+#else
+#include <machine/endian.h>
+#define bswap_32 bswap32
+#endif
+
#define LE32_IN( x ) bswap_32( *(GLuint *)(x) )
#define LE32_IN_FLOAT( x ) \
({ \
Index: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/r200_tcl.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/r200_tcl.c:1.2 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/r200_tcl.c:1.3
--- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/r200_tcl.c:1.2 Wed Oct 22 16:05:30 2008
+++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/r200_tcl.c Thu Jun 11 01:02:59 2009
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_tcl.c,v 1.2 2002/12/16 16:18:55 dawes Exp $ */
/*
Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
@@ -33,12 +32,12 @@
* Keith Whitwell <[email protected]>
*/
-#include "glheader.h"
-#include "imports.h"
-#include "mtypes.h"
-#include "enums.h"
-#include "colormac.h"
-#include "light.h"
+#include "main/glheader.h"
+#include "main/imports.h"
+#include "main/mtypes.h"
+#include "main/enums.h"
+#include "main/colormac.h"
+#include "main/light.h"
#include "vbo/vbo.h"
#include "tnl/tnl.h"
Index: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/sis/sis_context.h
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/sis/sis_context.h:1.2 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/sis/sis_context.h:1.3
--- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/sis/sis_context.h:1.2 Wed Oct 22 16:06:44 2008
+++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/sis/sis_context.h Thu Jun 11 01:03:00 2009
@@ -24,7 +24,6 @@
USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86$ */
/*
* Authors:
@@ -35,7 +34,7 @@
#ifndef _sis_ctx_h_
#define _sis_ctx_h_
-#include "context.h"
+#include "main/context.h"
#include "dri_util.h"
#include "drm.h"
#include "drm_sarea.h"
@@ -405,8 +404,10 @@
#include <sys/atomic.h>
#define MMIO_WMB() membar_sync()
#else /* !__NetBSD__ */
-#if defined(__i386__) || defined(__amd64__)
+#if defined(__i386__) || defined(__x86_64__)
#define MMIO_WMB() __asm __volatile("" : : : "memory")
+#elif defined(__ia64__)
+#define MMIO_WMB() __asm __volatile("mf" : : : "memory")
#else
#error platform needs WMB
#endif
