.gitignore | 8 Makefile | 17 bin/minstall | 1 bin/mklib | 11 configs/.gitignore | 1 configs/default | 4 configs/freebsd-dri | 3 configs/linux-dri | 5 configs/linux-dri-debug | 16 debian/changelog | 34 debian/control | 2 debian/patches/06_fix_texture_data_corruption.patch | 23 debian/patches/series | 1 dev/null |binary docs/RELNOTES-6.4.1 | 47 docs/RELNOTES-6.4.2 | 47 docs/RELNOTES-6.5 | 97 docs/RELNOTES-6.5.1 | 60 docs/contents.html | 7 docs/custom.html | 27 docs/cvs_access.html | 106 docs/cvs_branches.html | 80 docs/developers.html | 51 docs/download.html | 2 docs/gears.png | 0 docs/intro.html | 30 docs/license.html | 30 docs/lists.html | 67 docs/news.html | 34 docs/relnotes-6.5.2.html | 10 docs/relnotes-6.5.3.html | 94 docs/relnotes.html | 1 docs/repository.html | 111 docs/shading.html | 309 + docs/thanks.html | 2 include/GL/gl_mangle.h | 4 include/GL/glext.h | 627 ++ include/GL/glxext.h | 115 include/GL/internal/dri_interface.h | 20 include/GL/internal/glcore.h | 336 - include/GL/xmesa.h | 15 include/GL/xmesa_xf86.h | 4 progs/demos/.cvsignore | 48 progs/demos/.gitignore | 48 progs/demos/Makefile | 20 progs/demos/fogcoord.c | 364 - progs/demos/fslight.c | 393 + progs/demos/texdown.c | 8 progs/demos/winpos.c | 2 progs/glsl/CH06-brick.frag.txt | 36 progs/glsl/CH06-brick.vert.txt | 41 progs/glsl/CH11-bumpmap.frag.txt | 41 progs/glsl/CH11-bumpmap.vert.txt | 38 progs/glsl/CH11-toyball.frag.txt | 75 progs/glsl/CH11-toyball.vert.txt | 24 progs/glsl/CH18-mandel.frag.txt | 55 progs/glsl/CH18-mandel.vert.txt | 35 progs/glsl/Makefile | 74 progs/glsl/brick.c | 311 + progs/glsl/bump.c | 411 + progs/glsl/cubemap.frag.txt | 18 progs/glsl/mandelbrot.c | 328 + progs/glsl/noise.c | 297 + progs/glsl/reflect.vert.txt | 19 progs/glsl/shadowtex.frag.txt | 21 progs/glsl/simple.vert.txt | 9 progs/glsl/texdemo1.c | 570 ++ progs/glsl/toyball.c | 339 + progs/redbook/.cvsignore | 64 progs/redbook/.gitignore | 64 progs/samples/.cvsignore | 45 progs/samples/.gitignore | 45 progs/util/extfuncs.h | 136 progs/xdemos/.cvsignore | 16 progs/xdemos/.gitignore | 16 progs/xdemos/Makefile | 2 progs/xdemos/glthreads.c | 2 progs/xdemos/glxcontexts.c | 4 progs/xdemos/glxgears_fbconfig.c | 2 progs/xdemos/glxheads.c | 2 progs/xdemos/glxinfo.c | 16 progs/xdemos/glxswapcontrol.c | 2 progs/xdemos/manywin.c | 2 progs/xdemos/opencloseopen.c | 2 progs/xdemos/pbinfo.c | 2 progs/xdemos/yuvrect_client.c | 2 src/glut/fbdev/fbdev.c | 17 src/glut/fbdev/glut_fbdev.c | 2199 --------- src/glut/fbdev/input.c | 86 src/glx/x11/.gitignore | 1 src/glx/x11/Makefile | 6 src/glx/x11/dispatch.c | 1 src/glx/x11/dri_glx.c | 35 src/glx/x11/glcontextmodes.c | 538 ++ src/glx/x11/glcontextmodes.h | 52 src/glx/x11/glxcmds.c | 3 src/glx/x11/glxext.c | 84 src/glx/x11/indirect.c | 50 src/glx/x11/indirect.h | 2 src/glx/x11/indirect_vertex_array.c | 6 src/glx/x11/single2.c | 18 src/mesa/.gitignore | 2 src/mesa/Makefile | 6 src/mesa/array_cache/ac_context.c | 375 - src/mesa/array_cache/ac_context.h | 99 src/mesa/array_cache/ac_import.c | 922 ---- src/mesa/array_cache/acache.h | 132 src/mesa/array_cache/descrip.mms | 37 src/mesa/array_cache/sources | 7 src/mesa/drivers/beos/GLView.cpp | 6 src/mesa/drivers/common/driverfuncs.c | 49 src/mesa/drivers/common/driverfuncs.h | 8 src/mesa/drivers/directfb/idirectfbgl_mesa.c | 31 src/mesa/drivers/dri/common/dri_bufmgr.c | 14 src/mesa/drivers/dri/common/dri_drmpool.c | 2 src/mesa/drivers/dri/common/dri_util.c | 25 src/mesa/drivers/dri/common/dri_util.h | 2 src/mesa/drivers/dri/common/drirenderbuffer.c | 2 src/mesa/drivers/dri/common/extension_helper.h | 22 src/mesa/drivers/dri/common/glcontextmodes.c | 533 -- src/mesa/drivers/dri/common/glcontextmodes.h | 52 src/mesa/drivers/dri/common/xmlpool/.gitignore | 5 src/mesa/drivers/dri/common/xmlpool/Makefile | 2 src/mesa/drivers/dri/common/xmlpool/options.h | 69 src/mesa/drivers/dri/common/xmlpool/sv.po | 226 + src/mesa/drivers/dri/fb/fb_dri.c | 14 src/mesa/drivers/dri/fb/fb_egl.c | 6 src/mesa/drivers/dri/ffb/ffb_state.c | 4 src/mesa/drivers/dri/ffb/ffb_xmesa.c | 8 src/mesa/drivers/dri/gamma/gamma_context.c | 4 src/mesa/drivers/dri/gamma/gamma_state.c | 4 src/mesa/drivers/dri/gamma/gamma_xmesa.c | 6 src/mesa/drivers/dri/i810/i810context.c | 14 src/mesa/drivers/dri/i810/i810screen.c | 2 src/mesa/drivers/dri/i810/i810state.c | 4 src/mesa/drivers/dri/i915/i915_context.c | 9 src/mesa/drivers/dri/i915/i915_fragprog.c | 6 src/mesa/drivers/dri/i915/i915_program.c | 12 src/mesa/drivers/dri/i915/i915_reg.h | 2 src/mesa/drivers/dri/i915/i915_state.c | 53 src/mesa/drivers/dri/i915/i915_vtbl.c | 4 src/mesa/drivers/dri/i915/intel_context.c | 17 src/mesa/drivers/dri/i915/intel_screen.c | 2 src/mesa/drivers/dri/i915tex/Makefile | 6 src/mesa/drivers/dri/i915tex/i915_context.c | 7 src/mesa/drivers/dri/i915tex/i915_context.h | 1 src/mesa/drivers/dri/i915tex/i915_fragprog.c | 6 src/mesa/drivers/dri/i915tex/i915_program.c | 12 src/mesa/drivers/dri/i915tex/i915_reg.h | 2 src/mesa/drivers/dri/i915tex/i915_state.c | 63 src/mesa/drivers/dri/i915tex/i915_tex.c | 35 src/mesa/drivers/dri/i915tex/i915_tex_layout.c | 79 src/mesa/drivers/dri/i915tex/intel_batchbuffer.c | 18 src/mesa/drivers/dri/i915tex/intel_batchbuffer.h | 2 src/mesa/drivers/dri/i915tex/intel_batchpool.c | 2 src/mesa/drivers/dri/i915tex/intel_blit.c | 257 - src/mesa/drivers/dri/i915tex/intel_buffer_objects.c | 9 src/mesa/drivers/dri/i915tex/intel_buffers.c | 382 + src/mesa/drivers/dri/i915tex/intel_buffers.h | 3 src/mesa/drivers/dri/i915tex/intel_context.c | 140 src/mesa/drivers/dri/i915tex/intel_context.h | 17 src/mesa/drivers/dri/i915tex/intel_fbo.c | 75 src/mesa/drivers/dri/i915tex/intel_fbo.h | 35 src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c | 13 src/mesa/drivers/dri/i915tex/intel_reg.h | 4 src/mesa/drivers/dri/i915tex/intel_regions.c | 13 src/mesa/drivers/dri/i915tex/intel_regions.h | 2 src/mesa/drivers/dri/i915tex/intel_screen.c | 196 src/mesa/drivers/dri/i915tex/intel_screen.h | 5 src/mesa/drivers/dri/i915tex/intel_tex_image.c | 21 src/mesa/drivers/dri/i915tex/intel_tex_layout.c | 1 src/mesa/drivers/dri/i915tex/intel_tex_subimage.c | 3 src/mesa/drivers/dri/i915tex/intel_tex_validate.c | 19 src/mesa/drivers/dri/i915tex/intel_tris.c | 3 src/mesa/drivers/dri/i915tex/server/i830_common.h | 6 src/mesa/drivers/dri/i965/Makefile | 14 src/mesa/drivers/dri/i965/brw_attrib.h | 114 src/mesa/drivers/dri/i965/brw_attrib_tmp.h | 485 -- src/mesa/drivers/dri/i965/brw_clip.c | 2 src/mesa/drivers/dri/i965/brw_clip.h | 2 src/mesa/drivers/dri/i965/brw_context.c | 10 src/mesa/drivers/dri/i965/brw_context.h | 28 src/mesa/drivers/dri/i965/brw_curbe.c | 3 src/mesa/drivers/dri/i965/brw_draw.c | 174 src/mesa/drivers/dri/i965/brw_draw.h | 57 src/mesa/drivers/dri/i965/brw_draw_current.c | 103 src/mesa/drivers/dri/i965/brw_draw_upload.c | 130 src/mesa/drivers/dri/i965/brw_eu.h | 3 src/mesa/drivers/dri/i965/brw_eu_emit.c | 155 src/mesa/drivers/dri/i965/brw_exec.c | 125 src/mesa/drivers/dri/i965/brw_exec.h | 150 src/mesa/drivers/dri/i965/brw_exec_api.c | 716 --- src/mesa/drivers/dri/i965/brw_exec_array.c | 283 - src/mesa/drivers/dri/i965/brw_exec_draw.c | 227 - src/mesa/drivers/dri/i965/brw_exec_eval.c | 255 - src/mesa/drivers/dri/i965/brw_fallback.c | 349 - src/mesa/drivers/dri/i965/brw_fallback.h | 4 src/mesa/drivers/dri/i965/brw_gs.c | 9 src/mesa/drivers/dri/i965/brw_gs.h | 1 src/mesa/drivers/dri/i965/brw_gs_emit.c | 10 src/mesa/drivers/dri/i965/brw_metaops.c | 75 src/mesa/drivers/dri/i965/brw_misc_state.c | 8 src/mesa/drivers/dri/i965/brw_program.c | 6 src/mesa/drivers/dri/i965/brw_save.c | 126 src/mesa/drivers/dri/i965/brw_save.h | 171 src/mesa/drivers/dri/i965/brw_save_api.c | 1170 ----- src/mesa/drivers/dri/i965/brw_save_draw.c | 221 - src/mesa/drivers/dri/i965/brw_structs.h | 22 src/mesa/drivers/dri/i965/brw_tex.c | 3 src/mesa/drivers/dri/i965/brw_tex_layout.c | 55 src/mesa/drivers/dri/i965/brw_urb.c | 2 src/mesa/drivers/dri/i965/brw_util.c | 32 src/mesa/drivers/dri/i965/brw_vs.c | 8 src/mesa/drivers/dri/i965/brw_vs_constval.c | 11 src/mesa/drivers/dri/i965/brw_vs_emit.c | 11 src/mesa/drivers/dri/i965/brw_vs_tnl.c | 160 src/mesa/drivers/dri/i965/brw_vtbl.c | 10 src/mesa/drivers/dri/i965/brw_wm.c | 53 src/mesa/drivers/dri/i965/brw_wm.h | 2 src/mesa/drivers/dri/i965/brw_wm_debug.c | 3 src/mesa/drivers/dri/i965/brw_wm_emit.c | 4 src/mesa/drivers/dri/i965/brw_wm_fp.c | 36 src/mesa/drivers/dri/i965/brw_wm_pass0.c | 4 src/mesa/drivers/dri/i965/brw_wm_pass1.c | 3 src/mesa/drivers/dri/i965/brw_wm_pass2.c | 4 src/mesa/drivers/dri/i965/brw_wm_state.c | 4 src/mesa/drivers/dri/i965/bufmgr.h | 2 src/mesa/drivers/dri/i965/bufmgr_fake.c | 18 src/mesa/drivers/dri/i965/intel_blit.c | 4 src/mesa/drivers/dri/i965/intel_context.c | 84 src/mesa/drivers/dri/i965/intel_context.h | 4 src/mesa/drivers/dri/i965/intel_ioctl.c | 38 src/mesa/drivers/dri/i965/intel_regions.c | 2 src/mesa/drivers/dri/i965/intel_regions.h | 1 src/mesa/drivers/dri/i965/intel_screen.c | 14 src/mesa/drivers/dri/i965/intel_screen.h | 1 src/mesa/drivers/dri/i965/intel_tex_layout.c | 1 src/mesa/drivers/dri/i965/server/i830_common.h | 19 src/mesa/drivers/dri/intel/intel_tex_layout.c | 102 src/mesa/drivers/dri/intel/intel_tex_layout.h | 41 src/mesa/drivers/dri/mach64/mach64_context.c | 82 src/mesa/drivers/dri/mach64/mach64_context.h | 57 src/mesa/drivers/dri/mach64/mach64_lock.c | 7 src/mesa/drivers/dri/mach64/mach64_native_vb.c | 20 src/mesa/drivers/dri/mach64/mach64_screen.c | 4 src/mesa/drivers/dri/mach64/mach64_state.c | 4 src/mesa/drivers/dri/mach64/mach64_tex.c | 131 src/mesa/drivers/dri/mach64/mach64_tex.h | 10 src/mesa/drivers/dri/mach64/mach64_texmem.c | 655 -- src/mesa/drivers/dri/mach64/mach64_texstate.c | 135 src/mesa/drivers/dri/mach64/mach64_tris.c | 17 src/mesa/drivers/dri/mga/mga_xmesa.c | 14 src/mesa/drivers/dri/mga/mgastate.c | 4 src/mesa/drivers/dri/nouveau/Makefile | 53 src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c | 616 ++ src/mesa/drivers/dri/nouveau/nouveau_bufferobj.h | 77 src/mesa/drivers/dri/nouveau/nouveau_buffers.c | 434 + src/mesa/drivers/dri/nouveau/nouveau_buffers.h | 48 src/mesa/drivers/dri/nouveau/nouveau_card.c | 17 src/mesa/drivers/dri/nouveau/nouveau_card.h | 49 src/mesa/drivers/dri/nouveau/nouveau_card_list.h | 232 + src/mesa/drivers/dri/nouveau/nouveau_context.c | 378 + src/mesa/drivers/dri/nouveau/nouveau_context.h | 236 + src/mesa/drivers/dri/nouveau/nouveau_ctrlreg.h | 44 src/mesa/drivers/dri/nouveau/nouveau_dri.h | 28 src/mesa/drivers/dri/nouveau/nouveau_driver.c | 146 src/mesa/drivers/dri/nouveau/nouveau_driver.h | 42 src/mesa/drivers/dri/nouveau/nouveau_fifo.c | 142 src/mesa/drivers/dri/nouveau/nouveau_fifo.h | 195 src/mesa/drivers/dri/nouveau/nouveau_lock.c | 81 src/mesa/drivers/dri/nouveau/nouveau_lock.h | 69 src/mesa/drivers/dri/nouveau/nouveau_msg.h | 67 src/mesa/drivers/dri/nouveau/nouveau_object.c | 117 src/mesa/drivers/dri/nouveau/nouveau_object.h | 47 src/mesa/drivers/dri/nouveau/nouveau_query.c | 198 src/mesa/drivers/dri/nouveau/nouveau_query.h | 38 src/mesa/drivers/dri/nouveau/nouveau_reg.h | 1505 ++++++ src/mesa/drivers/dri/nouveau/nouveau_screen.c | 382 + src/mesa/drivers/dri/nouveau/nouveau_screen.h | 61 src/mesa/drivers/dri/nouveau/nouveau_shader.c | 833 +++ src/mesa/drivers/dri/nouveau/nouveau_shader.h | 454 ++ src/mesa/drivers/dri/nouveau/nouveau_shader_0.c | 1050 ++++ src/mesa/drivers/dri/nouveau/nouveau_shader_1.c | 16 src/mesa/drivers/dri/nouveau/nouveau_shader_2.c | 264 + src/mesa/drivers/dri/nouveau/nouveau_span.c | 125 src/mesa/drivers/dri/nouveau/nouveau_span.h | 39 src/mesa/drivers/dri/nouveau/nouveau_state.c | 345 + src/mesa/drivers/dri/nouveau/nouveau_state.h | 50 src/mesa/drivers/dri/nouveau/nouveau_state_cache.c | 69 src/mesa/drivers/dri/nouveau/nouveau_state_cache.h | 29 src/mesa/drivers/dri/nouveau/nouveau_swtcl.c | 127 src/mesa/drivers/dri/nouveau/nouveau_swtcl.h | 55 src/mesa/drivers/dri/nouveau/nouveau_sync.c | 194 src/mesa/drivers/dri/nouveau/nouveau_sync.h | 67 src/mesa/drivers/dri/nouveau/nouveau_tex.c | 49 src/mesa/drivers/dri/nouveau/nouveau_tex.h | 38 src/mesa/drivers/dri/nouveau/nv04_state.c | 540 ++ src/mesa/drivers/dri/nouveau/nv04_swtcl.c | 619 ++ src/mesa/drivers/dri/nouveau/nv04_swtcl.h | 12 src/mesa/drivers/dri/nouveau/nv10_state.c | 798 +++ src/mesa/drivers/dri/nouveau/nv10_swtcl.c | 656 ++ src/mesa/drivers/dri/nouveau/nv10_swtcl.h | 40 src/mesa/drivers/dri/nouveau/nv20_shader.h | 121 src/mesa/drivers/dri/nouveau/nv20_state.c | 824 +++ src/mesa/drivers/dri/nouveau/nv20_vertprog.c | 447 ++ src/mesa/drivers/dri/nouveau/nv30_fragprog.c | 742 +++ src/mesa/drivers/dri/nouveau/nv30_shader.h | 379 + src/mesa/drivers/dri/nouveau/nv30_state.c | 980 ++++ src/mesa/drivers/dri/nouveau/nv30_vertprog.c | 367 + src/mesa/drivers/dri/nouveau/nv40_fragprog.c | 224 + src/mesa/drivers/dri/nouveau/nv40_shader.h | 467 ++ src/mesa/drivers/dri/nouveau/nv40_vertprog.c | 778 +++ src/mesa/drivers/dri/nouveau/nv50_state.c | 641 ++ src/mesa/drivers/dri/r128/r128_context.c | 8 src/mesa/drivers/dri/r128/r128_lock.c | 6 src/mesa/drivers/dri/r128/r128_screen.c | 2 src/mesa/drivers/dri/r128/r128_state.c | 4 src/mesa/drivers/dri/r128/r128_tris.c | 4 src/mesa/drivers/dri/r200/.gitignore | 3 src/mesa/drivers/dri/r200/Makefile | 6 src/mesa/drivers/dri/r200/r200_context.c | 33 src/mesa/drivers/dri/r200/r200_context.h | 135 src/mesa/drivers/dri/r200/r200_lock.c | 12 src/mesa/drivers/dri/r200/r200_maos.h | 2 src/mesa/drivers/dri/r200/r200_maos_arrays.c | 392 - src/mesa/drivers/dri/r200/r200_state.c | 55 src/mesa/drivers/dri/r200/r200_state.h | 2 src/mesa/drivers/dri/r200/r200_state_init.c | 3 src/mesa/drivers/dri/r200/r200_swtcl.c | 8 src/mesa/drivers/dri/r200/r200_swtcl.h | 1 src/mesa/drivers/dri/r200/r200_tcl.c | 44 src/mesa/drivers/dri/r200/r200_vertprog.c | 30 src/mesa/drivers/dri/r200/r200_vtxfmt.c | 1234 ----- src/mesa/drivers/dri/r200/r200_vtxfmt.h | 123 src/mesa/drivers/dri/r200/r200_vtxfmt_c.c | 1002 ---- src/mesa/drivers/dri/r200/r200_vtxfmt_sse.c | 234 - src/mesa/drivers/dri/r200/r200_vtxfmt_x86.c | 440 -- src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S | 499 -- src/mesa/drivers/dri/r300/.gitignore | 3 src/mesa/drivers/dri/r300/Makefile | 8 src/mesa/drivers/dri/r300/r200_context.h | 822 --- src/mesa/drivers/dri/r300/r200_ioctl.h | 204 src/mesa/drivers/dri/r300/r200_reg.h | 1423 ------ src/mesa/drivers/dri/r300/r200_state.h | 58 src/mesa/drivers/dri/r300/r300_cmdbuf.c | 166 src/mesa/drivers/dri/r300/r300_context.c | 53 src/mesa/drivers/dri/r300/r300_context.h | 185 src/mesa/drivers/dri/r300/r300_emit.h | 2 src/mesa/drivers/dri/r300/r300_fragprog.c | 2324 +++++++--- src/mesa/drivers/dri/r300/r300_fragprog.h | 13 src/mesa/drivers/dri/r300/r300_fragprog_swz.c | 1328 ------ src/mesa/drivers/dri/r300/r300_ioctl.c | 259 - src/mesa/drivers/dri/r300/r300_maos.c | 1 src/mesa/drivers/dri/r300/r300_maos.h | 1 src/mesa/drivers/dri/r300/r300_reg.h | 42 src/mesa/drivers/dri/r300/r300_render.c | 196 src/mesa/drivers/dri/r300/r300_shader.c | 26 src/mesa/drivers/dri/r300/r300_state.c | 455 +- src/mesa/drivers/dri/r300/r300_state.h | 1 src/mesa/drivers/dri/r300/r300_tex.c | 1 src/mesa/drivers/dri/r300/r300_tex.h | 1 src/mesa/drivers/dri/r300/r300_texmem.c | 362 - src/mesa/drivers/dri/r300/r300_texstate.c | 171 src/mesa/drivers/dri/r300/r300_vertexprog.c | 1175 ----- src/mesa/drivers/dri/r300/r300_vertprog.c | 1118 +++++ src/mesa/drivers/dri/r300/radeon_context.c | 12 src/mesa/drivers/dri/r300/radeon_lock.c | 5 src/mesa/drivers/dri/r300/radeon_mm.c | 4 src/mesa/drivers/dri/r300/radeon_span.c | 1 src/mesa/drivers/dri/r300/radeon_state.c | 4 src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c | 304 - src/mesa/drivers/dri/radeon/Makefile | 9 src/mesa/drivers/dri/radeon/radeon_context.c | 38 src/mesa/drivers/dri/radeon/radeon_context.h | 111 src/mesa/drivers/dri/radeon/radeon_ioctl.c | 8 src/mesa/drivers/dri/radeon/radeon_lock.c | 7 src/mesa/drivers/dri/radeon/radeon_maos_verts.c | 2 src/mesa/drivers/dri/radeon/radeon_screen.c | 22 src/mesa/drivers/dri/radeon/radeon_state.c | 8 src/mesa/drivers/dri/radeon/radeon_state_init.c | 3 src/mesa/drivers/dri/radeon/radeon_swtcl.c | 9 src/mesa/drivers/dri/radeon/radeon_swtcl.h | 1 src/mesa/drivers/dri/radeon/radeon_tcl.c | 2 src/mesa/drivers/dri/radeon/radeon_vtxfmt.c | 1086 ---- src/mesa/drivers/dri/radeon/radeon_vtxfmt.h | 120 src/mesa/drivers/dri/radeon/radeon_vtxfmt_c.c | 924 ---- src/mesa/drivers/dri/radeon/radeon_vtxfmt_sse.c | 236 - src/mesa/drivers/dri/radeon/radeon_vtxfmt_x86.c | 440 -- src/mesa/drivers/dri/radeon/radeon_vtxtmp_x86.S | 498 -- src/mesa/drivers/dri/s3v/s3v_context.c | 4 src/mesa/drivers/dri/s3v/s3v_state.c | 4 src/mesa/drivers/dri/s3v/s3v_tritmp.h | 46 src/mesa/drivers/dri/s3v/s3v_xmesa.c | 6 src/mesa/drivers/dri/savage/savage_xmesa.c | 10 src/mesa/drivers/dri/savage/savagestate.c | 4 src/mesa/drivers/dri/sis/sis6326_state.c | 4 src/mesa/drivers/dri/sis/sis_context.c | 8 src/mesa/drivers/dri/sis/sis_screen.c | 2 src/mesa/drivers/dri/sis/sis_state.c | 4 src/mesa/drivers/dri/tdfx/tdfx_context.c | 12 src/mesa/drivers/dri/tdfx/tdfx_screen.c | 2 src/mesa/drivers/dri/tdfx/tdfx_state.c | 4 src/mesa/drivers/dri/tdfx/tdfx_tris.c | 16 src/mesa/drivers/dri/trident/trident_context.c | 8 src/mesa/drivers/dri/trident/trident_context.h | 2 src/mesa/drivers/dri/trident/trident_state.c | 4 src/mesa/drivers/dri/unichrome/server/via_dri.c | 1 src/mesa/drivers/dri/unichrome/server/via_regs.h | 1 src/mesa/drivers/dri/unichrome/via_context.c | 39 src/mesa/drivers/dri/unichrome/via_context.h | 5 src/mesa/drivers/dri/unichrome/via_ioctl.c | 24 src/mesa/drivers/dri/unichrome/via_screen.c | 2 src/mesa/drivers/dri/unichrome/via_span.c | 4 src/mesa/drivers/dri/unichrome/via_state.c | 22 src/mesa/drivers/fbdev/glfbdev.c | 6 src/mesa/drivers/ggi/default/.cvsignore | 1 src/mesa/drivers/ggi/default/.gitignore | 1 src/mesa/drivers/ggi/display/.cvsignore | 1 src/mesa/drivers/ggi/display/.gitignore | 1 src/mesa/drivers/ggi/ggimesa.c | 4 src/mesa/drivers/glide/fxapi.c | 4 src/mesa/drivers/glide/fxdd.c | 9 src/mesa/drivers/glslcompiler/Makefile | 44 src/mesa/drivers/glslcompiler/glslcompiler.c | 358 + src/mesa/drivers/osmesa/osmesa.c | 21 src/mesa/drivers/svga/svgamesa.c | 1 src/mesa/drivers/svga/svgamesa15.c | 2 src/mesa/drivers/svga/svgamesa16.c | 2 src/mesa/drivers/svga/svgamesa24.c | 2 src/mesa/drivers/svga/svgamesa32.c | 2 src/mesa/drivers/svga/svgamesa8.c | 2 src/mesa/drivers/windows/gdi/mesa.def | 6 src/mesa/drivers/windows/gdi/wmesa.c | 8 src/mesa/drivers/windows/gldirect/dglcontext.c | 2 src/mesa/drivers/windows/icd/mesa.def | 6 src/mesa/drivers/x11/fakeglx.c | 13 src/mesa/drivers/x11/glxapi.c | 2 src/mesa/drivers/x11/glxheader.h | 2 src/mesa/drivers/x11/xm_api.c | 519 -- src/mesa/drivers/x11/xm_buffer.c | 124 src/mesa/drivers/x11/xm_dd.c | 7 src/mesa/drivers/x11/xm_image.c | 133 src/mesa/drivers/x11/xm_image.h | 84 src/mesa/drivers/x11/xm_line.c | 19 src/mesa/drivers/x11/xm_tri.c | 43 src/mesa/drivers/x11/xmesaP.h | 50 src/mesa/glapi/.cvsignore | 11 src/mesa/glapi/.gitignore | 11 src/mesa/glapi/Makefile | 10 src/mesa/glapi/glX_proto_recv.py | 21 src/mesa/glapi/glX_proto_size.py | 12 src/mesa/glapi/gl_API.xml | 20 src/mesa/glapi/gl_table.py | 6 src/mesa/glapi/glapi.c | 3 src/mesa/glapi/glapitable.h | 8 src/mesa/glapi/glapitemp.h | 14 src/mesa/glapi/glprocs.h | 12 src/mesa/main/api_loopback.c | 2 src/mesa/main/api_noop.c | 2 src/mesa/main/arrayobj.c | 9 src/mesa/main/attrib.c | 39 src/mesa/main/bufferobj.c | 4 src/mesa/main/buffers.c | 3 src/mesa/main/colortab.c | 325 - src/mesa/main/config.h | 15 src/mesa/main/context.c | 425 - src/mesa/main/context.h | 38 src/mesa/main/dd.h | 58 src/mesa/main/dlist.c | 53 src/mesa/main/enable.c | 111 src/mesa/main/enums.c | 6 src/mesa/main/execmem.c | 2 src/mesa/main/extensions.c | 9 src/mesa/main/fbobject.c | 64 src/mesa/main/framebuffer.c | 157 src/mesa/main/framebuffer.h | 6 src/mesa/main/get.c | 102 src/mesa/main/get_gen.py | 39 src/mesa/main/getstring.c | 7 src/mesa/main/glheader.h | 12 src/mesa/main/image.c | 290 - src/mesa/main/imports.c | 446 -- src/mesa/main/imports.h | 37 src/mesa/main/light.c | 14 src/mesa/main/light.h | 3 src/mesa/main/lines.c | 23 src/mesa/main/matrix.c | 14 src/mesa/main/mipmap.c | 3 src/mesa/main/mtypes.h | 413 + src/mesa/main/pixel.c | 495 -- src/mesa/main/points.c | 41 src/mesa/main/points.h | 3 src/mesa/main/polygon.c | 39 src/mesa/main/polygon.h | 7 src/mesa/main/rastpos.c | 67 src/mesa/main/rbadaptors.c | 6 src/mesa/main/renderbuffer.c | 123 src/mesa/main/renderbuffer.h | 6 src/mesa/main/shaders.c | 680 +++ src/mesa/main/shaders.h | 236 + src/mesa/main/state.c | 200 src/mesa/main/stencil.c | 90 src/mesa/main/texcompress_fxt1.c | 77 src/mesa/main/texcompress_s3tc.c | 2 src/mesa/main/texenvprogram.c | 110 src/mesa/main/teximage.c | 12 src/mesa/main/texobj.c | 6 src/mesa/main/texrender.c | 2 src/mesa/main/texstate.c | 94 src/mesa/main/texstore.c | 28 src/mesa/main/texstore.h | 4 src/mesa/main/varray.c | 3 src/mesa/main/version.h | 14 src/mesa/shader/arbprogparse.c | 304 - src/mesa/shader/arbprogram.c | 16 src/mesa/shader/asmopcodes.reg | 78 src/mesa/shader/grammar/grammar.c | 25 src/mesa/shader/nvfragparse.c | 35 src/mesa/shader/nvprogram.c | 7 src/mesa/shader/nvvertexec.c | 835 --- src/mesa/shader/nvvertexec.h | 67 src/mesa/shader/nvvertparse.c | 15 src/mesa/shader/prog_debug.c | 259 + src/mesa/shader/prog_debug.h | 44 src/mesa/shader/prog_execute.c | 1731 +++++++ src/mesa/shader/prog_execute.h | 81 src/mesa/shader/prog_instruction.c | 239 + src/mesa/shader/prog_instruction.h | 447 ++ src/mesa/shader/prog_parameter.c | 643 ++ src/mesa/shader/prog_parameter.h | 143 src/mesa/shader/prog_print.c | 758 +++ src/mesa/shader/prog_print.h | 72 src/mesa/shader/prog_statevars.c | 824 +++ src/mesa/shader/prog_statevars.h | 129 src/mesa/shader/program.c | 1813 -------- src/mesa/shader/program.h | 215 src/mesa/shader/program_instruction.h | 360 - src/mesa/shader/programopt.c | 192 src/mesa/shader/programopt.h | 10 src/mesa/shader/shader_api.c | 1215 +++++ src/mesa/shader/shader_api.h | 185 src/mesa/shader/shaderobjects.c | 1191 ----- src/mesa/shader/shaderobjects.h | 353 - src/mesa/shader/shaderobjects_3dlabs.c | 2144 --------- src/mesa/shader/shaderobjects_3dlabs.h | 51 src/mesa/shader/slang/library/Makefile | 8 src/mesa/shader/slang/library/gc_to_bin.c | 5 src/mesa/shader/slang/library/slang_120_core.gc | 1398 +++--- src/mesa/shader/slang/library/slang_120_core_gc.h | 730 +++ src/mesa/shader/slang/library/slang_builtin_vec4.gc | 220 - src/mesa/shader/slang/library/slang_builtin_vec4_gc.h | 62 src/mesa/shader/slang/library/slang_common_builtin.gc | 1775 ++++---- src/mesa/shader/slang/library/slang_common_builtin_gc.h | 1379 +++--- src/mesa/shader/slang/library/slang_core.gc | 2738 ++++++++---- src/mesa/shader/slang/library/slang_core_gc.h | 1351 +++--- src/mesa/shader/slang/library/slang_fragment_builtin.gc | 223 - src/mesa/shader/slang/library/slang_fragment_builtin_gc.h | 156 src/mesa/shader/slang/library/slang_shader.syn | 42 src/mesa/shader/slang/library/slang_shader_syn.h | 28 src/mesa/shader/slang/library/slang_vertex_builtin.gc | 139 src/mesa/shader/slang/library/slang_vertex_builtin_gc.h | 129 src/mesa/shader/slang/slang_analyse.c | 100 src/mesa/shader/slang/slang_analyse.h | 50 src/mesa/shader/slang/slang_assemble.c | 1542 ------- src/mesa/shader/slang/slang_assemble.h | 278 - src/mesa/shader/slang/slang_assemble_assignment.c | 223 - src/mesa/shader/slang/slang_assemble_assignment.h | 45 src/mesa/shader/slang/slang_assemble_conditional.c | 448 -- src/mesa/shader/slang/slang_assemble_conditional.h | 51 src/mesa/shader/slang/slang_assemble_constructor.c | 401 - src/mesa/shader/slang/slang_assemble_constructor.h | 57 src/mesa/shader/slang/slang_assemble_typeinfo.c | 625 -- src/mesa/shader/slang/slang_assemble_typeinfo.h | 152 src/mesa/shader/slang/slang_builtin.c | 440 ++ src/mesa/shader/slang/slang_builtin.h | 39 src/mesa/shader/slang/slang_codegen.c | 3079 ++++++++++++++ src/mesa/shader/slang/slang_codegen.h | 45 src/mesa/shader/slang/slang_compile.c | 797 +-- src/mesa/shader/slang/slang_compile.h | 47 src/mesa/shader/slang/slang_compile_function.c | 85 src/mesa/shader/slang/slang_compile_function.h | 22 src/mesa/shader/slang/slang_compile_operation.c | 129 src/mesa/shader/slang/slang_compile_operation.h | 155 src/mesa/shader/slang/slang_compile_struct.c | 218 src/mesa/shader/slang/slang_compile_variable.c | 261 - src/mesa/shader/slang/slang_compile_variable.h | 36 src/mesa/shader/slang/slang_emit.c | 1839 ++++++++ src/mesa/shader/slang/slang_emit.h | 49 src/mesa/shader/slang/slang_execute.c | 783 --- src/mesa/shader/slang/slang_execute.h | 105 src/mesa/shader/slang/slang_execute_x86.c | 754 --- src/mesa/shader/slang/slang_export.c | 386 - src/mesa/shader/slang/slang_export.h | 183 src/mesa/shader/slang/slang_ir.c | 377 + src/mesa/shader/slang/slang_ir.h | 205 src/mesa/shader/slang/slang_label.c | 98 src/mesa/shader/slang/slang_label.h | 45 src/mesa/shader/slang/slang_library_noise.c | 4 src/mesa/shader/slang/slang_library_texsample.c | 172 src/mesa/shader/slang/slang_library_texsample.h | 44 src/mesa/shader/slang/slang_link.c | 1165 ++--- src/mesa/shader/slang/slang_link.h | 334 - src/mesa/shader/slang/slang_log.c | 131 src/mesa/shader/slang/slang_log.h | 57 src/mesa/shader/slang/slang_mesa.cpp | 144 src/mesa/shader/slang/slang_mesa.h | 36 src/mesa/shader/slang/slang_preprocess.h | 23 src/mesa/shader/slang/slang_print.c | 813 +++ src/mesa/shader/slang/slang_print.h | 29 src/mesa/shader/slang/slang_simplify.c | 449 ++ src/mesa/shader/slang/slang_simplify.h | 22 src/mesa/shader/slang/slang_storage.c | 411 - src/mesa/shader/slang/slang_storage.h | 121 src/mesa/shader/slang/slang_typeinfo.c | 1022 ++++ src/mesa/shader/slang/slang_typeinfo.h | 202 src/mesa/shader/slang/slang_utility.c | 15 src/mesa/shader/slang/slang_utility.h | 6 src/mesa/shader/slang/slang_vartable.c | 328 + src/mesa/shader/slang/slang_vartable.h | 42 src/mesa/shader/slang/traverse_wrap.h | 112 src/mesa/sources | 109 src/mesa/sparc/glapi_sparc.S | 1 src/mesa/swrast/s_aaline.c | 51 src/mesa/swrast/s_aalinetemp.h | 123 src/mesa/swrast/s_aatriangle.c | 52 src/mesa/swrast/s_aatritemp.h | 224 - src/mesa/swrast/s_accum.c | 4 src/mesa/swrast/s_alpha.c | 2 src/mesa/swrast/s_arbshader.c | 124 src/mesa/swrast/s_arbshader.h | 38 src/mesa/swrast/s_atifragshader.c | 16 src/mesa/swrast/s_bitmap.c | 2 src/mesa/swrast/s_buffers.c | 5 src/mesa/swrast/s_context.c | 177 src/mesa/swrast/s_context.h | 216 src/mesa/swrast/s_copypix.c | 121 src/mesa/swrast/s_depth.c | 6 src/mesa/swrast/s_drawpix.c | 36 src/mesa/swrast/s_feedback.c | 17 src/mesa/swrast/s_fog.c | 58 src/mesa/swrast/s_fragprog.c | 224 + src/mesa/swrast/s_fragprog.h | 38 src/mesa/swrast/s_lines.c | 7 src/mesa/swrast/s_linetemp.h | 103 src/mesa/swrast/s_logic.c | 2 src/mesa/swrast/s_masking.c | 2 src/mesa/swrast/s_nvfragprog.c | 1665 ------- src/mesa/swrast/s_nvfragprog.h | 37 src/mesa/swrast/s_pointtemp.h | 76 src/mesa/swrast/s_readpix.c | 57 src/mesa/swrast/s_span.c | 816 +-- src/mesa/swrast/s_span.h | 182 src/mesa/swrast/s_stencil.c | 14 src/mesa/swrast/s_texcombine.c | 6 src/mesa/swrast/s_texfilter.c | 119 src/mesa/swrast/s_triangle.c | 52 src/mesa/swrast/s_tritemp.h | 439 - src/mesa/swrast/s_zoom.c | 45 src/mesa/swrast/swrast.h | 3 src/mesa/swrast_setup/ss_context.c | 29 src/mesa/swrast_setup/ss_triangle.c | 4 src/mesa/swrast_setup/ss_tritmp.h | 46 src/mesa/tnl/sources | 14 src/mesa/tnl/t_array_api.c | 432 - src/mesa/tnl/t_array_api.h | 46 src/mesa/tnl/t_array_import.c | 376 - src/mesa/tnl/t_array_import.h | 36 src/mesa/tnl/t_context.c | 125 src/mesa/tnl/t_context.h | 341 - src/mesa/tnl/t_draw.c | 409 + src/mesa/tnl/t_pipeline.c | 15 src/mesa/tnl/t_pipeline.h | 9 src/mesa/tnl/t_save_api.c | 163 src/mesa/tnl/t_save_api.h | 57 src/mesa/tnl/t_save_loopback.c | 330 - src/mesa/tnl/t_save_playback.c | 216 src/mesa/tnl/t_vb_arbprogram.c | 1539 ------ src/mesa/tnl/t_vb_arbprogram.h | 189 src/mesa/tnl/t_vb_arbprogram_sse.c | 1330 ------ src/mesa/tnl/t_vb_arbshader.c | 301 - src/mesa/tnl/t_vb_cull.c | 5 src/mesa/tnl/t_vb_fog.c | 5 src/mesa/tnl/t_vb_light.c | 10 src/mesa/tnl/t_vb_normals.c | 7 src/mesa/tnl/t_vb_points.c | 5 src/mesa/tnl/t_vb_program.c | 321 + src/mesa/tnl/t_vb_render.c | 2 src/mesa/tnl/t_vb_rendertmp.h | 4 src/mesa/tnl/t_vb_texgen.c | 10 src/mesa/tnl/t_vb_texmat.c | 5 src/mesa/tnl/t_vb_vertex.c | 5 src/mesa/tnl/t_vp_build.c | 173 src/mesa/tnl/t_vtx_api.c | 1046 ---- src/mesa/tnl/t_vtx_api.h | 86 src/mesa/tnl/t_vtx_eval.c | 265 - src/mesa/tnl/t_vtx_exec.c | 293 - src/mesa/tnl/t_vtx_generic.c | 615 -- src/mesa/tnl/t_vtx_x86.c | 396 - src/mesa/tnl/t_vtx_x86_gcc.S | 561 -- src/mesa/tnl/tnl.h | 33 src/mesa/tnl_dd/t_dd_vb.c | 48 src/mesa/vbo/descrip.mms | 60 src/mesa/vbo/vbo.h | 117 src/mesa/vbo/vbo_attrib.h | 107 src/mesa/vbo/vbo_attrib_tmp.h | 486 ++ src/mesa/vbo/vbo_context.c | 247 + src/mesa/vbo/vbo_context.h | 108 src/mesa/vbo/vbo_exec.c | 97 src/mesa/vbo/vbo_exec.h | 165 src/mesa/vbo/vbo_exec_api.c | 703 +++ src/mesa/vbo/vbo_exec_array.c | 387 + src/mesa/vbo/vbo_exec_draw.c | 228 + src/mesa/vbo/vbo_exec_eval.c | 255 + src/mesa/vbo/vbo_rebase.c | 222 + src/mesa/vbo/vbo_save.c | 89 src/mesa/vbo/vbo_save.h | 177 src/mesa/vbo/vbo_save_api.c | 1147 +++++ src/mesa/vbo/vbo_save_draw.c | 230 + src/mesa/vbo/vbo_save_loopback.c | 194 src/mesa/vbo/vbo_split.c | 161 src/mesa/vbo/vbo_split.h | 72 src/mesa/vbo/vbo_split_copy.c | 551 ++ src/mesa/vbo/vbo_split_inplace.c | 286 + src/mesa/x86-64/glapi_x86-64.S | 1 src/mesa/x86-64/matypes.h | 162 src/mesa/x86/common_x86.c | 146 src/mesa/x86/glapi_x86.S | 1 src/mesa/x86/matypes.h | 163 src/mesa/x86/mmx_blend.S | 41 src/mesa/x86/read_rgba_span_x86.S | 86 730 files changed, 67694 insertions(+), 62983 deletions(-)
New commits: commit 9a42ffad814837adf7512a6f897a33b1fda86733 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sat Apr 21 21:23:21 2007 +0200 Add build-dependencies on libxdamage-dev and libxfixes-dev. diff --git a/debian/changelog b/debian/changelog index d038f8d..302b112 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,9 @@ mesa (6.5.3~rc1-1) UNRELEASED; urgency=low 07_call_radeonSetCliprects_from_radeonMakeCurrent.patch, 08_r300_update_window_state_when_bound_but_stamp_changed.patch, 09_i915_always_enable_pixel_fog.patch: remove, included upstream. + * Add build-dependencies on libxdamage-dev and libxfixes-dev. - -- Julien Cristau <[EMAIL PROTECTED]> Sat, 21 Apr 2007 20:43:43 +0200 + -- Julien Cristau <[EMAIL PROTECTED]> Sat, 21 Apr 2007 21:20:46 +0200 mesa (6.5.2-5) UNRELEASED; urgency=low diff --git a/debian/control b/debian/control index c6f0de3..8b50e6d 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: Thierry Reding <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]> Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 5), quilt (>= 0.40), pkg-config, libdrm-dev (>= 2.2.0) [!hurd-i386], libx11-dev, xutils-dev, x11proto-gl-dev (>= 1.4.8), libxxf86vm-dev, libexpat1-dev, lesstif2-dev, dpkg-dev (>= 1.13.19) +Build-Depends: debhelper (>= 5), quilt (>= 0.40), pkg-config, libdrm-dev (>= 2.2.0) [!hurd-i386], libx11-dev, xutils-dev, x11proto-gl-dev (>= 1.4.8), libxxf86vm-dev, libexpat1-dev, lesstif2-dev, dpkg-dev (>= 1.13.19), libxfixes-dev, libxdamage-dev Package: libgl1-mesa-swx11 Section: libs commit 0d8633bf8cc3c78c540b5a5fa76e862c66ebae54 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sat Apr 21 21:20:37 2007 +0200 Delete autogenerated files, and files not included in the tarball. diff --git a/docs/gears.png b/docs/gears.png deleted file mode 100644 index 4052b30..0000000 Binary files a/docs/gears.png and /dev/null differ diff --git a/src/glx/x11/dispatch.c b/src/glx/x11/dispatch.c deleted file mode 120000 index 4b43221..0000000 --- a/src/glx/x11/dispatch.c +++ /dev/null @@ -1 +0,0 @@ -../../../src/mesa/main/dispatch.c \ No newline at end of file diff --git a/src/mesa/x86-64/matypes.h b/src/mesa/x86-64/matypes.h deleted file mode 100644 index 719ea31..0000000 --- a/src/mesa/x86-64/matypes.h +++ /dev/null @@ -1,162 +0,0 @@ -/* - * This file is automatically generated from the Mesa internal type - * definitions. Do not edit directly. - */ - -#ifndef __ASM_TYPES_H__ -#define __ASM_TYPES_H__ - - - -/* ============================================================= - * Offsets for GLcontext - */ - -#define CTX_DRIVER_CTX 948 - -#define CTX_LIGHT_ENABLED 39308 -#define CTX_LIGHT_SHADE_MODEL 39312 -#define CTX_LIGHT_COLOR_MAT_FACE 39316 -#define CTX_LIGHT_COLOR_MAT_MODE 39320 -#define CTX_LIGHT_COLOR_MAT_MASK 39324 -#define CTX_LIGHT_COLOR_MAT_ENABLED 39328 -#define CTX_LIGHT_ENABLED_LIST 39336 -#define CTX_LIGHT_NEED_VERTS 43697 -#define CTX_LIGHT_FLAGS 43700 -#define CTX_LIGHT_BASE_COLOR 43704 - - -/* ============================================================= - * Offsets for struct vertex_buffer - */ - -#define VB_SIZE 0 -#define VB_COUNT 4 - -#define VB_ELTS 8 -#define VB_OBJ_PTR 12 -#define VB_EYE_PTR 16 -#define VB_CLIP_PTR 20 -#define VB_PROJ_CLIP_PTR 24 -#define VB_CLIP_OR_MASK 28 -#define VB_CLIP_MASK 32 -#define VB_NORMAL_PTR 36 -#define VB_EDGE_FLAG 44 -#define VB_TEX0_COORD_PTR 48 -#define VB_TEX1_COORD_PTR 52 -#define VB_TEX2_COORD_PTR 56 -#define VB_TEX3_COORD_PTR 60 -#define VB_INDEX_PTR 80 -#define VB_COLOR_PTR 88 -#define VB_SECONDARY_COLOR_PTR 96 -#define VB_FOG_COORD_PTR 104 -#define VB_PRIMITIVE 172 - - -/* - * Flags for struct vertex_buffer - */ - -#define VERT_BIT_OBJ 0x1 -#define VERT_BIT_NORM 0x4 -#define VERT_BIT_RGBA 0x8 -#define VERT_BIT_SPEC_RGB 0x10 -#define VERT_BIT_FOG_COORD 0x20 -#define VERT_BIT_TEX0 0x100 -#define VERT_BIT_TEX1 0x200 -#define VERT_BIT_TEX2 0x400 -#define VERT_BIT_TEX3 0x800 - - -/* ============================================================= - * Offsets for GLvector4f - */ - -#define V4F_DATA 0 -#define V4F_START 4 -#define V4F_COUNT 8 -#define V4F_STRIDE 12 -#define V4F_SIZE 16 -#define V4F_FLAGS 20 - -/* - * Flags for GLvector4f - */ - -#define VEC_MALLOC 0x10 -#define VEC_NOT_WRITEABLE 0x40 -#define VEC_BAD_STRIDE 0x100 - -#define VEC_SIZE_1 0x1 -#define VEC_SIZE_2 0x3 -#define VEC_SIZE_3 0x7 -#define VEC_SIZE_4 0xf - - -/* ============================================================= - * Offsets for GLmatrix - */ - -#define MATRIX_DATA 0 -#define MATRIX_INV 4 -#define MATRIX_FLAGS 8 -#define MATRIX_TYPE 12 - - -/* ============================================================= - * Offsets for struct gl_light - */ - -#define LIGHT_NEXT 0 -#define LIGHT_PREV 4 - -#define LIGHT_AMBIENT 8 -#define LIGHT_DIFFUSE 24 -#define LIGHT_SPECULAR 40 -#define LIGHT_EYE_POSITION 56 -#define LIGHT_EYE_DIRECTION 72 -#define LIGHT_SPOT_EXPONENT 88 -#define LIGHT_SPOT_CUTOFF 92 -#define LIGHT_COS_CUTOFF 100 -#define LIGHT_CONST_ATTEN 104 -#define LIGHT_LINEAR_ATTEN 108 -#define LIGHT_QUADRATIC_ATTEN 112 -#define LIGHT_ENABLED 116 - -#define LIGHT_FLAGS 120 - -#define LIGHT_POSITION 124 -#define LIGHT_VP_INF_NORM 140 -#define LIGHT_H_INF_NORM 152 -#define LIGHT_NORM_DIRECTION 164 -#define LIGHT_VP_INF_SPOT_ATTEN 180 - -#define LIGHT_SPOT_EXP_TABLE 184 -#define LIGHT_MAT_AMBIENT 4280 -#define LIGHT_MAT_DIFFUSE 4304 -#define LIGHT_MAT_SPECULAR 4328 - -#define SIZEOF_GL_LIGHT 4360 - -/* - * Flags for struct gl_light - */ - -#define LIGHT_SPOT 0x1 -#define LIGHT_LOCAL_VIEWER 0x2 -#define LIGHT_POSITIONAL 0x4 - -#define LIGHT_NEED_VERTICES 0x6 - - -/* ============================================================= - * Offsets for struct gl_lightmodel - */ - -#define LIGHT_MODEL_AMBIENT 0 -#define LIGHT_MODEL_LOCAL_VIEWER 16 -#define LIGHT_MODEL_TWO_SIDE 17 -#define LIGHT_MODEL_COLOR_CONTROL 20 - - -#endif /* __ASM_TYPES_H__ */ diff --git a/src/mesa/x86/matypes.h b/src/mesa/x86/matypes.h deleted file mode 100644 index abce247..0000000 --- a/src/mesa/x86/matypes.h +++ /dev/null @@ -1,163 +0,0 @@ -/* - * This file is automatically generated from the Mesa internal type - * definitions. Do not edit directly. - */ - -#ifndef __ASM_TYPES_H__ -#define __ASM_TYPES_H__ - -#include "assyntax.h" - - -/* ============================================================= - * Offsets for GLcontext - */ - -#define CTX_DRIVER_CTX 948 - -#define CTX_LIGHT_ENABLED 39308 -#define CTX_LIGHT_SHADE_MODEL 39312 -#define CTX_LIGHT_COLOR_MAT_FACE 39316 -#define CTX_LIGHT_COLOR_MAT_MODE 39320 -#define CTX_LIGHT_COLOR_MAT_MASK 39324 -#define CTX_LIGHT_COLOR_MAT_ENABLED 39328 -#define CTX_LIGHT_ENABLED_LIST 39336 -#define CTX_LIGHT_NEED_VERTS 43697 -#define CTX_LIGHT_FLAGS 43700 -#define CTX_LIGHT_BASE_COLOR 43704 - - -/* ============================================================= - * Offsets for struct vertex_buffer - */ - -#define VB_SIZE 0 -#define VB_COUNT 4 - -#define VB_ELTS 8 -#define VB_OBJ_PTR 12 -#define VB_EYE_PTR 16 -#define VB_CLIP_PTR 20 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]