CVSROOT: /home/x-cvs
Module name: xc
Changes by: [EMAIL PROTECTED] 04/04/08 02:25:04
Log message:
resolve conflicts
Modified files:
xc/extras/Mesa/docs/:
VERSIONS
xc/extras/Mesa/include/GL/:
gl.h glext.h glxext.h
Added files:
xc/extras/Mesa/include/GL/internal/:
glcore.h
Removed files:
xc/extras/Mesa/src/:
accum.c accum.h api_arrayelt.c api_arrayelt.h api_eval.c
api_eval.h api_loopback.c api_loopback.h api_noop.c
api_noop.h api_validate.c api_validate.h attrib.c
attrib.h blend.c blend.h buffers.c buffers.h clip.c
clip.h colormac.h colortab.c colortab.h config.h
context.c context.h convolve.c convolve.h dd.h debug.c
debug.h depth.c depth.h dispatch.c dlist.c dlist.h
drawpix.c drawpix.h enable.c enable.h enums.c enums.h
eval.c eval.h extensions.c extensions.h feedback.c
feedback.h fog.c fog.h get.c get.h glapi.c glapi.h
glapioffsets.h glapitable.h glapitemp.h glheader.h
glprocs.h glthread.c glthread.h hash.c hash.h hint.c
hint.h histogram.c histogram.h image.c image.h imports.c
imports.h light.c light.h lines.c lines.h macros.h
matrix.c matrix.h mmath.c mmath.h mtypes.h pixel.c
pixel.h points.c points.h polygon.c polygon.h rastpos.c
rastpos.h simple_list.h state.c state.h stencil.c
stencil.h texcompress.c texcompress.h texformat.c
texformat.h texformat_tmp.h teximage.c teximage.h
texobj.c texobj.h texstate.c texstate.h texstore.c
texstore.h texutil.c texutil.h texutil_tmp.h varray.c
varray.h vpexec.c vpexec.h vpparse.c vpparse.h vpstate.c
vpstate.h vsnprintf.c vtxfmt.c vtxfmt.h vtxfmt_tmp.h
xc/extras/Mesa/src/OSmesa/:
osmesa.c
xc/extras/Mesa/src/SPARC/:
clip.S glapi_sparc.S norm.S sparc.c sparc.h
sparc_matrix.h xform.S
xc/extras/Mesa/src/Trace/:
tr_attrib.c tr_commands.h tr_context.c tr_context.h
tr_control.c tr_error.c tr_error.h tr_support.c
tr_support.h tr_wrapper.c tr_wrapper.h tr_write.c
tr_write.h
xc/extras/Mesa/src/X/:
fakeglx.c glxapi.c glxapi.h glxheader.h realglx.c
realglx.h xfonts.c xfonts.h xm_api.c xm_dd.c xm_line.c
xm_span.c xm_tri.c xmesaP.h
xc/extras/Mesa/src/X86/:
3dnow.c 3dnow.h 3dnow_normal.S 3dnow_xform1.S
3dnow_xform2.S 3dnow_xform3.S 3dnow_xform4.S assyntax.h
clip_args.h common_x86.c common_x86_asm.S
common_x86_asm.h common_x86_features.h
common_x86_macros.h gen_matypes.c glapi_x86.S mmx.h
mmx_blend.S mmx_blendtmp.h norm_args.h sse.c sse.h
sse_normal.S sse_xform1.S sse_xform2.S sse_xform3.S
sse_xform4.S x86.c x86.h x86_cliptest.S x86_xform2.S
x86_xform3.S x86_xform4.S xform_args.h
xc/extras/Mesa/src/array_cache/:
ac_context.c ac_context.h ac_import.c acache.h
xc/extras/Mesa/src/math/:
m_clip_tmp.h m_copy_tmp.h m_debug.h m_debug_clip.c
m_debug_norm.c m_debug_util.h m_debug_xform.c
m_dotprod_tmp.h m_eval.c m_eval.h m_matrix.c m_matrix.h
m_norm_tmp.h m_trans_tmp.h m_translate.c m_translate.h
m_vector.c m_vector.h m_xform.c m_xform.h m_xform_tmp.h
mathmod.h
xc/extras/Mesa/src/swrast/:
NOTES s_aaline.c s_aaline.h s_aalinetemp.h s_aatriangle.c
s_aatriangle.h s_aatritemp.h s_accum.c s_accum.h
s_alpha.c s_alpha.h s_alphabuf.c s_alphabuf.h s_bitmap.c
s_blend.c s_blend.h s_buffers.c s_context.c s_context.h
s_copypix.c s_depth.c s_depth.h s_drawpix.c s_drawpix.h
s_feedback.c s_feedback.h s_fog.c s_fog.h s_histogram.c
s_histogram.h s_imaging.c s_lines.c s_lines.h
s_linetemp.h s_logic.c s_logic.h s_masking.c s_masking.h
s_pixeltex.c s_pixeltex.h s_points.c s_points.h
s_pointtemp.h s_readpix.c s_span.c s_span.h s_stencil.c
s_stencil.h s_texstore.c s_texture.c s_texture.h
s_triangle.c s_triangle.h s_trispan.h s_tritemp.h
s_zoom.c s_zoom.h swrast.h
xc/extras/Mesa/src/swrast_setup/:
NOTES ss_context.c ss_context.h ss_triangle.c
ss_triangle.h ss_tritmp.h ss_vb.c ss_vb.h ss_vbtmp.h
swrast_setup.h
xc/extras/Mesa/src/tnl/:
NOTES t_array_api.c t_array_api.h t_array_import.c
t_array_import.h t_context.c t_context.h t_eval_api.c
t_eval_api.h t_imm_alloc.c t_imm_alloc.h t_imm_api.c
t_imm_api.h t_imm_debug.c t_imm_debug.h t_imm_dlist.c
t_imm_dlist.h t_imm_elt.c t_imm_elt.h t_imm_eval.c
t_imm_eval.h t_imm_exec.c t_imm_exec.h t_imm_fixup.c
t_imm_fixup.h t_pipeline.c t_pipeline.h t_vb_cliptmp.h
t_vb_fog.c t_vb_light.c t_vb_lighttmp.h t_vb_normals.c
t_vb_points.c t_vb_program.c t_vb_render.c
t_vb_rendertmp.h t_vb_texgen.c t_vb_texmat.c
t_vb_vertex.c t_vtx_api.c t_vtx_api.h t_vtx_exec.c
t_vtx_sse.c t_vtx_x86.c tnl.h
xc/extras/Mesa/src/tnl_dd/:
t_dd.c t_dd_dmatmp.h t_dd_dmatmp2.h t_dd_rendertmp.h
t_dd_triemit.h t_dd_tritmp.h t_dd_unfilled.h t_dd_vb.c
t_dd_vbtmp.h t_dd_vertex.h
xc/extras/Mesa/src/tnl_dd/imm/:
NOTES.imm t_dd_imm_capi.h t_dd_imm_napi.h
t_dd_imm_primtmp.h t_dd_imm_tapi.h t_dd_imm_vapi.h
t_dd_imm_vb.c t_dd_imm_vbtmp.h
Revision Changes Path
1.5 +58 -0 xc/extras/Mesa/docs/VERSIONS
1.18 +159 -599 xc/extras/Mesa/include/GL/gl.h
1.12 +1722 -834 xc/extras/Mesa/include/GL/glext.h
1.8 +8 -35 xc/extras/Mesa/include/GL/glxext.h
_______________________________________________
Cvs-commit mailing list
[EMAIL PROTECTED]
http://XFree86.Org/mailman/listinfo/cvs-commit
