CVSROOT: /home/x-cvs
Module name: xc
Changes by: [EMAIL PROTECTED] 04/12/10 07:30:13
Log message:
resolve conflicts from Mesa 6.2 merge
Modified files:
xc/extras/Mesa/docs/:
VERSIONS
xc/extras/Mesa/include/GL/:
gl.h glext.h glxext.h
xc/extras/Mesa/include/GL/internal/:
glcore.h
xc/extras/Mesa/src/mesa/drivers/dri/common/:
texmem.c utils.c vblank.h xmlconfig.c
xc/extras/Mesa/src/mesa/drivers/dri/ffb/:
ffb_vbtmp.h ffb_xmesa.c
xc/extras/Mesa/src/mesa/drivers/dri/gamma/:
gamma_state.c gamma_tex.c
xc/extras/Mesa/src/mesa/drivers/dri/i830/:
i830_state.c i830_texmem.c i830_texstate.c
xc/extras/Mesa/src/mesa/drivers/dri/mga/:
mgacontext.h mgaioctl.c mgavb.c
xc/extras/Mesa/src/mesa/drivers/dri/r128/:
r128_ioctl.c r128_tex.c r128_texmem.c r128_texstate.c
xc/extras/Mesa/src/mesa/drivers/dri/r200/:
r200_context.h r200_ioctl.c r200_screen.c
r200_state_init.c r200_swtcl.c r200_tcl.c r200_vtxfmt_c.c
r200_vtxtmp_x86.S
xc/extras/Mesa/src/mesa/drivers/dri/radeon/:
radeon_context.c radeon_context.h radeon_ioctl.c
radeon_screen.c radeon_state_init.c radeon_swtcl.c
radeon_tcl.c radeon_tex.c radeon_texmem.c
radeon_texstate.c radeon_vtxfmt.c radeon_vtxfmt_c.c
radeon_vtxtmp_x86.S
xc/extras/Mesa/src/mesa/drivers/dri/sis/:
sis_alloc.c sis_tris.c sis_tritmp.h
xc/extras/Mesa/src/mesa/drivers/dri/tdfx/:
tdfx_screen.c tdfx_span.c tdfx_texman.c tdfx_texstate.c
xc/extras/Mesa/src/mesa/drivers/x11/:
xm_api.c xm_tri.c
xc/extras/Mesa/src/mesa/glapi/:
glapitemp.h
xc/extras/Mesa/src/mesa/main/:
colortab.c dlist.c enable.c imports.h teximage.c
texstate.c texstore.c
xc/extras/Mesa/src/mesa/math/:
m_debug_clip.c m_debug_xform.c
xc/extras/Mesa/src/mesa/sparc/:
sparc.c
xc/extras/Mesa/src/mesa/swrast/:
s_alphabuf.c s_linetemp.h s_texture.c
xc/extras/Mesa/src/mesa/tnl/:
t_save_api.c
xc/extras/Mesa/src/mesa/x86/:
3dnow_normal.S 3dnow_xform1.S 3dnow_xform2.S
3dnow_xform3.S 3dnow_xform4.S assyntax.h common_x86_asm.h
sse_normal.S sse_xform1.S sse_xform2.S sse_xform3.S
sse_xform4.S
Added files:
xc/extras/Mesa/:
Makefile
xc/extras/Mesa/docs/:
RELNOTES-6.0.1
xc/extras/Mesa/include/:
GLView.h
xc/extras/Mesa/src/:
Makefile
Removed files:
xc/extras/Mesa/src/mesa/drivers/dri/r128/:
r128_vb.c
xc/extras/Mesa/src/mesa/drivers/dri/r200/:
r200_maos_vbtmp.h r200_maos_verts.c
xc/extras/Mesa/src/mesa/drivers/dri/sis/:
sis_vb.c sis_vb.h
xc/extras/Mesa/src/mesa/main/:
arbfragparse.c arbfragparse.h arbparse.c arbparse.h
arbparse_syn.h arbprogram.c arbprogram.h arbvertparse.c
arbvertparse.h arbvp_grammar.txt nvfragparse.c
nvfragparse.h nvfragprog.h nvprogram.c nvprogram.h
nvvertexec.c nvvertexec.h nvvertparse.c nvvertparse.h
nvvertprog.h program.c program.h texutil.c texutil.h
texutil_tmp.h
Revision Changes Path
1.8 +78 -2 xc/extras/Mesa/docs/VERSIONS
1.21 +5 -2 xc/extras/Mesa/include/GL/gl.h
1.14 +116 -5 xc/extras/Mesa/include/GL/glext.h
1.11 +85 -9 xc/extras/Mesa/include/GL/glxext.h
1.4 +28 -1 xc/extras/Mesa/include/GL/internal/glcore.h
1.4 +54 -7 xc/extras/Mesa/src/mesa/drivers/dri/common/texmem.c
1.3 +322 -11 xc/extras/Mesa/src/mesa/drivers/dri/common/utils.c
1.5 +5 -1 xc/extras/Mesa/src/mesa/drivers/dri/common/vblank.h
1.4 +19 -18
xc/extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c
1.3 +1 -1 xc/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_vbtmp.h
1.3 +13 -23 xc/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_xmesa.c
1.3 +18 -18
xc/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_state.c
1.3 +5 -5 xc/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_tex.c
1.4 +242 -229 xc/extras/Mesa/src/mesa/drivers/dri/i830/i830_state.c
1.3 +21 -16
xc/extras/Mesa/src/mesa/drivers/dri/i830/i830_texmem.c
1.4 +300 -1136
xc/extras/Mesa/src/mesa/drivers/dri/i830/i830_texstate.c
1.4 +12 -11 xc/extras/Mesa/src/mesa/drivers/dri/mga/mgacontext.h
1.4 +25 -24 xc/extras/Mesa/src/mesa/drivers/dri/mga/mgaioctl.c
1.3 +4 -3 xc/extras/Mesa/src/mesa/drivers/dri/mga/mgavb.c
1.4 +51 -55 xc/extras/Mesa/src/mesa/drivers/dri/r128/r128_ioctl.c
1.4 +18 -16 xc/extras/Mesa/src/mesa/drivers/dri/r128/r128_tex.c
1.4 +4 -5
xc/extras/Mesa/src/mesa/drivers/dri/r128/r128_texmem.c
1.5 +4 -2
xc/extras/Mesa/src/mesa/drivers/dri/r128/r128_texstate.c
1.4 +102 -41
xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_context.h
1.3 +72 -46 xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_ioctl.c
1.5 +107 -129
xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_screen.c
1.4 +125 -78
xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_state_init.c
1.3 +221 -555 xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_swtcl.c
1.3 +55 -31 xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_tcl.c
1.3 +86 -79
xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxfmt_c.c
1.3 +10 -9
xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S
1.4 +8 -11
xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_context.c
1.4 +21 -15
xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_context.h
1.5 +185 -153
xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_ioctl.c
1.5 +71 -131
xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_screen.c
1.4 +14 -13
xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_state_init.c
1.3 +11 -10
xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_swtcl.c
1.4 +8 -2
xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_tcl.c
1.4 +20 -18
xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_tex.c
1.4 +7 -9
xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_texmem.c
1.4 +54 -25
xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_texstate.c
1.3 +23 -23
xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_vtxfmt.c
1.3 +11 -6
xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_vtxfmt_c.c
1.3 +1 -1
xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_vtxtmp_x86.S
1.3 +3 -9 xc/extras/Mesa/src/mesa/drivers/dri/sis/sis_alloc.c
1.3 +465 -350 xc/extras/Mesa/src/mesa/drivers/dri/sis/sis_tris.c
1.3 +13 -93 xc/extras/Mesa/src/mesa/drivers/dri/sis/sis_tritmp.h
1.3 +137 -48
xc/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_screen.c
1.3 +6 -6 xc/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_span.c
1.4 +3 -3
xc/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_texman.c
1.3 +160 -61
xc/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_texstate.c
1.5 +14 -5 xc/extras/Mesa/src/mesa/drivers/x11/xm_api.c
1.4 +3 -1 xc/extras/Mesa/src/mesa/drivers/x11/xm_tri.c
1.4 +1137 -1257xc/extras/Mesa/src/mesa/glapi/glapitemp.h
1.3 +8 -8 xc/extras/Mesa/src/mesa/main/colortab.c
1.3 +225 -65 xc/extras/Mesa/src/mesa/main/dlist.c
1.4 +23 -13 xc/extras/Mesa/src/mesa/main/enable.c
1.6 +22 -17 xc/extras/Mesa/src/mesa/main/imports.h
1.4 +244 -133 xc/extras/Mesa/src/mesa/main/teximage.c
1.4 +99 -44 xc/extras/Mesa/src/mesa/main/texstate.c
1.4 +2177 -749 xc/extras/Mesa/src/mesa/main/texstore.c
1.3 +6 -6 xc/extras/Mesa/src/mesa/math/m_debug_clip.c
1.3 +5 -6 xc/extras/Mesa/src/mesa/math/m_debug_xform.c
1.4 +1 -4 xc/extras/Mesa/src/mesa/sparc/sparc.c
1.4 +12 -9 xc/extras/Mesa/src/mesa/swrast/s_alphabuf.c
1.4 +4 -4 xc/extras/Mesa/src/mesa/swrast/s_linetemp.h
1.4 +187 -213 xc/extras/Mesa/src/mesa/swrast/s_texture.c
1.4 +46 -18 xc/extras/Mesa/src/mesa/tnl/t_save_api.c
1.4 +19 -19 xc/extras/Mesa/src/mesa/x86/3dnow_normal.S
1.3 +2 -2 xc/extras/Mesa/src/mesa/x86/3dnow_xform1.S
1.3 +2 -2 xc/extras/Mesa/src/mesa/x86/3dnow_xform2.S
1.3 +2 -2 xc/extras/Mesa/src/mesa/x86/3dnow_xform3.S
1.3 +2 -2 xc/extras/Mesa/src/mesa/x86/3dnow_xform4.S
1.4 +5 -5 xc/extras/Mesa/src/mesa/x86/assyntax.h
1.3 +2 -2 xc/extras/Mesa/src/mesa/x86/common_x86_asm.h
1.3 +2 -2 xc/extras/Mesa/src/mesa/x86/sse_normal.S
1.3 +2 -2 xc/extras/Mesa/src/mesa/x86/sse_xform1.S
1.3 +2 -2 xc/extras/Mesa/src/mesa/x86/sse_xform2.S
1.3 +2 -2 xc/extras/Mesa/src/mesa/x86/sse_xform3.S
1.3 +2 -2 xc/extras/Mesa/src/mesa/x86/sse_xform4.S
_______________________________________________
Cvs-commit mailing list
[EMAIL PROTECTED]
http://XFree86.Org/mailman/listinfo/cvs-commit
