CVS Update: xc (branch: trunk)
Eric Anholt
xorg-commit at pdx.freedesktop.org
Wed Jun 16 12:35:49 EEST 2004
CVSROOT: /cvs/xorg
Module name: xc
Changes by: anholt at pdx. 04/06/16 02:35:49
Log message:
Merge DRI-trunk-20040613 changes to conflicting files in lib/GL, and build
fixes to things from the branch.
- mesa/tnl has a fix for building with x86 asm (use compiled .o from a .S from
outside of unshared, since afaik there would be no difference).
- Removed some aparrent build cruft in dri/drm related to shared vs normal
drivers that broke the libGL build.
- Use $(EXPATLIBRARY) instead of ExpatLibrary
Modified files:
xc/lib/GL/:
Imakefile
xc/lib/GL/GL/:
GL-def.cpp Imakefile
xc/lib/GL/dri/drm/:
Imakefile
xc/lib/GL/glx/:
Imakefile clientattrib.c compsize.c dispatch.c g_render.c
glxclient.h glxcmds.c glxext.c glxextensions.c
glxextensions.h indirect.h packsingle.h pixelstore.c
render2.c single2.c vertarr.c
xc/lib/GL/mesa/drivers/dri/ffb/:
Imakefile
xc/lib/GL/mesa/drivers/dri/gamma/:
Imakefile
xc/lib/GL/mesa/drivers/dri/i810/:
Imakefile
xc/lib/GL/mesa/drivers/dri/i830/:
Imakefile
xc/lib/GL/mesa/drivers/dri/mach64/:
Imakefile
xc/lib/GL/mesa/drivers/dri/mga/:
Imakefile
xc/lib/GL/mesa/drivers/dri/r128/:
Imakefile
xc/lib/GL/mesa/drivers/dri/r200/:
Imakefile
xc/lib/GL/mesa/drivers/dri/radeon/:
Imakefile
xc/lib/GL/mesa/drivers/dri/savage/:
Imakefile
xc/lib/GL/mesa/drivers/dri/sis/:
Imakefile
xc/lib/GL/mesa/drivers/dri/tdfx/:
Imakefile
xc/lib/GL/mesa/drivers/dri/via/:
Imakefile
xc/lib/GL/mesa/tnl/:
Imakefile.inc
Removed files:
xc/lib/GL/:
highpc.c lowpc.c makeprofile.sh
xc/lib/GL/dri/:
Imakefile XF86dri.c dri_glx.c dri_glx.h dri_util.c
dri_util.h xf86dri.h xf86dristr.h
xc/lib/GL/glx/:
glcontextmodes.c glcontextmodes.h
xc/lib/GL/include/GL/internal/:
glcore.h
xc/lib/GL/mesa/src/:
Imakefile Imakefile.inc
xc/lib/GL/mesa/src/OSmesa/:
Imakefile OSMesa-def.cpp
xc/lib/GL/mesa/src/SPARC/:
Imakefile Imakefile.inc
xc/lib/GL/mesa/src/X/:
Imakefile Imakefile.inc
xc/lib/GL/mesa/src/X86/:
Imakefile Imakefile.inc
xc/lib/GL/mesa/src/array_cache/:
Imakefile Imakefile.inc
xc/lib/GL/mesa/src/drv/:
Imakefile
xc/lib/GL/mesa/src/drv/common/:
Imakefile Imakefile.inc depthtmp.h hwlog.c hwlog.h mm.c
mm.h mmx.h spantmp.h stenciltmp.h texmem.c texmem.h
utils.c utils.h vblank.c vblank.h
xc/lib/GL/mesa/src/drv/ffb/:
Imakefile Imakefile.inc ffb_bitmap.c ffb_bitmap.h
ffb_clear.c ffb_clear.h ffb_context.h ffb_dd.c ffb_dd.h
ffb_depth.c ffb_depth.h ffb_fifo.h ffb_fog.c ffb_lines.c
ffb_lines.h ffb_linetmp.h ffb_lock.h ffb_points.c
ffb_points.h ffb_pointtmp.h ffb_rendertmp.h ffb_span.c
ffb_span.h ffb_state.c ffb_state.h ffb_stencil.c
ffb_stencil.h ffb_tex.c ffb_tex.h ffb_tris.c ffb_tris.h
ffb_tritmp.h ffb_vb.c ffb_vb.h ffb_vbtmp.h ffb_vtxfmt.c
ffb_vtxfmt.h ffb_xmesa.c ffb_xmesa.h
xc/lib/GL/mesa/src/drv/gamma/:
Imakefile Imakefile.inc gamma_client.h gamma_context.c
gamma_context.h gamma_dd.c gamma_inithw.c gamma_lock.c
gamma_lock.h gamma_macros.h gamma_regs.h gamma_render.c
gamma_screen.c gamma_screen.h gamma_span.c gamma_state.c
gamma_tex.c gamma_texmem.c gamma_texstate.c gamma_tris.c
gamma_tris.h gamma_tritmp.h gamma_vb.c gamma_vb.h
gamma_xmesa.c
xc/lib/GL/mesa/src/drv/i810/:
Imakefile Imakefile.inc i810_3d_reg.h i810context.c
i810context.h i810ioctl.c i810ioctl.h i810render.c
i810screen.c i810screen.h i810span.c i810span.h
i810state.c i810state.h i810tex.c i810tex.h i810texmem.c
i810texstate.c i810tris.c i810tris.h i810vb.c i810vb.h
xc/lib/GL/mesa/src/drv/i830/:
Imakefile Imakefile.inc i830_3d_reg.h i830_context.c
i830_context.h i830_debug.c i830_debug.h i830_ioctl.c
i830_ioctl.h i830_render.c i830_screen.c i830_screen.h
i830_span.c i830_span.h i830_state.c i830_state.h
i830_tex.c i830_tex.h i830_texmem.c i830_texstate.c
i830_tris.c i830_tris.h i830_vb.c i830_vb.h
xc/lib/GL/mesa/src/drv/mga/:
Imakefile Imakefile.inc mga_texcombine.c mga_texstate.c
mga_xmesa.c mga_xmesa.h mgacontext.h mgadd.c mgadd.h
mgaioctl.c mgaioctl.h mgapixel.c mgapixel.h mgaregs.h
mgarender.c mgaspan.c mgaspan.h mgastate.c mgastate.h
mgatex.c mgatex.h mgatexmem.c mgatris.c mgatris.h mgavb.c
mgavb.h
xc/lib/GL/mesa/src/drv/r128/:
Imakefile Imakefile.inc r128_context.c r128_context.h
r128_dd.c r128_dd.h r128_ioctl.c r128_ioctl.h r128_lock.c
r128_lock.h r128_screen.c r128_screen.h r128_span.c
r128_span.h r128_state.c r128_state.h r128_tex.c
r128_tex.h r128_texmem.c r128_texobj.h r128_texstate.c
r128_tris.c r128_tris.h r128_vb.c r128_vb.h
xc/lib/GL/mesa/src/drv/r200/:
Imakefile Imakefile.inc r200_cmdbuf.c r200_context.c
r200_context.h r200_ioctl.c r200_ioctl.h r200_lock.c
r200_lock.h r200_maos.c r200_maos.h r200_maos_arrays.c
r200_maos_vbtmp.h r200_maos_verts.c r200_pixel.c
r200_pixel.h r200_reg.h r200_sanity.c r200_sanity.h
r200_screen.c r200_screen.h r200_span.c r200_span.h
r200_state.c r200_state.h r200_state_init.c r200_swtcl.c
r200_swtcl.h r200_tcl.c r200_tcl.h r200_tex.c r200_tex.h
r200_texmem.c r200_texstate.c r200_vtxfmt.c r200_vtxfmt.h
r200_vtxfmt_c.c r200_vtxfmt_sse.c r200_vtxfmt_x86.c
r200_vtxtmp_x86.S
xc/lib/GL/mesa/src/drv/radeon/:
Imakefile Imakefile.inc radeon_context.c radeon_context.h
radeon_ioctl.c radeon_ioctl.h radeon_lock.c radeon_lock.h
radeon_maos.c radeon_maos.h radeon_maos_arrays.c
radeon_maos_vbtmp.h radeon_maos_verts.c radeon_sanity.c
radeon_sanity.h radeon_screen.c radeon_screen.h
radeon_span.c radeon_span.h radeon_state.c radeon_state.h
radeon_state_init.c radeon_swtcl.c radeon_swtcl.h
radeon_tcl.c radeon_tcl.h radeon_tex.c radeon_tex.h
radeon_texmem.c radeon_texstate.c radeon_vtxfmt.c
radeon_vtxfmt.h radeon_vtxfmt_c.c radeon_vtxfmt_sse.c
radeon_vtxfmt_x86.c radeon_vtxtmp_x86.S
xc/lib/GL/mesa/src/drv/sis/:
Imakefile Imakefile.inc sis_alloc.c sis_alloc.h
sis_clear.c sis_common2.h sis_context.c sis_context.h
sis_dd.c sis_dd.h sis_debug.c sis_debug.h sis_fog.c
sis_lock.c sis_lock.h sis_reg.h sis_screen.c sis_screen.h
sis_span.c sis_span.h sis_state.c sis_state.h
sis_stencil.c sis_stencil.h sis_tex.c sis_tex.h
sis_texstate.c sis_tris.c sis_tris.h sis_tritmp.h
sis_vb.c sis_vb.h
xc/lib/GL/mesa/src/drv/tdfx/:
BUGS Imakefile Imakefile.inc dri_glide.h tdfx_context.c
tdfx_context.h tdfx_dd.c tdfx_dd.h tdfx_glide.h
tdfx_lock.c tdfx_lock.h tdfx_pixels.c tdfx_pixels.h
tdfx_render.c tdfx_render.h tdfx_screen.c tdfx_screen.h
tdfx_span.c tdfx_span.h tdfx_state.c tdfx_state.h
tdfx_tex.c tdfx_tex.h tdfx_texman.c tdfx_texman.h
tdfx_texstate.c tdfx_texstate.h tdfx_tris.c tdfx_tris.h
tdfx_vb.c tdfx_vb.h tdfx_vbtmp.h
xc/lib/GL/mesa/src/drv/tdfx/X86/:
fx_3dnow_fastpath.S fx_3dnow_fasttmp.h
xc/lib/GL/mesa/src/math/:
Imakefile Imakefile.inc
xc/lib/GL/mesa/src/swrast/:
Imakefile Imakefile.inc
xc/lib/GL/mesa/src/swrast_setup/:
Imakefile Imakefile.inc
xc/lib/GL/mesa/src/tnl/:
Imakefile Imakefile.inc
xc/lib/GL/mesa/src/tnl_dd/:
Imakefile Imakefile.inc
Revision Changes Path
1.3 +4 -4 xc/lib/GL/Imakefile
1.3 +0 -2 xc/lib/GL/GL/GL-def.cpp
1.4 +69 -84 xc/lib/GL/GL/Imakefile
1.3 +5 -13 xc/lib/GL/dri/drm/Imakefile
1.3 +37 -27 xc/lib/GL/glx/Imakefile
1.3 +18 -18 xc/lib/GL/glx/clientattrib.c
1.3 +5 -1 xc/lib/GL/glx/compsize.c
1.3 +1 -1 xc/lib/GL/glx/dispatch.c
1.3 +431 -3406 xc/lib/GL/glx/g_render.c
1.3 +375 -432 xc/lib/GL/glx/glxclient.h
1.3 +462 -489 xc/lib/GL/glx/glxcmds.c
1.3 +478 -159 xc/lib/GL/glx/glxext.c
1.3 +340 -63 xc/lib/GL/glx/glxextensions.c
1.3 +147 -8 xc/lib/GL/glx/glxextensions.h
1.3 +423 -326 xc/lib/GL/glx/indirect.h
1.3 +5 -5 xc/lib/GL/glx/packsingle.h
1.3 +1 -1 xc/lib/GL/glx/pixelstore.c
1.3 +2 -2 xc/lib/GL/glx/render2.c
1.3 +211 -268 xc/lib/GL/glx/single2.c
1.3 +448 -227 xc/lib/GL/glx/vertarr.c
1.2 +1 -1 xc/lib/GL/mesa/drivers/dri/ffb/Imakefile
1.2 +1 -1 xc/lib/GL/mesa/drivers/dri/gamma/Imakefile
1.2 +1 -1 xc/lib/GL/mesa/drivers/dri/i810/Imakefile
1.2 +1 -1 xc/lib/GL/mesa/drivers/dri/i830/Imakefile
1.2 +1 -1 xc/lib/GL/mesa/drivers/dri/mach64/Imakefile
1.2 +1 -1 xc/lib/GL/mesa/drivers/dri/mga/Imakefile
1.2 +1 -1 xc/lib/GL/mesa/drivers/dri/r128/Imakefile
1.2 +1 -1 xc/lib/GL/mesa/drivers/dri/r200/Imakefile
1.2 +1 -1 xc/lib/GL/mesa/drivers/dri/radeon/Imakefile
1.2 +1 -1 xc/lib/GL/mesa/drivers/dri/savage/Imakefile
1.2 +1 -1 xc/lib/GL/mesa/drivers/dri/sis/Imakefile
1.2 +1 -1 xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile
1.2 +1 -1 xc/lib/GL/mesa/drivers/dri/via/Imakefile
1.2 +1 -1 xc/lib/GL/mesa/tnl/Imakefile.inc
More information about the xorg-commit
mailing list