merge current trunk into vbo branch
authorAlan Hourihane <alanh@tungstengraphics.com>
Thu, 2 Nov 2006 12:02:13 +0000 (12:02 +0000)
committerAlan Hourihane <alanh@tungstengraphics.com>
Thu, 2 Nov 2006 12:02:13 +0000 (12:02 +0000)
commit6d104cb932080c5c0d951fbc0ec6d30fb7ebef45
tree17207f566d6eda4d3884ec03dfff6cdb5a1965ea
parent18d52f96bb1f20b1887b67e87506835bca05d73a
merge current trunk into vbo branch
183 files changed:
configs/linux-dri
docs/relnotes-6.5.2.html
progs/demos/Makefile
progs/demos/streaming_rect.c [new file with mode: 0644]
progs/demos/texdown.c
progs/trivial/Makefile
progs/trivial/quad-tex-pbo.c [new file with mode: 0644]
src/glx/x11/glxext.c
src/mesa/drivers/directfb/idirectfbgl_mesa.c
src/mesa/drivers/dri/Makefile.template
src/mesa/drivers/dri/common/dri_bufmgr.c [new file with mode: 0644]
src/mesa/drivers/dri/common/dri_bufmgr.h [new file with mode: 0644]
src/mesa/drivers/dri/common/dri_bufpool.h [new file with mode: 0644]
src/mesa/drivers/dri/common/dri_drmpool.c [new file with mode: 0644]
src/mesa/drivers/dri/common/dri_util.c
src/mesa/drivers/dri/common/dri_util.h
src/mesa/drivers/dri/ffb/ffb_clear.c
src/mesa/drivers/dri/ffb/ffb_clear.h
src/mesa/drivers/dri/ffb/ffb_xmesa.c
src/mesa/drivers/dri/gamma/gamma_state.c
src/mesa/drivers/dri/i810/i810ioctl.c
src/mesa/drivers/dri/i915/i830_metaops.c
src/mesa/drivers/dri/i915/i915_fragprog.c
src/mesa/drivers/dri/i915/i915_metaops.c
src/mesa/drivers/dri/i915/intel_batchbuffer.c
src/mesa/drivers/dri/i915/intel_ioctl.c
src/mesa/drivers/dri/i915/intel_ioctl.h
src/mesa/drivers/dri/i915tex/Makefile [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i830_context.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i830_context.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i830_metaops.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i830_reg.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i830_state.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i830_tex.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i830_texblend.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i830_texstate.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i830_vtbl.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i915_context.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i915_context.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i915_debug.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i915_fragprog.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i915_metaops.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i915_program.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i915_program.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i915_reg.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i915_state.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i915_tex.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i915_tex_layout.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i915_texstate.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/i915_vtbl.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_batchbuffer.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_batchbuffer.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_batchpool.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_blit.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_blit.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_buffer_objects.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_buffer_objects.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_buffers.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_buffers.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_context.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_context.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_depthstencil.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_depthstencil.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_fbo.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_fbo.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_ioctl.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_ioctl.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_mipmap_tree.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_pixel.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_pixel.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_pixel_bitmap.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_pixel_copy.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_pixel_draw.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_pixel_read.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_reg.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_regions.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_regions.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_render.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_rotate.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_rotate.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_screen.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_screen.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_span.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_span.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_state.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_structs.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_tex.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_tex.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_tex_copy.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_tex_format.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_tex_image.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_tex_subimage.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_tex_validate.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_tris.c [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/intel_tris.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/server/i830_common.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/server/i830_dri.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/server/intel.h [new file with mode: 0644]
src/mesa/drivers/dri/i915tex/server/intel_dri.c [new file with mode: 0644]
src/mesa/drivers/dri/i965/intel_blit.c
src/mesa/drivers/dri/i965/intel_blit.h
src/mesa/drivers/dri/i965/intel_buffers.c
src/mesa/drivers/dri/mach64/mach64_ioctl.c
src/mesa/drivers/dri/mga/mga_xmesa.c
src/mesa/drivers/dri/mga/mgacontext.h
src/mesa/drivers/dri/mga/mgadd.c
src/mesa/drivers/dri/mga/mgaioctl.c
src/mesa/drivers/dri/mga/mgaspan.c
src/mesa/drivers/dri/mga/mgastate.c
src/mesa/drivers/dri/r128/r128_ioctl.c
src/mesa/drivers/dri/r200/r200_ioctl.c
src/mesa/drivers/dri/r300/r300_fragprog.c
src/mesa/drivers/dri/r300/r300_fragprog.h
src/mesa/drivers/dri/r300/r300_ioctl.c
src/mesa/drivers/dri/r300/r300_reg.h
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/r300/radeon_context.c
src/mesa/drivers/dri/r300/radeon_context.h
src/mesa/drivers/dri/r300/radeon_lock.c
src/mesa/drivers/dri/r300/radeon_state.c
src/mesa/drivers/dri/r300/radeon_state.h
src/mesa/drivers/dri/radeon/radeon_ioctl.c
src/mesa/drivers/dri/radeon/radeon_state.c
src/mesa/drivers/dri/s3v/s3v_state.c
src/mesa/drivers/dri/savage/savageioctl.c
src/mesa/drivers/dri/sis/sis6326_clear.c
src/mesa/drivers/dri/sis/sis_clear.c
src/mesa/drivers/dri/sis/sis_screen.c
src/mesa/drivers/dri/sis/sis_state.h
src/mesa/drivers/dri/tdfx/tdfx_render.c
src/mesa/drivers/dri/tdfx/tdfx_tex.c
src/mesa/drivers/dri/trident/trident_state.c
src/mesa/drivers/dri/unichrome/via_ioctl.c
src/mesa/drivers/ggi/ggimesa.c
src/mesa/drivers/glide/fxdd.c
src/mesa/drivers/svga/svgamesa15.c
src/mesa/drivers/svga/svgamesa16.c
src/mesa/drivers/svga/svgamesa24.c
src/mesa/drivers/svga/svgamesa32.c
src/mesa/drivers/svga/svgamesa8.c
src/mesa/drivers/windows/gdi/wmesa.c
src/mesa/drivers/x11/xm_dd.c
src/mesa/main/attrib.c
src/mesa/main/buffers.c
src/mesa/main/context.c
src/mesa/main/dd.h
src/mesa/main/extensions.c
src/mesa/main/fbobject.c
src/mesa/main/get.c
src/mesa/main/get_gen.py
src/mesa/main/getstring.c
src/mesa/main/mipmap.c
src/mesa/main/mtypes.h
src/mesa/main/state.c
src/mesa/main/state.h
src/mesa/main/stencil.c
src/mesa/main/texcompress_s3tc.c
src/mesa/main/texenvprogram.c
src/mesa/main/teximage.c
src/mesa/main/teximage.h
src/mesa/main/texobj.c
src/mesa/main/texobj.h
src/mesa/main/texstate.c
src/mesa/shader/arbprogparse.c
src/mesa/shader/nvfragparse.c
src/mesa/shader/nvprogram.c
src/mesa/shader/nvvertexec.c
src/mesa/shader/nvvertexec.h
src/mesa/shader/nvvertparse.c
src/mesa/shader/program.c
src/mesa/shader/program_instruction.h
src/mesa/shader/programopt.c
src/mesa/swrast/s_arbshader.c
src/mesa/swrast/s_buffers.c
src/mesa/swrast/s_context.c
src/mesa/swrast/s_nvfragprog.c
src/mesa/swrast/s_span.c
src/mesa/swrast/s_texstore.c
src/mesa/swrast/swrast.h
src/mesa/tnl/t_context.c
src/mesa/tnl/t_vb_program.c