From 0861da665f9f5cc2387c54687327f545db823144 Mon Sep 17 00:00:00 2001 From: alanh Date: Tue, 9 Dec 2003 15:33:35 +0000 Subject: merge newmesa branch to the trunk --- xc/config/cf/host.def | 11 +- xc/extras/expat/conftools/ac_c_bigendian_cross.m4 | 2 +- xc/extras/expat/conftools/mkinstalldirs | 2 +- xc/include/GL/glxproto.h | 6 + xc/lib/GL/GL/Imakefile | 58 +- xc/lib/GL/Imakefile | 10 +- xc/lib/GL/dri/Imakefile | 6 +- xc/lib/GL/dri/dri_util.c | 1 - xc/lib/GL/dri/dri_util.h | 2 + xc/lib/GL/glx/Imakefile | 30 +- xc/lib/GL/glx/glxcmds.c | 1 - xc/lib/GL/include/GL/internal/glcore.h | 463 -- xc/lib/GL/mesa/Imakefile | 68 + xc/lib/GL/mesa/Imakefile.inc | 42 + xc/lib/GL/mesa/array_cache/Imakefile | 91 + xc/lib/GL/mesa/array_cache/Imakefile.inc | 34 + xc/lib/GL/mesa/drivers/dri/Imakefile | 15 + xc/lib/GL/mesa/drivers/dri/common/Imakefile | 44 + xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc | 80 + xc/lib/GL/mesa/drivers/dri/ffb/Imakefile | 84 + xc/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc | 150 + xc/lib/GL/mesa/drivers/dri/gamma/Imakefile | 84 + xc/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc | 139 + xc/lib/GL/mesa/drivers/dri/i810/Imakefile | 84 + xc/lib/GL/mesa/drivers/dri/i810/Imakefile.inc | 120 + xc/lib/GL/mesa/drivers/dri/i830/Imakefile | 81 + xc/lib/GL/mesa/drivers/dri/i830/Imakefile.inc | 127 + xc/lib/GL/mesa/drivers/dri/mga/Imakefile | 85 + xc/lib/GL/mesa/drivers/dri/mga/Imakefile.inc | 134 + xc/lib/GL/mesa/drivers/dri/r128/Imakefile | 84 + xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc | 129 + xc/lib/GL/mesa/drivers/dri/r200/Imakefile | 83 + xc/lib/GL/mesa/drivers/dri/r200/Imakefile.inc | 199 + xc/lib/GL/mesa/drivers/dri/radeon/Imakefile | 83 + xc/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc | 192 + xc/lib/GL/mesa/drivers/dri/sis/Imakefile | 87 + xc/lib/GL/mesa/drivers/dri/sis/Imakefile.inc | 162 + xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile | 83 + xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc | 139 + xc/lib/GL/mesa/drivers/osmesa/Imakefile | 96 + xc/lib/GL/mesa/drivers/x11/Imakefile | 70 + xc/lib/GL/mesa/drivers/x11/Imakefile.inc | 98 + xc/lib/GL/mesa/main/Imakefile | 59 + xc/lib/GL/mesa/main/Imakefile.inc | 492 ++ xc/lib/GL/mesa/math/Imakefile | 93 + xc/lib/GL/mesa/math/Imakefile.inc | 82 + xc/lib/GL/mesa/sparc/Imakefile | 57 + xc/lib/GL/mesa/sparc/Imakefile.inc | 58 + xc/lib/GL/mesa/src/Imakefile | 76 - xc/lib/GL/mesa/src/Imakefile.inc | 495 -- xc/lib/GL/mesa/src/OSmesa/Imakefile | 97 - xc/lib/GL/mesa/src/OSmesa/OSMesa-def.cpp | 29 - xc/lib/GL/mesa/src/SPARC/Imakefile | 57 - xc/lib/GL/mesa/src/SPARC/Imakefile.inc | 58 - xc/lib/GL/mesa/src/X/Imakefile | 70 - xc/lib/GL/mesa/src/X/Imakefile.inc | 98 - xc/lib/GL/mesa/src/X86/Imakefile | 98 - xc/lib/GL/mesa/src/X86/Imakefile.inc | 203 - xc/lib/GL/mesa/src/array_cache/Imakefile | 89 - xc/lib/GL/mesa/src/array_cache/Imakefile.inc | 32 - xc/lib/GL/mesa/src/drv/Imakefile | 15 - xc/lib/GL/mesa/src/drv/common/Imakefile | 42 - xc/lib/GL/mesa/src/drv/common/Imakefile.inc | 72 - xc/lib/GL/mesa/src/drv/common/depthtmp.h | 176 - xc/lib/GL/mesa/src/drv/common/hwlog.c | 134 - xc/lib/GL/mesa/src/drv/common/hwlog.h | 101 - xc/lib/GL/mesa/src/drv/common/mm.c | 196 - xc/lib/GL/mesa/src/drv/common/mm.h | 82 - xc/lib/GL/mesa/src/drv/common/mmx.h | 560 -- xc/lib/GL/mesa/src/drv/common/spantmp.h | 259 - xc/lib/GL/mesa/src/drv/common/stenciltmp.h | 147 - xc/lib/GL/mesa/src/drv/common/texmem.c | 1235 ---- xc/lib/GL/mesa/src/drv/common/texmem.h | 295 - xc/lib/GL/mesa/src/drv/common/utils.c | 183 - xc/lib/GL/mesa/src/drv/common/utils.h | 54 - xc/lib/GL/mesa/src/drv/common/vblank.c | 350 -- xc/lib/GL/mesa/src/drv/common/vblank.h | 64 - xc/lib/GL/mesa/src/drv/common/xmlconfig.c | 858 --- xc/lib/GL/mesa/src/drv/common/xmlconfig.h | 125 - xc/lib/GL/mesa/src/drv/common/xmlpool.h | 258 - xc/lib/GL/mesa/src/drv/ffb/Imakefile | 83 - xc/lib/GL/mesa/src/drv/ffb/Imakefile.inc | 127 - xc/lib/GL/mesa/src/drv/ffb/ffb_bitmap.c | 156 - xc/lib/GL/mesa/src/drv/ffb/ffb_bitmap.h | 8 - xc/lib/GL/mesa/src/drv/ffb/ffb_clear.c | 354 -- xc/lib/GL/mesa/src/drv/ffb/ffb_clear.h | 9 - xc/lib/GL/mesa/src/drv/ffb/ffb_context.h | 309 - xc/lib/GL/mesa/src/drv/ffb/ffb_dd.c | 116 - xc/lib/GL/mesa/src/drv/ffb/ffb_dd.h | 36 - xc/lib/GL/mesa/src/drv/ffb/ffb_depth.c | 214 - xc/lib/GL/mesa/src/drv/ffb/ffb_depth.h | 8 - xc/lib/GL/mesa/src/drv/ffb/ffb_fifo.h | 28 - xc/lib/GL/mesa/src/drv/ffb/ffb_fog.c | 73 - xc/lib/GL/mesa/src/drv/ffb/ffb_lines.c | 112 - xc/lib/GL/mesa/src/drv/ffb/ffb_lines.h | 18 - xc/lib/GL/mesa/src/drv/ffb/ffb_linetmp.h | 81 - xc/lib/GL/mesa/src/drv/ffb/ffb_lock.h | 33 - xc/lib/GL/mesa/src/drv/ffb/ffb_points.c | 94 - xc/lib/GL/mesa/src/drv/ffb/ffb_points.h | 15 - xc/lib/GL/mesa/src/drv/ffb/ffb_pointtmp.h | 55 - xc/lib/GL/mesa/src/drv/ffb/ffb_rendertmp.h | 648 -- xc/lib/GL/mesa/src/drv/ffb/ffb_span.c | 142 - xc/lib/GL/mesa/src/drv/ffb/ffb_span.h | 8 - xc/lib/GL/mesa/src/drv/ffb/ffb_state.c | 1247 ---- xc/lib/GL/mesa/src/drv/ffb/ffb_state.h | 13 - xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.c | 221 - xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.h | 8 - xc/lib/GL/mesa/src/drv/ffb/ffb_tex.c | 51 - xc/lib/GL/mesa/src/drv/ffb/ffb_tex.h | 34 - xc/lib/GL/mesa/src/drv/ffb/ffb_tris.c | 946 --- xc/lib/GL/mesa/src/drv/ffb/ffb_tris.h | 29 - xc/lib/GL/mesa/src/drv/ffb/ffb_tritmp.h | 239 - xc/lib/GL/mesa/src/drv/ffb/ffb_vb.c | 241 - xc/lib/GL/mesa/src/drv/ffb/ffb_vb.h | 45 - xc/lib/GL/mesa/src/drv/ffb/ffb_vbtmp.h | 177 - xc/lib/GL/mesa/src/drv/ffb/ffb_vtxfmt.c | 429 -- xc/lib/GL/mesa/src/drv/ffb/ffb_vtxfmt.h | 8 - xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.c | 593 -- xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.h | 30 - xc/lib/GL/mesa/src/drv/gamma/Imakefile | 83 - xc/lib/GL/mesa/src/drv/gamma/Imakefile.inc | 121 - xc/lib/GL/mesa/src/drv/gamma/gamma_client.h | 6185 -------------------- xc/lib/GL/mesa/src/drv/gamma/gamma_context.c | 209 - xc/lib/GL/mesa/src/drv/gamma/gamma_context.h | 405 -- xc/lib/GL/mesa/src/drv/gamma/gamma_dd.c | 128 - xc/lib/GL/mesa/src/drv/gamma/gamma_inithw.c | 551 -- xc/lib/GL/mesa/src/drv/gamma/gamma_lock.c | 59 - xc/lib/GL/mesa/src/drv/gamma/gamma_lock.h | 88 - xc/lib/GL/mesa/src/drv/gamma/gamma_macros.h | 328 -- xc/lib/GL/mesa/src/drv/gamma/gamma_regs.h | 659 --- xc/lib/GL/mesa/src/drv/gamma/gamma_render.c | 316 - xc/lib/GL/mesa/src/drv/gamma/gamma_screen.c | 142 - xc/lib/GL/mesa/src/drv/gamma/gamma_screen.h | 30 - xc/lib/GL/mesa/src/drv/gamma/gamma_span.c | 342 -- xc/lib/GL/mesa/src/drv/gamma/gamma_state.c | 1734 ------ xc/lib/GL/mesa/src/drv/gamma/gamma_tex.c | 427 -- xc/lib/GL/mesa/src/drv/gamma/gamma_texmem.c | 535 -- xc/lib/GL/mesa/src/drv/gamma/gamma_texstate.c | 216 - xc/lib/GL/mesa/src/drv/gamma/gamma_tris.c | 653 --- xc/lib/GL/mesa/src/drv/gamma/gamma_tris.h | 36 - xc/lib/GL/mesa/src/drv/gamma/gamma_tritmp.h | 495 -- xc/lib/GL/mesa/src/drv/gamma/gamma_vb.c | 380 -- xc/lib/GL/mesa/src/drv/gamma/gamma_vb.h | 60 - xc/lib/GL/mesa/src/drv/gamma/gamma_xmesa.c | 286 - xc/lib/GL/mesa/src/drv/i810/Imakefile | 83 - xc/lib/GL/mesa/src/drv/i810/Imakefile.inc | 110 - xc/lib/GL/mesa/src/drv/i810/i810_3d_reg.h | 636 -- xc/lib/GL/mesa/src/drv/i810/i810context.c | 532 -- xc/lib/GL/mesa/src/drv/i810/i810context.h | 256 - xc/lib/GL/mesa/src/drv/i810/i810ioctl.c | 510 -- xc/lib/GL/mesa/src/drv/i810/i810ioctl.h | 49 - xc/lib/GL/mesa/src/drv/i810/i810render.c | 214 - xc/lib/GL/mesa/src/drv/i810/i810screen.c | 278 - xc/lib/GL/mesa/src/drv/i810/i810screen.h | 99 - xc/lib/GL/mesa/src/drv/i810/i810span.c | 170 - xc/lib/GL/mesa/src/drv/i810/i810span.h | 6 - xc/lib/GL/mesa/src/drv/i810/i810state.c | 1019 ---- xc/lib/GL/mesa/src/drv/i810/i810state.h | 15 - xc/lib/GL/mesa/src/drv/i810/i810tex.c | 543 -- xc/lib/GL/mesa/src/drv/i810/i810tex.h | 78 - xc/lib/GL/mesa/src/drv/i810/i810texmem.c | 178 - xc/lib/GL/mesa/src/drv/i810/i810texstate.c | 746 --- xc/lib/GL/mesa/src/drv/i810/i810tris.c | 867 --- xc/lib/GL/mesa/src/drv/i810/i810tris.h | 36 - xc/lib/GL/mesa/src/drv/i810/i810vb.c | 505 -- xc/lib/GL/mesa/src/drv/i810/i810vb.h | 62 - xc/lib/GL/mesa/src/drv/i830/Imakefile | 80 - xc/lib/GL/mesa/src/drv/i830/Imakefile.inc | 115 - xc/lib/GL/mesa/src/drv/i830/i830_3d_reg.h | 675 --- xc/lib/GL/mesa/src/drv/i830/i830_context.c | 588 -- xc/lib/GL/mesa/src/drv/i830/i830_context.h | 310 - xc/lib/GL/mesa/src/drv/i830/i830_debug.c | 377 -- xc/lib/GL/mesa/src/drv/i830/i830_debug.h | 48 - xc/lib/GL/mesa/src/drv/i830/i830_ioctl.c | 841 --- xc/lib/GL/mesa/src/drv/i830/i830_ioctl.h | 105 - xc/lib/GL/mesa/src/drv/i830/i830_render.c | 267 - xc/lib/GL/mesa/src/drv/i830/i830_screen.c | 361 -- xc/lib/GL/mesa/src/drv/i830/i830_screen.h | 107 - xc/lib/GL/mesa/src/drv/i830/i830_span.c | 370 -- xc/lib/GL/mesa/src/drv/i830/i830_span.h | 46 - xc/lib/GL/mesa/src/drv/i830/i830_state.c | 1799 ------ xc/lib/GL/mesa/src/drv/i830/i830_state.h | 68 - xc/lib/GL/mesa/src/drv/i830/i830_tex.c | 578 -- xc/lib/GL/mesa/src/drv/i830/i830_tex.h | 71 - xc/lib/GL/mesa/src/drv/i830/i830_texmem.c | 214 - xc/lib/GL/mesa/src/drv/i830/i830_texstate.c | 1582 ----- xc/lib/GL/mesa/src/drv/i830/i830_tris.c | 880 --- xc/lib/GL/mesa/src/drv/i830/i830_tris.h | 37 - xc/lib/GL/mesa/src/drv/i830/i830_vb.c | 592 -- xc/lib/GL/mesa/src/drv/i830/i830_vb.h | 63 - xc/lib/GL/mesa/src/drv/mga/Imakefile | 84 - xc/lib/GL/mesa/src/drv/mga/Imakefile.inc | 122 - xc/lib/GL/mesa/src/drv/mga/mga_texcombine.c | 672 --- xc/lib/GL/mesa/src/drv/mga/mga_texstate.c | 901 --- xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c | 791 --- xc/lib/GL/mesa/src/drv/mga/mga_xmesa.h | 152 - xc/lib/GL/mesa/src/drv/mga/mgacontext.h | 375 -- xc/lib/GL/mesa/src/drv/mga/mgadd.c | 97 - xc/lib/GL/mesa/src/drv/mga/mgadd.h | 36 - xc/lib/GL/mesa/src/drv/mga/mgaioctl.c | 677 --- xc/lib/GL/mesa/src/drv/mga/mgaioctl.h | 114 - xc/lib/GL/mesa/src/drv/mga/mgapixel.c | 656 --- xc/lib/GL/mesa/src/drv/mga/mgapixel.h | 36 - xc/lib/GL/mesa/src/drv/mga/mgaregs.h | 1395 ----- xc/lib/GL/mesa/src/drv/mga/mgarender.c | 207 - xc/lib/GL/mesa/src/drv/mga/mgaspan.c | 313 - xc/lib/GL/mesa/src/drv/mga/mgaspan.h | 34 - xc/lib/GL/mesa/src/drv/mga/mgastate.c | 1239 ---- xc/lib/GL/mesa/src/drv/mga/mgastate.h | 39 - xc/lib/GL/mesa/src/drv/mga/mgatex.c | 549 -- xc/lib/GL/mesa/src/drv/mga/mgatex.h | 51 - xc/lib/GL/mesa/src/drv/mga/mgatexmem.c | 278 - xc/lib/GL/mesa/src/drv/mga/mgatris.c | 906 --- xc/lib/GL/mesa/src/drv/mga/mgatris.h | 52 - xc/lib/GL/mesa/src/drv/mga/mgavb.c | 497 -- xc/lib/GL/mesa/src/drv/mga/mgavb.h | 65 - xc/lib/GL/mesa/src/drv/r128/Imakefile | 83 - xc/lib/GL/mesa/src/drv/r128/Imakefile.inc | 115 - xc/lib/GL/mesa/src/drv/r128/r128_context.c | 370 -- xc/lib/GL/mesa/src/drv/r128/r128_context.h | 272 - xc/lib/GL/mesa/src/drv/r128/r128_dd.c | 148 - xc/lib/GL/mesa/src/drv/r128/r128_dd.h | 44 - xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c | 810 --- xc/lib/GL/mesa/src/drv/r128/r128_ioctl.h | 146 - xc/lib/GL/mesa/src/drv/r128/r128_lock.c | 123 - xc/lib/GL/mesa/src/drv/r128/r128_lock.h | 111 - xc/lib/GL/mesa/src/drv/r128/r128_screen.c | 368 -- xc/lib/GL/mesa/src/drv/r128/r128_screen.h | 88 - xc/lib/GL/mesa/src/drv/r128/r128_span.c | 475 -- xc/lib/GL/mesa/src/drv/r128/r128_span.h | 44 - xc/lib/GL/mesa/src/drv/r128/r128_state.c | 1239 ---- xc/lib/GL/mesa/src/drv/r128/r128_state.h | 54 - xc/lib/GL/mesa/src/drv/r128/r128_tex.c | 612 -- xc/lib/GL/mesa/src/drv/r128/r128_tex.h | 88 - xc/lib/GL/mesa/src/drv/r128/r128_texmem.c | 302 - xc/lib/GL/mesa/src/drv/r128/r128_texobj.h | 69 - xc/lib/GL/mesa/src/drv/r128/r128_texstate.c | 646 -- xc/lib/GL/mesa/src/drv/r128/r128_tris.c | 721 --- xc/lib/GL/mesa/src/drv/r128/r128_tris.h | 48 - xc/lib/GL/mesa/src/drv/r128/r128_vb.c | 525 -- xc/lib/GL/mesa/src/drv/r128/r128_vb.h | 74 - xc/lib/GL/mesa/src/drv/r200/Imakefile | 82 - xc/lib/GL/mesa/src/drv/r200/Imakefile.inc | 182 - xc/lib/GL/mesa/src/drv/r200/r200_cmdbuf.c | 337 -- xc/lib/GL/mesa/src/drv/r200/r200_context.c | 634 -- xc/lib/GL/mesa/src/drv/r200/r200_context.h | 931 --- xc/lib/GL/mesa/src/drv/r200/r200_ioctl.c | 923 --- xc/lib/GL/mesa/src/drv/r200/r200_ioctl.h | 191 - xc/lib/GL/mesa/src/drv/r200/r200_lock.c | 118 - xc/lib/GL/mesa/src/drv/r200/r200_lock.h | 112 - xc/lib/GL/mesa/src/drv/r200/r200_maos.c | 12 - xc/lib/GL/mesa/src/drv/r200/r200_maos.h | 47 - xc/lib/GL/mesa/src/drv/r200/r200_maos_arrays.c | 503 -- xc/lib/GL/mesa/src/drv/r200/r200_maos_vbtmp.h | 378 -- xc/lib/GL/mesa/src/drv/r200/r200_maos_verts.c | 339 -- xc/lib/GL/mesa/src/drv/r200/r200_pixel.c | 492 -- xc/lib/GL/mesa/src/drv/r200/r200_pixel.h | 43 - xc/lib/GL/mesa/src/drv/r200/r200_reg.h | 1438 ----- xc/lib/GL/mesa/src/drv/r200/r200_sanity.c | 1324 ----- xc/lib/GL/mesa/src/drv/r200/r200_sanity.h | 8 - xc/lib/GL/mesa/src/drv/r200/r200_screen.c | 468 -- xc/lib/GL/mesa/src/drv/r200/r200_screen.h | 103 - xc/lib/GL/mesa/src/drv/r200/r200_span.c | 432 -- xc/lib/GL/mesa/src/drv/r200/r200_span.h | 44 - xc/lib/GL/mesa/src/drv/r200/r200_state.c | 2202 ------- xc/lib/GL/mesa/src/drv/r200/r200_state.h | 69 - xc/lib/GL/mesa/src/drv/r200/r200_state_init.c | 706 --- xc/lib/GL/mesa/src/drv/r200/r200_swtcl.c | 1290 ---- xc/lib/GL/mesa/src/drv/r200/r200_swtcl.h | 80 - xc/lib/GL/mesa/src/drv/r200/r200_tcl.c | 542 -- xc/lib/GL/mesa/src/drv/r200/r200_tcl.h | 67 - xc/lib/GL/mesa/src/drv/r200/r200_tex.c | 1018 ---- xc/lib/GL/mesa/src/drv/r200/r200_tex.h | 50 - xc/lib/GL/mesa/src/drv/r200/r200_texmem.c | 504 -- xc/lib/GL/mesa/src/drv/r200/r200_texstate.c | 1780 ------ xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt.c | 1124 ---- xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt.h | 126 - xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt_c.c | 900 --- xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt_sse.c | 230 - xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt_x86.c | 437 -- xc/lib/GL/mesa/src/drv/r200/r200_vtxtmp_x86.S | 492 -- xc/lib/GL/mesa/src/drv/radeon/Imakefile | 82 - xc/lib/GL/mesa/src/drv/radeon/Imakefile.inc | 170 - xc/lib/GL/mesa/src/drv/radeon/radeon_context.c | 622 -- xc/lib/GL/mesa/src/drv/radeon/radeon_context.h | 845 --- xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.c | 1179 ---- xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.h | 188 - xc/lib/GL/mesa/src/drv/radeon/radeon_lock.c | 127 - xc/lib/GL/mesa/src/drv/radeon/radeon_lock.h | 113 - xc/lib/GL/mesa/src/drv/radeon/radeon_maos.c | 12 - xc/lib/GL/mesa/src/drv/radeon/radeon_maos.h | 47 - xc/lib/GL/mesa/src/drv/radeon/radeon_maos_arrays.c | 591 -- xc/lib/GL/mesa/src/drv/radeon/radeon_maos_vbtmp.h | 368 -- xc/lib/GL/mesa/src/drv/radeon/radeon_maos_verts.c | 335 -- xc/lib/GL/mesa/src/drv/radeon/radeon_sanity.c | 1042 ---- xc/lib/GL/mesa/src/drv/radeon/radeon_sanity.h | 8 - xc/lib/GL/mesa/src/drv/radeon/radeon_screen.c | 442 -- xc/lib/GL/mesa/src/drv/radeon/radeon_screen.h | 107 - xc/lib/GL/mesa/src/drv/radeon/radeon_span.c | 415 -- xc/lib/GL/mesa/src/drv/radeon/radeon_span.h | 45 - xc/lib/GL/mesa/src/drv/radeon/radeon_state.c | 2187 ------- xc/lib/GL/mesa/src/drv/radeon/radeon_state.h | 77 - xc/lib/GL/mesa/src/drv/radeon/radeon_state_init.c | 552 -- xc/lib/GL/mesa/src/drv/radeon/radeon_swtcl.c | 1254 ---- xc/lib/GL/mesa/src/drv/radeon/radeon_swtcl.h | 77 - xc/lib/GL/mesa/src/drv/radeon/radeon_tcl.c | 527 -- xc/lib/GL/mesa/src/drv/radeon/radeon_tcl.h | 70 - xc/lib/GL/mesa/src/drv/radeon/radeon_tex.c | 748 --- xc/lib/GL/mesa/src/drv/radeon/radeon_tex.h | 53 - xc/lib/GL/mesa/src/drv/radeon/radeon_texmem.c | 377 -- xc/lib/GL/mesa/src/drv/radeon/radeon_texstate.c | 1605 ----- xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c | 1089 ---- xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.h | 124 - xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt_c.c | 905 --- xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt_sse.c | 232 - xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt_x86.c | 437 -- xc/lib/GL/mesa/src/drv/radeon/radeon_vtxtmp_x86.S | 492 -- xc/lib/GL/mesa/src/drv/sis/Imakefile | 86 - xc/lib/GL/mesa/src/drv/sis/Imakefile.inc | 144 - xc/lib/GL/mesa/src/drv/sis/sis_alloc.c | 249 - xc/lib/GL/mesa/src/drv/sis/sis_alloc.h | 44 - xc/lib/GL/mesa/src/drv/sis/sis_clear.c | 448 -- xc/lib/GL/mesa/src/drv/sis/sis_common2.h | 142 - xc/lib/GL/mesa/src/drv/sis/sis_context.c | 524 -- xc/lib/GL/mesa/src/drv/sis/sis_context.h | 439 -- xc/lib/GL/mesa/src/drv/sis/sis_dd.c | 176 - xc/lib/GL/mesa/src/drv/sis/sis_dd.h | 42 - xc/lib/GL/mesa/src/drv/sis/sis_debug.c | 156 - xc/lib/GL/mesa/src/drv/sis/sis_debug.h | 45 - xc/lib/GL/mesa/src/drv/sis/sis_fog.c | 190 - xc/lib/GL/mesa/src/drv/sis/sis_lock.c | 76 - xc/lib/GL/mesa/src/drv/sis/sis_lock.h | 87 - xc/lib/GL/mesa/src/drv/sis/sis_reg.h | 858 --- xc/lib/GL/mesa/src/drv/sis/sis_screen.c | 277 - xc/lib/GL/mesa/src/drv/sis/sis_screen.h | 62 - xc/lib/GL/mesa/src/drv/sis/sis_span.c | 311 - xc/lib/GL/mesa/src/drv/sis/sis_span.h | 40 - xc/lib/GL/mesa/src/drv/sis/sis_state.c | 884 --- xc/lib/GL/mesa/src/drv/sis/sis_state.h | 57 - xc/lib/GL/mesa/src/drv/sis/sis_stencil.c | 185 - xc/lib/GL/mesa/src/drv/sis/sis_stencil.h | 40 - xc/lib/GL/mesa/src/drv/sis/sis_tex.c | 472 -- xc/lib/GL/mesa/src/drv/sis/sis_tex.h | 41 - xc/lib/GL/mesa/src/drv/sis/sis_texstate.c | 672 --- xc/lib/GL/mesa/src/drv/sis/sis_tris.c | 954 --- xc/lib/GL/mesa/src/drv/sis/sis_tris.h | 44 - xc/lib/GL/mesa/src/drv/sis/sis_tritmp.h | 150 - xc/lib/GL/mesa/src/drv/sis/sis_vb.c | 463 -- xc/lib/GL/mesa/src/drv/sis/sis_vb.h | 62 - xc/lib/GL/mesa/src/drv/tdfx/BUGS | 64 - xc/lib/GL/mesa/src/drv/tdfx/Imakefile | 80 - xc/lib/GL/mesa/src/drv/tdfx/Imakefile.inc | 121 - .../GL/mesa/src/drv/tdfx/X86/fx_3dnow_fastpath.S | 84 - xc/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fasttmp.h | 314 - xc/lib/GL/mesa/src/drv/tdfx/dri_glide.h | 63 - xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c | 897 --- xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h | 1027 ---- xc/lib/GL/mesa/src/drv/tdfx/tdfx_dd.c | 330 -- xc/lib/GL/mesa/src/drv/tdfx/tdfx_dd.h | 47 - xc/lib/GL/mesa/src/drv/tdfx/tdfx_glide.h | 606 -- xc/lib/GL/mesa/src/drv/tdfx/tdfx_lock.c | 90 - xc/lib/GL/mesa/src/drv/tdfx/tdfx_lock.h | 149 - xc/lib/GL/mesa/src/drv/tdfx/tdfx_pixels.c | 689 --- xc/lib/GL/mesa/src/drv/tdfx/tdfx_pixels.h | 80 - xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.c | 802 --- xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.h | 54 - xc/lib/GL/mesa/src/drv/tdfx/tdfx_screen.c | 331 -- xc/lib/GL/mesa/src/drv/tdfx/tdfx_screen.h | 73 - xc/lib/GL/mesa/src/drv/tdfx/tdfx_span.c | 1399 ----- xc/lib/GL/mesa/src/drv/tdfx/tdfx_span.h | 48 - xc/lib/GL/mesa/src/drv/tdfx/tdfx_state.c | 1466 ----- xc/lib/GL/mesa/src/drv/tdfx/tdfx_state.h | 64 - xc/lib/GL/mesa/src/drv/tdfx/tdfx_tex.c | 1473 ----- xc/lib/GL/mesa/src/drv/tdfx/tdfx_tex.h | 165 - xc/lib/GL/mesa/src/drv/tdfx/tdfx_texman.c | 970 --- xc/lib/GL/mesa/src/drv/tdfx/tdfx_texman.h | 84 - xc/lib/GL/mesa/src/drv/tdfx/tdfx_texstate.c | 2107 ------- xc/lib/GL/mesa/src/drv/tdfx/tdfx_texstate.h | 44 - xc/lib/GL/mesa/src/drv/tdfx/tdfx_tris.c | 1258 ---- xc/lib/GL/mesa/src/drv/tdfx/tdfx_tris.h | 42 - xc/lib/GL/mesa/src/drv/tdfx/tdfx_vb.c | 365 -- xc/lib/GL/mesa/src/drv/tdfx/tdfx_vb.h | 68 - xc/lib/GL/mesa/src/drv/tdfx/tdfx_vbtmp.h | 442 -- xc/lib/GL/mesa/src/math/Imakefile | 91 - xc/lib/GL/mesa/src/math/Imakefile.inc | 68 - xc/lib/GL/mesa/src/swrast/Imakefile | 93 - xc/lib/GL/mesa/src/swrast/Imakefile.inc | 188 - xc/lib/GL/mesa/src/swrast_setup/Imakefile | 92 - xc/lib/GL/mesa/src/swrast_setup/Imakefile.inc | 38 - xc/lib/GL/mesa/src/tnl/Imakefile | 94 - xc/lib/GL/mesa/src/tnl/Imakefile.inc | 152 - xc/lib/GL/mesa/src/tnl_dd/Imakefile | 89 - xc/lib/GL/mesa/src/tnl_dd/Imakefile.inc | 38 - xc/lib/GL/mesa/swrast/Imakefile | 95 + xc/lib/GL/mesa/swrast/Imakefile.inc | 218 + xc/lib/GL/mesa/swrast_setup/Imakefile | 94 + xc/lib/GL/mesa/swrast_setup/Imakefile.inc | 44 + xc/lib/GL/mesa/tnl/Imakefile | 96 + xc/lib/GL/mesa/tnl/Imakefile.inc | 143 + xc/lib/GL/mesa/tnl_dd/Imakefile | 59 + xc/lib/GL/mesa/tnl_dd/Imakefile.inc | 40 + xc/lib/GL/mesa/x86/Imakefile | 101 + xc/lib/GL/mesa/x86/Imakefile.inc | 203 + xc/programs/Xserver/GL/dri/Imakefile | 6 +- xc/programs/Xserver/GL/glx/Imakefile | 2 +- xc/programs/Xserver/GL/mesa/GLcore/Imakefile | 41 +- .../Xserver/GL/mesa/GLcore/module/Imakefile | 42 +- xc/programs/Xserver/GL/mesa/Imakefile | 43 +- xc/programs/Xserver/GL/mesa/X/Imakefile | 78 + xc/programs/Xserver/GL/mesa/X/module/Imakefile | 6 + xc/programs/Xserver/GL/mesa/X/xf86glx.c | 903 +++ xc/programs/Xserver/GL/mesa/X/xf86glx_util.c | 147 + xc/programs/Xserver/GL/mesa/X/xf86glx_util.h | 102 + xc/programs/Xserver/GL/mesa/X/xf86glxint.h | 120 + xc/programs/Xserver/GL/mesa/array_cache/Imakefile | 56 + .../Xserver/GL/mesa/array_cache/module/Imakefile | 6 + xc/programs/Xserver/GL/mesa/main/Imakefile | 54 + xc/programs/Xserver/GL/mesa/main/module/Imakefile | 6 + xc/programs/Xserver/GL/mesa/math/Imakefile | 55 + xc/programs/Xserver/GL/mesa/math/module/Imakefile | 6 + xc/programs/Xserver/GL/mesa/src/Imakefile | 52 - xc/programs/Xserver/GL/mesa/src/X/Imakefile | 75 - xc/programs/Xserver/GL/mesa/src/X/module/Imakefile | 6 - xc/programs/Xserver/GL/mesa/src/X/xf86glx.c | 903 --- xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.c | 147 - xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.h | 102 - xc/programs/Xserver/GL/mesa/src/X/xf86glxint.h | 120 - .../Xserver/GL/mesa/src/array_cache/Imakefile | 54 - .../GL/mesa/src/array_cache/module/Imakefile | 6 - xc/programs/Xserver/GL/mesa/src/math/Imakefile | 53 - .../Xserver/GL/mesa/src/math/module/Imakefile | 6 - xc/programs/Xserver/GL/mesa/src/module/Imakefile | 6 - xc/programs/Xserver/GL/mesa/src/swrast/Imakefile | 55 - .../Xserver/GL/mesa/src/swrast/module/Imakefile | 6 - .../Xserver/GL/mesa/src/swrast_setup/Imakefile | 53 - .../GL/mesa/src/swrast_setup/module/Imakefile | 6 - xc/programs/Xserver/GL/mesa/src/tnl/Imakefile | 56 - .../Xserver/GL/mesa/src/tnl/module/Imakefile | 6 - xc/programs/Xserver/GL/mesa/swrast/Imakefile | 57 + .../Xserver/GL/mesa/swrast/module/Imakefile | 6 + xc/programs/Xserver/GL/mesa/swrast_setup/Imakefile | 55 + .../Xserver/GL/mesa/swrast_setup/module/Imakefile | 6 + xc/programs/Xserver/GL/mesa/tnl/Imakefile | 58 + xc/programs/Xserver/GL/mesa/tnl/module/Imakefile | 6 + .../Xserver/hw/xfree86/drivers/i810/Imakefile | 2 +- .../Xserver/hw/xfree86/os-support/xf86_libc.h | 1 + 446 files changed, 6782 insertions(+), 129041 deletions(-) delete mode 100644 xc/lib/GL/include/GL/internal/glcore.h create mode 100644 xc/lib/GL/mesa/Imakefile create mode 100644 xc/lib/GL/mesa/Imakefile.inc create mode 100644 xc/lib/GL/mesa/array_cache/Imakefile create mode 100644 xc/lib/GL/mesa/array_cache/Imakefile.inc create mode 100644 xc/lib/GL/mesa/drivers/dri/Imakefile create mode 100644 xc/lib/GL/mesa/drivers/dri/common/Imakefile create mode 100644 xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc create mode 100644 xc/lib/GL/mesa/drivers/dri/ffb/Imakefile create mode 100644 xc/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc create mode 100644 xc/lib/GL/mesa/drivers/dri/gamma/Imakefile create mode 100644 xc/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc create mode 100644 xc/lib/GL/mesa/drivers/dri/i810/Imakefile create mode 100644 xc/lib/GL/mesa/drivers/dri/i810/Imakefile.inc create mode 100644 xc/lib/GL/mesa/drivers/dri/i830/Imakefile create mode 100644 xc/lib/GL/mesa/drivers/dri/i830/Imakefile.inc create mode 100644 xc/lib/GL/mesa/drivers/dri/mga/Imakefile create mode 100644 xc/lib/GL/mesa/drivers/dri/mga/Imakefile.inc create mode 100644 xc/lib/GL/mesa/drivers/dri/r128/Imakefile create mode 100644 xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc create mode 100644 xc/lib/GL/mesa/drivers/dri/r200/Imakefile create mode 100644 xc/lib/GL/mesa/drivers/dri/r200/Imakefile.inc create mode 100644 xc/lib/GL/mesa/drivers/dri/radeon/Imakefile create mode 100644 xc/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc create mode 100644 xc/lib/GL/mesa/drivers/dri/sis/Imakefile create mode 100644 xc/lib/GL/mesa/drivers/dri/sis/Imakefile.inc create mode 100644 xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile create mode 100644 xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc create mode 100644 xc/lib/GL/mesa/drivers/osmesa/Imakefile create mode 100644 xc/lib/GL/mesa/drivers/x11/Imakefile create mode 100644 xc/lib/GL/mesa/drivers/x11/Imakefile.inc create mode 100644 xc/lib/GL/mesa/main/Imakefile create mode 100644 xc/lib/GL/mesa/main/Imakefile.inc create mode 100644 xc/lib/GL/mesa/math/Imakefile create mode 100644 xc/lib/GL/mesa/math/Imakefile.inc create mode 100644 xc/lib/GL/mesa/sparc/Imakefile create mode 100644 xc/lib/GL/mesa/sparc/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/Imakefile delete mode 100644 xc/lib/GL/mesa/src/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/OSmesa/Imakefile delete mode 100644 xc/lib/GL/mesa/src/OSmesa/OSMesa-def.cpp delete mode 100644 xc/lib/GL/mesa/src/SPARC/Imakefile delete mode 100644 xc/lib/GL/mesa/src/SPARC/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/X/Imakefile delete mode 100644 xc/lib/GL/mesa/src/X/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/X86/Imakefile delete mode 100644 xc/lib/GL/mesa/src/X86/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/array_cache/Imakefile delete mode 100644 xc/lib/GL/mesa/src/array_cache/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/drv/Imakefile delete mode 100644 xc/lib/GL/mesa/src/drv/common/Imakefile delete mode 100644 xc/lib/GL/mesa/src/drv/common/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/drv/common/depthtmp.h delete mode 100644 xc/lib/GL/mesa/src/drv/common/hwlog.c delete mode 100644 xc/lib/GL/mesa/src/drv/common/hwlog.h delete mode 100644 xc/lib/GL/mesa/src/drv/common/mm.c delete mode 100644 xc/lib/GL/mesa/src/drv/common/mm.h delete mode 100644 xc/lib/GL/mesa/src/drv/common/mmx.h delete mode 100644 xc/lib/GL/mesa/src/drv/common/spantmp.h delete mode 100644 xc/lib/GL/mesa/src/drv/common/stenciltmp.h delete mode 100644 xc/lib/GL/mesa/src/drv/common/texmem.c delete mode 100644 xc/lib/GL/mesa/src/drv/common/texmem.h delete mode 100644 xc/lib/GL/mesa/src/drv/common/utils.c delete mode 100644 xc/lib/GL/mesa/src/drv/common/utils.h delete mode 100644 xc/lib/GL/mesa/src/drv/common/vblank.c delete mode 100644 xc/lib/GL/mesa/src/drv/common/vblank.h delete mode 100644 xc/lib/GL/mesa/src/drv/common/xmlconfig.c delete mode 100644 xc/lib/GL/mesa/src/drv/common/xmlconfig.h delete mode 100644 xc/lib/GL/mesa/src/drv/common/xmlpool.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/Imakefile delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_bitmap.c delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_bitmap.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_clear.c delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_clear.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_context.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_dd.c delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_dd.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_depth.c delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_depth.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_fifo.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_fog.c delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_lines.c delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_lines.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_linetmp.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_lock.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_points.c delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_points.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_pointtmp.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_rendertmp.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_span.c delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_span.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_state.c delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_state.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.c delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_tex.c delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_tex.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_tris.c delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_tris.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_tritmp.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_vb.c delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_vb.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_vbtmp.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_vtxfmt.c delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_vtxfmt.h delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.c delete mode 100644 xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.h delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/Imakefile delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_client.h delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_context.c delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_context.h delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_dd.c delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_inithw.c delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_lock.c delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_lock.h delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_macros.h delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_regs.h delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_render.c delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_screen.c delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_screen.h delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_span.c delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_state.c delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_tex.c delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_texmem.c delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_texstate.c delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_tris.c delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_tris.h delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_tritmp.h delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_vb.c delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_vb.h delete mode 100644 xc/lib/GL/mesa/src/drv/gamma/gamma_xmesa.c delete mode 100644 xc/lib/GL/mesa/src/drv/i810/Imakefile delete mode 100644 xc/lib/GL/mesa/src/drv/i810/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/drv/i810/i810_3d_reg.h delete mode 100644 xc/lib/GL/mesa/src/drv/i810/i810context.c delete mode 100644 xc/lib/GL/mesa/src/drv/i810/i810context.h delete mode 100644 xc/lib/GL/mesa/src/drv/i810/i810ioctl.c delete mode 100644 xc/lib/GL/mesa/src/drv/i810/i810ioctl.h delete mode 100644 xc/lib/GL/mesa/src/drv/i810/i810render.c delete mode 100644 xc/lib/GL/mesa/src/drv/i810/i810screen.c delete mode 100644 xc/lib/GL/mesa/src/drv/i810/i810screen.h delete mode 100644 xc/lib/GL/mesa/src/drv/i810/i810span.c delete mode 100644 xc/lib/GL/mesa/src/drv/i810/i810span.h delete mode 100644 xc/lib/GL/mesa/src/drv/i810/i810state.c delete mode 100644 xc/lib/GL/mesa/src/drv/i810/i810state.h delete mode 100644 xc/lib/GL/mesa/src/drv/i810/i810tex.c delete mode 100644 xc/lib/GL/mesa/src/drv/i810/i810tex.h delete mode 100644 xc/lib/GL/mesa/src/drv/i810/i810texmem.c delete mode 100644 xc/lib/GL/mesa/src/drv/i810/i810texstate.c delete mode 100644 xc/lib/GL/mesa/src/drv/i810/i810tris.c delete mode 100644 xc/lib/GL/mesa/src/drv/i810/i810tris.h delete mode 100644 xc/lib/GL/mesa/src/drv/i810/i810vb.c delete mode 100644 xc/lib/GL/mesa/src/drv/i810/i810vb.h delete mode 100644 xc/lib/GL/mesa/src/drv/i830/Imakefile delete mode 100644 xc/lib/GL/mesa/src/drv/i830/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_3d_reg.h delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_context.c delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_context.h delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_debug.c delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_debug.h delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_ioctl.c delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_ioctl.h delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_render.c delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_screen.c delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_screen.h delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_span.c delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_span.h delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_state.c delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_state.h delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_tex.c delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_tex.h delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_texmem.c delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_texstate.c delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_tris.c delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_tris.h delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_vb.c delete mode 100644 xc/lib/GL/mesa/src/drv/i830/i830_vb.h delete mode 100644 xc/lib/GL/mesa/src/drv/mga/Imakefile delete mode 100644 xc/lib/GL/mesa/src/drv/mga/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mga_texcombine.c delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mga_texstate.c delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mga_xmesa.h delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mgacontext.h delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mgadd.c delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mgadd.h delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mgaioctl.c delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mgaioctl.h delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mgapixel.c delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mgapixel.h delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mgaregs.h delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mgarender.c delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mgaspan.c delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mgaspan.h delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mgastate.c delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mgastate.h delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mgatex.c delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mgatex.h delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mgatexmem.c delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mgatris.c delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mgatris.h delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mgavb.c delete mode 100644 xc/lib/GL/mesa/src/drv/mga/mgavb.h delete mode 100644 xc/lib/GL/mesa/src/drv/r128/Imakefile delete mode 100644 xc/lib/GL/mesa/src/drv/r128/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_context.c delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_context.h delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_dd.c delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_dd.h delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_ioctl.h delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_lock.c delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_lock.h delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_screen.c delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_screen.h delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_span.c delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_span.h delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_state.c delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_state.h delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_tex.c delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_tex.h delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_texmem.c delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_texobj.h delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_texstate.c delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_tris.c delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_tris.h delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_vb.c delete mode 100644 xc/lib/GL/mesa/src/drv/r128/r128_vb.h delete mode 100644 xc/lib/GL/mesa/src/drv/r200/Imakefile delete mode 100644 xc/lib/GL/mesa/src/drv/r200/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_cmdbuf.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_context.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_context.h delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_ioctl.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_ioctl.h delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_lock.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_lock.h delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_maos.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_maos.h delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_maos_arrays.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_maos_vbtmp.h delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_maos_verts.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_pixel.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_pixel.h delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_reg.h delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_sanity.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_sanity.h delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_screen.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_screen.h delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_span.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_span.h delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_state.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_state.h delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_state_init.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_swtcl.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_swtcl.h delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_tcl.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_tcl.h delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_tex.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_tex.h delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_texmem.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_texstate.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt.h delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt_c.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt_sse.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt_x86.c delete mode 100644 xc/lib/GL/mesa/src/drv/r200/r200_vtxtmp_x86.S delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/Imakefile delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_context.c delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_context.h delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.c delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.h delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_lock.c delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_lock.h delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_maos.c delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_maos.h delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_maos_arrays.c delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_maos_vbtmp.h delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_maos_verts.c delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_sanity.c delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_sanity.h delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_screen.c delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_screen.h delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_span.c delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_span.h delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_state.c delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_state.h delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_state_init.c delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_swtcl.c delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_swtcl.h delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_tcl.c delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_tcl.h delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_tex.c delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_tex.h delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_texmem.c delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_texstate.c delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.h delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt_c.c delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt_sse.c delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt_x86.c delete mode 100644 xc/lib/GL/mesa/src/drv/radeon/radeon_vtxtmp_x86.S delete mode 100644 xc/lib/GL/mesa/src/drv/sis/Imakefile delete mode 100644 xc/lib/GL/mesa/src/drv/sis/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_alloc.c delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_alloc.h delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_clear.c delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_common2.h delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_context.c delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_context.h delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_dd.c delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_dd.h delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_debug.c delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_debug.h delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_fog.c delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_lock.c delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_lock.h delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_reg.h delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_screen.c delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_screen.h delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_span.c delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_span.h delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_state.c delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_state.h delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_stencil.c delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_stencil.h delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_tex.c delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_tex.h delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_texstate.c delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_tris.c delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_tris.h delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_tritmp.h delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_vb.c delete mode 100644 xc/lib/GL/mesa/src/drv/sis/sis_vb.h delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/BUGS delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/Imakefile delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fastpath.S delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fasttmp.h delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/dri_glide.h delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_dd.c delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_dd.h delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_glide.h delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_lock.c delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_lock.h delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_pixels.c delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_pixels.h delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.c delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.h delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_screen.c delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_screen.h delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_span.c delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_span.h delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_state.c delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_state.h delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_tex.c delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_tex.h delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_texman.c delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_texman.h delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_texstate.c delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_texstate.h delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_tris.c delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_tris.h delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_vb.c delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_vb.h delete mode 100644 xc/lib/GL/mesa/src/drv/tdfx/tdfx_vbtmp.h delete mode 100644 xc/lib/GL/mesa/src/math/Imakefile delete mode 100644 xc/lib/GL/mesa/src/math/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/swrast/Imakefile delete mode 100644 xc/lib/GL/mesa/src/swrast/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/swrast_setup/Imakefile delete mode 100644 xc/lib/GL/mesa/src/swrast_setup/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/tnl/Imakefile delete mode 100644 xc/lib/GL/mesa/src/tnl/Imakefile.inc delete mode 100644 xc/lib/GL/mesa/src/tnl_dd/Imakefile delete mode 100644 xc/lib/GL/mesa/src/tnl_dd/Imakefile.inc create mode 100644 xc/lib/GL/mesa/swrast/Imakefile create mode 100644 xc/lib/GL/mesa/swrast/Imakefile.inc create mode 100644 xc/lib/GL/mesa/swrast_setup/Imakefile create mode 100644 xc/lib/GL/mesa/swrast_setup/Imakefile.inc create mode 100644 xc/lib/GL/mesa/tnl/Imakefile create mode 100644 xc/lib/GL/mesa/tnl/Imakefile.inc create mode 100644 xc/lib/GL/mesa/tnl_dd/Imakefile create mode 100644 xc/lib/GL/mesa/tnl_dd/Imakefile.inc create mode 100644 xc/lib/GL/mesa/x86/Imakefile create mode 100644 xc/lib/GL/mesa/x86/Imakefile.inc create mode 100644 xc/programs/Xserver/GL/mesa/X/Imakefile create mode 100644 xc/programs/Xserver/GL/mesa/X/module/Imakefile create mode 100644 xc/programs/Xserver/GL/mesa/X/xf86glx.c create mode 100644 xc/programs/Xserver/GL/mesa/X/xf86glx_util.c create mode 100644 xc/programs/Xserver/GL/mesa/X/xf86glx_util.h create mode 100644 xc/programs/Xserver/GL/mesa/X/xf86glxint.h create mode 100644 xc/programs/Xserver/GL/mesa/array_cache/Imakefile create mode 100644 xc/programs/Xserver/GL/mesa/array_cache/module/Imakefile create mode 100644 xc/programs/Xserver/GL/mesa/main/Imakefile create mode 100644 xc/programs/Xserver/GL/mesa/main/module/Imakefile create mode 100644 xc/programs/Xserver/GL/mesa/math/Imakefile create mode 100644 xc/programs/Xserver/GL/mesa/math/module/Imakefile delete mode 100644 xc/programs/Xserver/GL/mesa/src/Imakefile delete mode 100644 xc/programs/Xserver/GL/mesa/src/X/Imakefile delete mode 100644 xc/programs/Xserver/GL/mesa/src/X/module/Imakefile delete mode 100644 xc/programs/Xserver/GL/mesa/src/X/xf86glx.c delete mode 100644 xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.c delete mode 100644 xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.h delete mode 100644 xc/programs/Xserver/GL/mesa/src/X/xf86glxint.h delete mode 100644 xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile delete mode 100644 xc/programs/Xserver/GL/mesa/src/array_cache/module/Imakefile delete mode 100644 xc/programs/Xserver/GL/mesa/src/math/Imakefile delete mode 100644 xc/programs/Xserver/GL/mesa/src/math/module/Imakefile delete mode 100644 xc/programs/Xserver/GL/mesa/src/module/Imakefile delete mode 100644 xc/programs/Xserver/GL/mesa/src/swrast/Imakefile delete mode 100644 xc/programs/Xserver/GL/mesa/src/swrast/module/Imakefile delete mode 100644 xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile delete mode 100644 xc/programs/Xserver/GL/mesa/src/swrast_setup/module/Imakefile delete mode 100644 xc/programs/Xserver/GL/mesa/src/tnl/Imakefile delete mode 100644 xc/programs/Xserver/GL/mesa/src/tnl/module/Imakefile create mode 100644 xc/programs/Xserver/GL/mesa/swrast/Imakefile create mode 100644 xc/programs/Xserver/GL/mesa/swrast/module/Imakefile create mode 100644 xc/programs/Xserver/GL/mesa/swrast_setup/Imakefile create mode 100644 xc/programs/Xserver/GL/mesa/swrast_setup/module/Imakefile create mode 100644 xc/programs/Xserver/GL/mesa/tnl/Imakefile create mode 100644 xc/programs/Xserver/GL/mesa/tnl/module/Imakefile diff --git a/xc/config/cf/host.def b/xc/config/cf/host.def index eca7234eb..eef062296 100644 --- a/xc/config/cf/host.def +++ b/xc/config/cf/host.def @@ -4,6 +4,9 @@ */ #define XFree86CustomVersion "DRI trunk" +/* You need this now */ +#define MesaSrcDir /X11R6/SourceForge/Mesanew/Mesa-newtree + /* Don't use any special flags by default, but leave this here commented out * so people see how to if they want @@ -32,7 +35,7 @@ #elif defined(i386Architecture) #define XF86CardDrivers tdfx i810 mga ati glint vga sis -#define DriDrivers r200 tdfx mga i810 r128 radeon gamma i830 ffb sis +#define DriDrivers r200 mga i810 r128 radeon gamma i830 sis tdfx ffb #else @@ -91,8 +94,10 @@ #define XnestServer NO #define XVirtualFramebufferServer NO -/* we don't have libexpat sources in DRI CVS, so assume that it's installed */ -#define HasExpat YES +/* we do have libexpat sources in DRI CVS and want to build static to + * link with libGL to isolate link problems with systems that don't have it */ +#define HasExpat NO +#define NormalLibExpat YES /* * Don't change anything below or the build will fail. diff --git a/xc/extras/expat/conftools/ac_c_bigendian_cross.m4 b/xc/extras/expat/conftools/ac_c_bigendian_cross.m4 index f68c1086f..0b913fbbf 100644 --- a/xc/extras/expat/conftools/ac_c_bigendian_cross.m4 +++ b/xc/extras/expat/conftools/ac_c_bigendian_cross.m4 @@ -7,7 +7,7 @@ dnl The implementation will create a binary, and instead of running dnl the binary it will be grep'ed for some symbols that will look dnl different for different endianess of the binary. dnl -dnl @version $Id: ac_c_bigendian_cross.m4,v 1.1 2003/12/08 22:02:49 alanh Exp $ +dnl @version $Id: ac_c_bigendian_cross.m4,v 1.2 2003/12/09 15:33:35 alanh Exp $ dnl @author Guido Draheim dnl AC_DEFUN([AC_C_BIGENDIAN_CROSS], diff --git a/xc/extras/expat/conftools/mkinstalldirs b/xc/extras/expat/conftools/mkinstalldirs index df86ba918..83da42cbe 100755 --- a/xc/extras/expat/conftools/mkinstalldirs +++ b/xc/extras/expat/conftools/mkinstalldirs @@ -4,7 +4,7 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.1 2003/12/08 22:02:49 alanh Exp $ +# $Id: mkinstalldirs,v 1.2 2003/12/09 15:33:35 alanh Exp $ errstatus=0 diff --git a/xc/include/GL/glxproto.h b/xc/include/GL/glxproto.h index 39ff22d84..169564a36 100644 --- a/xc/include/GL/glxproto.h +++ b/xc/include/GL/glxproto.h @@ -74,9 +74,15 @@ #define __GLX_MAX_CONTEXT_PROPS 3 +#ifndef GLX_VENDOR #define GLX_VENDOR 0x1 +#endif +#ifndef GLX_VERSION #define GLX_VERSION 0x2 +#endif +#ifndef GLX_EXTENSIONS #define GLX_EXTENSIONS 0x3 +#endif /*****************************************************************************/ diff --git a/xc/lib/GL/GL/Imakefile b/xc/lib/GL/GL/Imakefile index 3a7baf6d9..cbbb6d0e2 100644 --- a/xc/lib/GL/GL/Imakefile +++ b/xc/lib/GL/GL/Imakefile @@ -21,18 +21,18 @@ XCOMM $XFree86: xc/lib/GL/GL/Imakefile,v 1.18 2003/06/30 01:45:10 torrey Exp $ BASEREQUIREDLIBS = SharedGLReqs #endif -#include "../mesa/src/array_cache/Imakefile.inc" -#include "../mesa/src/math/Imakefile.inc" -#include "../mesa/src/swrast/Imakefile.inc" -#include "../mesa/src/swrast_setup/Imakefile.inc" -#include "../mesa/src/tnl/Imakefile.inc" -#include "../mesa/src/tnl_dd/Imakefile.inc" -#include "../mesa/src/Imakefile.inc" +#include "../mesa/array_cache/Imakefile.inc" +#include "../mesa/math/Imakefile.inc" +#include "../mesa/swrast/Imakefile.inc" +#include "../mesa/swrast_setup/Imakefile.inc" +#include "../mesa/tnl/Imakefile.inc" +#include "../mesa/tnl_dd/Imakefile.inc" +#include "../mesa/Imakefile.inc" #ifdef i386Architecture -#include "../mesa/src/X86/Imakefile.inc" +#include "../mesa/x86/Imakefile.inc" #endif #ifdef SparcArchitecture -#include "../mesa/src/SPARC/Imakefile.inc" +#include "../mesa/sparc/Imakefile.inc" #endif XCOMM @@ -72,7 +72,7 @@ NormalLintTarget($(PROFSRC)) MESAPOBJS = $(COREMESAPOBJS) $(MESA_ASM_POBJS) #if GlxUseBuiltInDRIDriver -#include "../mesa/src/drv/common/Imakefile.inc" +#include "../mesa/drivers/dri/common/Imakefile.inc" #endif @@ -82,8 +82,8 @@ XCOMM nothing #elif GlxBuiltInGamma -#define MesaDrvGammaBuildDir $(GLXLIBSRC)/mesa/src/drv/gamma/ -#include "../mesa/src/drv/gamma/Imakefile.inc" +#define MesaDrvGammaBuildDir $(GLXLIBSRC)/mesa/drivers/dri/gamma/ +#include "../mesa/drivers/dri/gamma/Imakefile.inc" DRVOBJS = $(GAMMAOBJS) $(MESAOBJS) $(DRMOBJS) DRVUOBJS = $(GAMMAUOBJS) $(MESAUOBJS) $(DRMUOBJS) @@ -92,8 +92,8 @@ XCOMM nothing #elif GlxBuiltInTdfx -#define MesaDrvTdfxBuildDir $(GLXLIBSRC)/mesa/src/drv/tdfx/ -#include "../mesa/src/drv/tdfx/Imakefile.inc" +#define MesaDrvTdfxBuildDir $(GLXLIBSRC)/mesa/drivers/dri/tdfx/ +#include "../mesa/drivers/dri/tdfx/Imakefile.inc" DRVOBJS = $(TDFXOBJS) $(MESAOBJS) $(DRMOBJS) DRVUOBJS = $(TDFXUOBJS) $(MESAUOBJS) $(DRMUOBJS) @@ -104,8 +104,8 @@ OTHERREQUIREDLIBS = -lglide3 -ldl #elif GlxBuiltInI810 -#define MesaDrvI810BuildDir $(GLXLIBSRC)/mesa/src/drv/i810/ -#include "../mesa/src/drv/i810/Imakefile.inc" +#define MesaDrvI810BuildDir $(GLXLIBSRC)/mesa/drivers/dri/i810/ +#include "../mesa/drivers/dri/i810/Imakefile.inc" DRVOBJS = $(I810OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRMOBJS) DRVUOBJS = $(I810UOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRMUOBJS) @@ -113,8 +113,8 @@ OTHERREQUIREDLIBS = -lglide3 -ldl DRVPOBJS = $(I810POBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRMPOBJS) #elif GlxBuiltInI830 -#define MesaDrvI830BuildDir $(GLXLIBSRC)/mesa/src/drv/i830/ -#include "../mesa/src/drv/i830/Imakefile.inc" +#define MesaDrvI830BuildDir $(GLXLIBSRC)/mesa/drivers/dri/i830/ +#include "../mesa/drivers/dri/i830/Imakefile.inc" DRVOBJS = $(I830OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRMOBJS) DRVUOBJS = $(I830UOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRMUOBJS) @@ -123,8 +123,8 @@ OTHERREQUIREDLIBS = -lglide3 -ldl #elif GlxBuiltInMga -#define MesaDrvMgaBuildDir $(GLXLIBSRC)/mesa/src/drv/mga/ -#include "../mesa/src/drv/mga/Imakefile.inc" +#define MesaDrvMgaBuildDir $(GLXLIBSRC)/mesa/drivers/dri/mga/ +#include "../mesa/drivers/dri/mga/Imakefile.inc" DRVOBJS = $(MGAOBJS) $(COMMONOBJS) $(MESAOBJS) $(DRMOBJS) DRVUOBJS = $(MGAUOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRMUOBJS) @@ -133,8 +133,8 @@ OTHERREQUIREDLIBS = -lglide3 -ldl #elif GlxBuiltInR128 -#define MesaDrvR128BuildDir $(GLXLIBSRC)/mesa/src/drv/r128/ -#include "../mesa/src/drv/r128/Imakefile.inc" +#define MesaDrvR128BuildDir $(GLXLIBSRC)/mesa/drivers/dri/r128/ +#include "../mesa/drivers/dri/r128/Imakefile.inc" DRVOBJS = $(R128OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRMOBJS) DRVUOBJS = $(R128UOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRMUOBJS) @@ -143,8 +143,8 @@ OTHERREQUIREDLIBS = -lglide3 -ldl #elif GlxBuiltInRadeon -#define MesaDrvRadeonBuildDir $(GLXLIBSRC)/mesa/src/drv/radeon/ -#include "../mesa/src/drv/radeon/Imakefile.inc" +#define MesaDrvRadeonBuildDir $(GLXLIBSRC)/mesa/drivers/dri/radeon/ +#include "../mesa/drivers/dri/radeon/Imakefile.inc" DRVOBJS = $(RADEONOBJS) $(COMMONOBJS) $(MESAOBJS) $(DRMOBJS) DRVUOBJS = $(RADEONUOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRMUOBJS) @@ -153,8 +153,8 @@ OTHERREQUIREDLIBS = -lglide3 -ldl #elif GlxBuiltInFfb -#define MesaDrvFfbBuildDir $(GLXLIBSRC)/mesa/src/drv/ffb/ -#include "../mesa/src/drv/ffb/Imakefile.inc" +#define MesaDrvFfbBuildDir $(GLXLIBSRC)/mesa/drivers/dri/ffb/ +#include "../mesa/drivers/dri/ffb/Imakefile.inc" DRVOBJS = $(FFBOBJS) $(MESAOBJS) $(DRMOBJS) DRVUOBJS = $(FFBUOBJS) $(MESAUOBJS) $(DRMUOBJS) @@ -163,8 +163,8 @@ OTHERREQUIREDLIBS = -lglide3 -ldl #elif GlxBuiltInSIS -#define MesaDrvSisBuildDir $(GLXLIBSRC)/mesa/src/drv/sis/ -#include "../mesa/src/drv/sis/Imakefile.inc" +#define MesaDrvSisBuildDir $(GLXLIBSRC)/mesa/drivers/dri/sis/ +#include "../mesa/drivers/dri/sis/Imakefile.inc" DRVOBJS = $(SISOBJS) $(MESAOBJS) $(DRMOBJS) DRVUOBJS = $(SISUOBJS) $(MESAUOBJS) $(DRMUOBJS) @@ -173,7 +173,7 @@ OTHERREQUIREDLIBS = -lglide3 -ldl #elif GlxBuiltInXMesa -#include "../mesa/src/X/Imakefile.inc" +#include "../mesa/drivers/x11/Imakefile.inc" DRVOBJS = $(MESAOBJS) $(XMESA_OBJS) DRVUOBJS = $(MESAUOBJS) $(XMESA_UOBJS) diff --git a/xc/lib/GL/Imakefile b/xc/lib/GL/Imakefile index 754cc9a83..896144370 100644 --- a/xc/lib/GL/Imakefile +++ b/xc/lib/GL/Imakefile @@ -71,7 +71,7 @@ LIBGLBUILDDIR = GL #if BuildOSMesaLib || \ (BuildXF86DRI && \ (defined(DriDrivers) || GlxDriverUsesMesa || GlxBuiltInXMesa)) - MESADIRS = mesa/src + MESADIRS = mesa #endif /* @@ -79,7 +79,7 @@ LIBGLBUILDDIR = GL * BuildOSMesaLib */ #if BuildOSMesaLib - OSMESADIRS = mesa/src/OSmesa + OSMESADIRS = mesa/drivers/osmesa #endif /* @@ -95,11 +95,7 @@ LIBGLBUILDDIR = GL * BuildXF86DRI && defined(DriDrivers) */ #if BuildXF86DRI && defined(DriDrivers) - DRIVERDIRS = mesa/src/drv -#endif - -#if defined(DarwinArchitecture) && BuildAppleDRI - DRIDIRS = apple + DRIVERDIRS = mesa/drivers/dri #endif /* diff --git a/xc/lib/GL/dri/Imakefile b/xc/lib/GL/dri/Imakefile index ffd57a382..a3a817812 100644 --- a/xc/lib/GL/dri/Imakefile +++ b/xc/lib/GL/dri/Imakefile @@ -17,10 +17,12 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL #if !GlxUseSGISI DRI_SRCS = dri_glx.c DRI_OBJS = dri_glx.o - DRI_INCS = -I. -I$(GLXLIBSRC)/glx -I$(INCLUDESRC) -I$(INCLUDESRC)/GL \ + DRI_INCS = -I. -I$(GLXLIBSRC)/glx \ -I$(XINCLUDESRC) -I$(SERVERSRC)/GL/dri \ -I$(GLXLIBSRC)/include \ - -I$(MESASRCDIR)/include -I$(MESASRCDIR)/src + -I$(MESASRCDIR)/include \ + -I$(MESASRCDIR)/src/mesa/main \ + -I$(MESASRCDIR)/src/mesa/glapi #endif #if GlxUseBuiltInDRIDriver diff --git a/xc/lib/GL/dri/dri_util.c b/xc/lib/GL/dri/dri_util.c index 23da96bb9..ebfa6e561 100644 --- a/xc/lib/GL/dri/dri_util.c +++ b/xc/lib/GL/dri/dri_util.c @@ -26,7 +26,6 @@ #include #include #include -#include "glxclient.h" #include "xf86dri.h" #include "sarea.h" #include "dri_util.h" diff --git a/xc/lib/GL/dri/dri_util.h b/xc/lib/GL/dri/dri_util.h index e82cf0f8e..88f6db9d1 100644 --- a/xc/lib/GL/dri/dri_util.h +++ b/xc/lib/GL/dri/dri_util.h @@ -55,6 +55,8 @@ #include #include "glxclient.h" /* for GLXDrawable */ +/* temporary */ +typedef Bool ( * PFNGLXGETMSCRATEOMLPROC) (Display *dpy, GLXDrawable drawable, int32_t *numerator, int32_t *denominator); #include "xf86dri.h" /* for XF86DRIClipRectPtr */ #include "sarea.h" /* for XF86DRISAREAPtr */ #include "GL/internal/glcore.h" /* for __GLcontextModes */ diff --git a/xc/lib/GL/glx/Imakefile b/xc/lib/GL/glx/Imakefile index 43ba12143..041672a29 100644 --- a/xc/lib/GL/glx/Imakefile +++ b/xc/lib/GL/glx/Imakefile @@ -33,13 +33,13 @@ XCOMM glw # Files from Mesa -LinkSourceFile(glapi.c, $(MESASRCDIR)/src) -LinkSourceFile(glthread.c, $(MESASRCDIR)/src) -#if defined(i386Architecture) -LinkSourceFile(glapi_x86.S, $(MESASRCDIR)/src/X86) +LinkSourceFile(glapi.c, $(MESASRCDIR)/src/mesa/glapi) +LinkSourceFile(glthread.c, $(MESASRCDIR)/src/mesa/glapi) +#ifdef i386Architecture +LinkSourceFile(glapi_x86.S, $(MESASRCDIR)/src/mesa/x86) #endif -#if defined(SparcArchitecture) && !defined(OpenBSDArchitecture) -LinkSourceFile(glapi_sparc.S, $(MESASRCDIR)/src/SPARC) +#ifdef SparcArchitecture +LinkSourceFile(glapi_sparc.S, $(MESASRCDIR)/src/mesa/sparc) #endif @@ -97,10 +97,10 @@ LinkSourceFile(glapi_sparc.S, $(MESASRCDIR)/src/SPARC) GLX_DEFS = GlxDefines #ifdef i386Architecture - ASM_DIR = X86 + ASM_DIR = x86 #endif #ifdef SparcArchitecture - ASM_DIR = SPARC + ASM_DIR = sparc #endif #if BuildXF86DRI @@ -125,16 +125,14 @@ LinkSourceFile(glapi_sparc.S, $(MESASRCDIR)/src/SPARC) OBJS = $(GLX_OBJS) $(ASM_OBJS) DEFINES = $(GLX_DEFS) $(ASM_DEFS) $(XMESA_DEFINES) - INCLUDES = -I$(INCLUDESRC) \ - -I$(XINCLUDESRC) \ + INCLUDES = -I$(XINCLUDESRC) \ + -I$(MESASRCDIR)/include \ -I$(EXTINCSRC) \ - -I$(INCLUDESRC)/GL \ -I$(GLXLIBSRC)/glx \ - -I$(MESASRCDIR)/src \ - -I$(MESASRCDIR)/src/X \ - -I$(MESASRCDIR)/src/$(ASM_DIR) \ - -I$(MESASRCDIR)/include \ - -I$(GLXLIBSRC)/include \ + -I$(MESASRCDIR)/src/mesa/main \ + -I$(MESASRCDIR)/src/mesa/glapi \ + -I$(MESASRCDIR)/src/mesa/drivers/x11 \ + -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ $(DRI_INCS) #include diff --git a/xc/lib/GL/glx/glxcmds.c b/xc/lib/GL/glx/glxcmds.c index 5178f7071..3256d5e8d 100644 --- a/xc/lib/GL/glx/glxcmds.c +++ b/xc/lib/GL/glx/glxcmds.c @@ -41,7 +41,6 @@ #include #include "packsingle.h" -#include "glxclient.h" #include #include #include diff --git a/xc/lib/GL/include/GL/internal/glcore.h b/xc/lib/GL/include/GL/internal/glcore.h deleted file mode 100644 index 4c9c637af..000000000 --- a/xc/lib/GL/include/GL/internal/glcore.h +++ /dev/null @@ -1,463 +0,0 @@ -/* $XFree86: xc/lib/GL/include/GL/internal/glcore.h,v 1.10 2003/06/30 01:45:11 torrey Exp $ */ -#ifndef __gl_core_h_ -#define __gl_core_h_ - -/* -** License Applicability. Except to the extent portions of this file are -** made subject to an alternative license as permitted in the SGI Free -** Software License B, Version 1.1 (the "License"), the contents of this -** file are subject only to the provisions of the License. You may not use -** this file except in compliance with the License. You may obtain a copy -** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -** -** http://oss.sgi.com/projects/FreeB -** -** Note that, as provided in the License, the Software is distributed on an -** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -** -** Original Code. The Original Code is: OpenGL Sample Implementation, -** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -** Copyright in any portions created by third parties is as indicated -** elsewhere herein. All Rights Reserved. -** -** Additional Notice Provisions: The application programming interfaces -** established by SGI in conjunction with the Original Code are The -** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -** Window System(R) (Version 1.3), released October 19, 1998. This software -** was created using the OpenGL(R) version 1.2.1 Sample Implementation -** published by SGI, but has not been independently verified as being -** compliant with the OpenGL(R) version 1.2.1 Specification. -** -*/ - -#ifndef XFree86LOADER -#include -#endif - -#ifdef CAPI -#undef CAPI -#endif -#define CAPI - -#define GL_CORE_SGI 1 -#define GL_CORE_MESA 2 -#define GL_CORE_APPLE 4 - -typedef struct __GLcontextRec __GLcontext; -typedef struct __GLinterfaceRec __GLinterface; - -/* -** This file defines the interface between the GL core and the surrounding -** "operating system" that supports it (currently the GLX or WGL extensions). -** -** Members (data and function pointers) are documented as imported or -** exported according to how they are used by the core rendering functions. -** Imported members are initialized by the "operating system" and used by -** the core functions. Exported members are initialized by the core functions -** and used by the "operating system". -*/ - -/* -** Mode and limit information for a context. This information is -** kept around in the context so that values can be used during -** command execution, and for returning information about the -** context to the application. -*/ -typedef struct __GLcontextModesRec { - struct __GLcontextModesRec * next; - - GLboolean rgbMode; - GLboolean floatMode; - GLboolean colorIndexMode; - GLuint doubleBufferMode; - GLuint stereoMode; - - GLboolean haveAccumBuffer; - GLboolean haveDepthBuffer; - GLboolean haveStencilBuffer; - - GLint redBits, greenBits, blueBits, alphaBits; /* bits per comp */ - GLuint redMask, greenMask, blueMask, alphaMask; - GLint rgbBits; /* total bits for rgb */ - GLint indexBits; /* total bits for colorindex */ - - GLint accumRedBits, accumGreenBits, accumBlueBits, accumAlphaBits; - GLint depthBits; - GLint stencilBits; - - GLint numAuxBuffers; - - GLint level; - - GLint pixmapMode; - - /* GLX */ - GLint visualID; - GLint visualType; /**< One of the GLX X visual types. (i.e., - * \c GLX_TRUE_COLOR, etc.) - */ - - /* EXT_visual_rating / GLX 1.2 */ - GLint visualRating; - - /* EXT_visual_info / GLX 1.2 */ - GLint transparentPixel; - /* colors are floats scaled to ints */ - GLint transparentRed, transparentGreen, transparentBlue, transparentAlpha; - GLint transparentIndex; - - /* ARB_multisample / SGIS_multisample */ - GLint sampleBuffers; - GLint samples; - - /* SGIX_fbconfig / GLX 1.3 */ - GLint drawableType; - GLint renderType; - GLint xRenderable; - GLint fbconfigID; - - /* SGIX_pbuffer / GLX 1.3 */ - GLint maxPbufferWidth; - GLint maxPbufferHeight; - GLint maxPbufferPixels; - GLint optimalPbufferWidth; /* Only for SGIX_pbuffer. */ - GLint optimalPbufferHeight; /* Only for SGIX_pbuffer. */ - - /* SGIX_visual_select_group */ - GLint visualSelectGroup; - - /* OML_swap_method */ - GLint swapMethod; - - GLint screen; -} __GLcontextModes; - -/************************************************************************/ - -/* -** Structure used for allocating and freeing drawable private memory. -** (like software buffers, for example). -** -** The memory allocation routines are provided by the surrounding -** "operating system" code, and they are to be used for allocating -** software buffers and things which are associated with the drawable, -** and used by any context which draws to that drawable. There are -** separate memory allocation functions for drawables and contexts -** since drawables and contexts can be created and destroyed independently -** of one another, and the "operating system" may want to use separate -** allocation arenas for each. -** -** The freePrivate function is filled in by the core routines when they -** allocates software buffers, and stick them in "private". The freePrivate -** function will destroy anything allocated to this drawable (to be called -** when the drawable is destroyed). -*/ -typedef struct __GLdrawableRegionRec __GLdrawableRegion; -typedef struct __GLdrawableBufferRec __GLdrawableBuffer; -typedef struct __GLdrawablePrivateRec __GLdrawablePrivate; - -typedef struct __GLregionRectRec { - /* lower left (inside the rectangle) */ - GLint x0, y0; - /* upper right (outside the rectangle) */ - GLint x1, y1; -} __GLregionRect; - -struct __GLdrawableRegionRec { - GLint numRects; - __GLregionRect *rects; - __GLregionRect boundingRect; -}; - -/************************************************************************/ - -/* masks for the buffers */ -#define __GL_FRONT_BUFFER_MASK 0x00000001 -#define __GL_FRONT_LEFT_BUFFER_MASK 0x00000001 -#define __GL_FRONT_RIGHT_BUFFER_MASK 0x00000002 -#define __GL_BACK_BUFFER_MASK 0x00000004 -#define __GL_BACK_LEFT_BUFFER_MASK 0x00000004 -#define __GL_BACK_RIGHT_BUFFER_MASK 0x00000008 -#define __GL_ACCUM_BUFFER_MASK 0x00000010 -#define __GL_DEPTH_BUFFER_MASK 0x00000020 -#define __GL_STENCIL_BUFFER_MASK 0x00000040 -#define __GL_AUX_BUFFER_MASK(i) (0x0000080 << (i)) - -#define __GL_ALL_BUFFER_MASK 0xffffffff - -/* what Resize routines return if resize resorted to fallback case */ -#define __GL_BUFFER_FALLBACK 0x10 - -typedef void (*__GLbufFallbackInitFn)(__GLdrawableBuffer *buf, - __GLdrawablePrivate *glPriv, GLint bits); -typedef void (*__GLbufMainInitFn)(__GLdrawableBuffer *buf, - __GLdrawablePrivate *glPriv, GLint bits, - __GLbufFallbackInitFn back); - -/* -** A drawable buffer -** -** This data structure describes the context side of a drawable. -** -** According to the spec there could be multiple contexts bound to the same -** drawable at the same time (from different threads). In order to avoid -** multiple-access conflicts, locks are used to serialize access. When a -** thread needs to access (read or write) a member of the drawable, it takes -** a lock first. Some of the entries in the drawable are treated "mostly -** constant", so we take the freedom of allowing access to them without -** taking a lock (for optimization reasons). -** -** For more details regarding locking, see buffers.h in the GL core -*/ -struct __GLdrawableBufferRec { - /* - ** Buffer dimensions - */ - GLint width, height, depth; - - /* - ** Framebuffer base address - */ - void *base; - - /* - ** Framebuffer size (in bytes) - */ - GLuint size; - - /* - ** Size (in bytes) of each element in the framebuffer - */ - GLuint elementSize; - GLuint elementSizeLog2; - - /* - ** Element skip from one scanline to the next. - ** If the buffer is part of another buffer (for example, fullscreen - ** front buffer), outerWidth is the width of that buffer. - */ - GLint outerWidth; - - /* - ** outerWidth * elementSize - */ - GLint byteWidth; - - /* - ** Allocation/deallocation is done based on this handle. A handle - ** is conceptually different from the framebuffer 'base'. - */ - void *handle; - - /* imported */ - GLboolean (*resize)(__GLdrawableBuffer *buf, - GLint x, GLint y, GLuint width, GLuint height, - __GLdrawablePrivate *glPriv, GLuint bufferMask); - void (*lock)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv); - void (*unlock)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv); - void (*fill)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv, - GLuint val, GLint x, GLint y, GLint w, GLint h); - void (*free)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv); - - /* exported */ - void (*freePrivate)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv); - void *private; - - /* private */ - void *other; /* implementation private data */ - __GLbufMainInitFn mainInit; - __GLbufFallbackInitFn fallbackInit; -}; - -/* -** The context side of the drawable private -*/ -struct __GLdrawablePrivateRec { - /* - ** Drawable Modes - */ - __GLcontextModes *modes; - - /* - ** Drawable size - */ - GLuint width, height; - - /* - ** Origin in screen coordinates of the drawable - */ - GLint xOrigin, yOrigin; -#ifdef __GL_ALIGNED_BUFFERS - /* - ** Drawable offset from screen origin - */ - GLint xOffset, yOffset; - - /* - ** Alignment restriction - */ - GLint xAlignment, yAlignment; -#endif - /* - ** Should we invert the y axis? - */ - GLint yInverted; - - /* - ** Mask specifying which buffers are renderable by the hw - */ - GLuint accelBufferMask; - - /* - ** the buffers themselves - */ - __GLdrawableBuffer frontBuffer; - __GLdrawableBuffer backBuffer; - __GLdrawableBuffer accumBuffer; - __GLdrawableBuffer depthBuffer; - __GLdrawableBuffer stencilBuffer; -#if defined(__GL_NUMBER_OF_AUX_BUFFERS) && (__GL_NUMBER_OF_AUX_BUFFERS > 0) - __GLdrawableBuffer *auxBuffer; -#endif - - __GLdrawableRegion ownershipRegion; - - /* - ** Lock for the drawable private structure - */ - void *lock; -#ifdef DEBUG - /* lock debugging info */ - int lockRefCount; - int lockLine[10]; - char *lockFile[10]; -#endif - - /* imported */ - void *(*malloc)(size_t size); - void *(*calloc)(size_t numElem, size_t elemSize); - void *(*realloc)(void *oldAddr, size_t newSize); - void (*free)(void *addr); - - GLboolean (*addSwapRect)(__GLdrawablePrivate *glPriv, - GLint x, GLint y, GLsizei width, GLsizei height); - void (*setClipRect)(__GLdrawablePrivate *glPriv, - GLint x, GLint y, GLsizei width, GLsizei height); - void (*updateClipRegion)(__GLdrawablePrivate *glPriv); - GLboolean (*resize)(__GLdrawablePrivate *glPriv); - void (*getDrawableSize)(__GLdrawablePrivate *glPriv, - GLint *x, GLint *y, GLuint *width, GLuint *height); - - void (*lockDP)(__GLdrawablePrivate *glPriv, __GLcontext *gc); - void (*unlockDP)(__GLdrawablePrivate *glPriv); - - /* exported */ - void *private; - void (*freePrivate)(__GLdrawablePrivate *); - - /* client data */ - void *other; -}; - -/* -** Macros to lock/unlock the drawable private -*/ -#if defined(DEBUG) -#define __GL_LOCK_DP(glPriv,gc) \ - (*(glPriv)->lockDP)(glPriv,gc); \ - (glPriv)->lockLine[(glPriv)->lockRefCount] = __LINE__; \ - (glPriv)->lockFile[(glPriv)->lockRefCount] = __FILE__; \ - (glPriv)->lockRefCount++ -#define __GL_UNLOCK_DP(glPriv) \ - (glPriv)->lockRefCount--; \ - (glPriv)->lockLine[(glPriv)->lockRefCount] = 0; \ - (glPriv)->lockFile[(glPriv)->lockRefCount] = NULL; \ - (*(glPriv)->unlockDP)(glPriv) -#else /* DEBUG */ -#define __GL_LOCK_DP(glPriv,gc) (*(glPriv)->lockDP)(glPriv,gc) -#define __GL_UNLOCK_DP(glPriv) (*(glPriv)->unlockDP)(glPriv) -#endif /* DEBUG */ - - -/* -** Procedures which are imported by the GL from the surrounding -** "operating system". Math functions are not considered part of the -** "operating system". -*/ -typedef struct __GLimportsRec { - /* Memory management */ - void * (*malloc)(__GLcontext *gc, size_t size); - void *(*calloc)(__GLcontext *gc, size_t numElem, size_t elemSize); - void *(*realloc)(__GLcontext *gc, void *oldAddr, size_t newSize); - void (*free)(__GLcontext *gc, void *addr); - - /* Error handling */ - void (*warning)(__GLcontext *gc, char *fmt); - void (*fatal)(__GLcontext *gc, char *fmt); - - /* other system calls */ - char *(CAPI *getenv)(__GLcontext *gc, const char *var); - int (CAPI *atoi)(__GLcontext *gc, const char *str); - int (CAPI *sprintf)(__GLcontext *gc, char *str, const char *fmt, ...); - void *(CAPI *fopen)(__GLcontext *gc, const char *path, const char *mode); - int (CAPI *fclose)(__GLcontext *gc, void *stream); - int (CAPI *fprintf)(__GLcontext *gc, void *stream, const char *fmt, ...); - - /* Drawing surface management */ - __GLdrawablePrivate *(*getDrawablePrivate)(__GLcontext *gc); - __GLdrawablePrivate *(*getReadablePrivate)(__GLcontext *gc); - - /* Operating system dependent data goes here */ - void *other; -} __GLimports; - -/************************************************************************/ - -/* -** Procedures which are exported by the GL to the surrounding "operating -** system" so that it can manage multiple GL context's. -*/ -typedef struct __GLexportsRec { - /* Context management (return GL_FALSE on failure) */ - GLboolean (*destroyContext)(__GLcontext *gc); - GLboolean (*loseCurrent)(__GLcontext *gc); - /* oldglPriv isn't used anymore, kept for backwards compatibility */ - GLboolean (*makeCurrent)(__GLcontext *gc); - GLboolean (*shareContext)(__GLcontext *gc, __GLcontext *gcShare); - GLboolean (*copyContext)(__GLcontext *dst, const __GLcontext *src, GLuint mask); - GLboolean (*forceCurrent)(__GLcontext *gc); - - /* Drawing surface notification callbacks */ - GLboolean (*notifyResize)(__GLcontext *gc); - void (*notifyDestroy)(__GLcontext *gc); - void (*notifySwapBuffers)(__GLcontext *gc); - - /* Dispatch table override control for external agents like libGLS */ - struct __GLdispatchStateRec* (*dispatchExec)(__GLcontext *gc); - void (*beginDispatchOverride)(__GLcontext *gc); - void (*endDispatchOverride)(__GLcontext *gc); -} __GLexports; - -/************************************************************************/ - -/* -** This must be the first member of a __GLcontext structure. This is the -** only part of a context that is exposed to the outside world; everything -** else is opaque. -*/ -struct __GLinterfaceRec { - __GLimports imports; - __GLexports exports; -}; - -extern __GLcontext *__glCoreCreateContext(__GLimports *, __GLcontextModes *); -extern void __glCoreNopDispatch(void); - -#endif /* __gl_core_h_ */ diff --git a/xc/lib/GL/mesa/Imakefile b/xc/lib/GL/mesa/Imakefile new file mode 100644 index 000000000..72698e6e3 --- /dev/null +++ b/xc/lib/GL/mesa/Imakefile @@ -0,0 +1,68 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.30tsi Exp $ + +#include + +/* + * Need both shared and unshared Mesa objects in the following cases: + * GlxDriverUsesMesa + * GlxBuiltInXMesa + * BuildOSMesaLib + * + * In other cases, only the shared version is needed to link in to loadable + * driver modules. + */ + +#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) +#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) +#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) +#define DoExtraLib SharedLibGlx +#define DoDebugLib DebugLibGlx +#define DoProfileLib ProfileLibGlx +#else +#define DoNormalLib SharedLibGlxWithoutPIC +#define DoSharedLib !SharedLibGlxWithoutPIC +#define DoExtraLib NO +#define DoDebugLib NO +#define DoProfileLib NO +#endif + +#if Malloc0ReturnsNull +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL +#endif + +#if defined(i386Architecture) && MesaUseX86Asm +#define MesaX86BuildDir /**/ +ASM_SUBDIRS = x86 +#endif +#ifdef SparcArchitecture +#define MesaSparcBuildDir /**/ +ASM_SUBDIRS = sparc +#endif +#define MesaBuildDir /**/ +#define NeedToLinkMesaSrc + +#ifdef UseCompaqMathLibrary + MATH_DEFINES = -DCCPML +#endif + + DEFINES = $(ALLOC_DEFINES) GlxDefines \ + $(MESA_ASM_DEFINES) $(MATH_DEFINES) + INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ + -I$(GLXLIBSRC)/dri \ + -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include + +#include + +LibraryObjectRule() + +#define IHaveSubdirs +#define PassCDebugFlags + +SUBDIRS = $(ASM_SUBDIRS) array_cache main math swrast swrast_setup tnl tnl_dd + + +MakeSubdirs($(SUBDIRS)) +DependSubdirs($(SUBDIRS)) + + +DependTarget() diff --git a/xc/lib/GL/mesa/Imakefile.inc b/xc/lib/GL/mesa/Imakefile.inc new file mode 100644 index 000000000..8afabfa6a --- /dev/null +++ b/xc/lib/GL/mesa/Imakefile.inc @@ -0,0 +1,42 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $ + +#ifndef MesaBuildDir +#define MesaBuildDir $(GLXLIBSRC)/mesa/ +#endif + +MESABUILDDIR = MesaBuildDir + +COREMESASRCS = $(COREMESABASESRCS) \ + $(MESA_AC_SRCS) \ + $(MESA_MATH_SRCS) \ + $(MESA_SWRAST_SRCS) \ + $(MESA_SWR_SETUP_SRCS) \ + $(MESA_TNL_SRCS) + +COREMESAOBJS = $(COREMESABASEOBJS) \ + $(MESA_AC_OBJS) \ + $(MESA_MATH_OBJS) \ + $(MESA_SWRAST_OBJS) \ + $(MESA_SWR_SETUP_OBJS) \ + $(MESA_TNL_OBJS) + +COREMESAUOBJS = $(COREMESABASEUOBJS) \ + $(MESA_AC_UOBJS) \ + $(MESA_MATH_UOBJS) \ + $(MESA_SWRAST_UOBJS) \ + $(MESA_SWR_SETUP_UOBJS) \ + $(MESA_TNL_UOBJS) + +COREMESADOBJS = $(COREMESABASEDOBJS) \ + $(MESA_AC_DOBJS) \ + $(MESA_MATH_DOBJS) \ + $(MESA_SWRAST_DOBJS) \ + $(MESA_SWR_SETUP_DOBJS) \ + $(MESA_TNL_DOBJS) + +COREMESAPOBJS = $(COREMESABASEPOBJS) \ + $(MESA_AC_POBJS) \ + $(MESA_MATH_POBJS) \ + $(MESA_SWRAST_POBJS) \ + $(MESA_SWR_SETUP_POBJS) \ + $(MESA_TNL_POBJS) diff --git a/xc/lib/GL/mesa/array_cache/Imakefile b/xc/lib/GL/mesa/array_cache/Imakefile new file mode 100644 index 000000000..13a7b333b --- /dev/null +++ b/xc/lib/GL/mesa/array_cache/Imakefile @@ -0,0 +1,91 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/array_cache/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $ + +#include + +/* + * Need both shared and unshared Mesa objects in the following cases: + * GlxDriverUsesMesa + * GlxBuiltInXMesa + * BuildOSMesaLib + * + * In other cases, only the shared version is needed to link in to loadable + * driver modules. + */ + +#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) +#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) +#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) +#define DoExtraLib SharedLibGlx +#define DoDebugLib DebugLibGlx +#define DoProfileLib ProfileLibGlx +#else +#define DoNormalLib SharedLibGlxWithoutPIC +#define DoSharedLib !SharedLibGlxWithoutPIC +#define DoExtraLib NO +#define DoDebugLib NO +#define DoProfileLib NO +#endif + + +#define MesaACBuildDir /**/ +#define NeedToLinkMesaSrc +#include "Imakefile.inc" + +#if Malloc0ReturnsNull +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL +#endif + +#if BuildXF86DRI + DRI_DEFINES = GlxDefines + DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ + -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri +#endif + +MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \ + -I$(MESASRCDIR)/src/mesa/array_cache \ + -I$(MESASRCDIR)/src/mesa/glapi \ + -I$(MESASRCDIR)/src/mesa/math \ + -I$(MESASRCDIR)/src/mesa \ + -I$(MESASRCDIR)/include \ + -I../../../include -I$(XINCLUDESRC) + + INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) + SRCS = $(MESA_AC_SRCS) + OBJS = $(MESA_AC_OBJS) + + +#if defined(i386Architecture) && MesaUseX86Asm + ASM_SRCS = + ASM_OBJS = +#if MesaUseMMX + MMX_DEFS = -DUSE_MMX_ASM +#endif +#if MesaUse3DNow + 3DNOW_DEFS = -DUSE_3DNOW_ASM +#endif +#if MesaUseSSE + SSE_DEFS = -DUSE_SSE_ASM +#endif + ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) +#endif + +#ifdef SparcArchitecture + ASM_SRCS = + ASM_OBJS = + ASM_DEFS = -DUSE_SPARC_ASM +#endif + +#ifdef UseCompaqMathLibrary + MATHDEF = -DCCPML +#endif + + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) + +#include + +LibraryObjectRule() + +SubdirLibraryRule($(OBJS)) +NormalLintTarget($(SRCS)) + +DependTarget() diff --git a/xc/lib/GL/mesa/array_cache/Imakefile.inc b/xc/lib/GL/mesa/array_cache/Imakefile.inc new file mode 100644 index 000000000..9a5044791 --- /dev/null +++ b/xc/lib/GL/mesa/array_cache/Imakefile.inc @@ -0,0 +1,34 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/array_cache/Imakefile.inc,v 1.1tsi Exp $ + +#ifndef MesaACBuildDir +#define MesaACBuildDir $(GLXLIBSRC)/mesa/array_cache/ +#endif + +MESAACBUILDDIR = MesaACBuildDir + + MESA_AC_SRCS = $(MESAACBUILDDIR)ac_context.c \ + $(MESAACBUILDDIR)ac_import.c + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(acache.h, $(MESASRCDIR)/src/mesa/array_cache) +LinkSourceFile(ac_context.c, $(MESASRCDIR)/src/mesa/array_cache) +LinkSourceFile(ac_context.h, $(MESASRCDIR)/src/mesa/array_cache) +LinkSourceFile(ac_import.c, $(MESASRCDIR)/src/mesa/array_cache) +#endif + + MESA_AC_OBJS = $(MESAACBUILDDIR)ac_context.o \ + $(MESAACBUILDDIR)ac_import.o + +#if defined(DoSharedLib) && DoSharedLib + MESA_AC_UOBJS = $(MESAACBUILDDIR)unshared/ac_context.o \ + $(MESAACBUILDDIR)unshared/ac_import.o +#else + MESA_AC_UOBJS = $(MESA_AC_OBJS) +#endif + + MESA_AC_DOBJS = $(MESAACBUILDDIR)debugger/ac_context.o \ + $(MESAACBUILDDIR)debugger/ac_import.o + + MESA_AC_POBJS = $(MESAACBUILDDIR)profiled/ac_context.o \ + $(MESAACBUILDDIR)profiled/ac_import.o + diff --git a/xc/lib/GL/mesa/drivers/dri/Imakefile b/xc/lib/GL/mesa/drivers/dri/Imakefile new file mode 100644 index 000000000..0bec10abd --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/Imakefile @@ -0,0 +1,15 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/Imakefile,v 1.18 2001/03/23 19:18:38 dawes Exp $ + +#ifdef DriDrivers + +#define IHaveSubdirs +#define PassCDebugFlags + +SUBDIRS = common DriDrivers + +MakeSubdirs($(SUBDIRS)) +DependSubdirs($(SUBDIRS)) + +DependTarget() + +#endif diff --git a/xc/lib/GL/mesa/drivers/dri/common/Imakefile b/xc/lib/GL/mesa/drivers/dri/common/Imakefile new file mode 100644 index 000000000..8580ec955 --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/common/Imakefile @@ -0,0 +1,44 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/common/Imakefile,v 1.6 2001/04/03 02:29:34 dawes Exp $ + +#include + +#if GlxUseBuiltInDRIDriver +#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) +#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) +#define DoExtraLib SharedLibGlx +#define DoDebugLib DebugLibGlx +#define DoProfileLib ProfileLibGlx +#else +#define DoNormalLib SharedLibGlxWithoutPIC +#define DoSharedLib !SharedLibGlxWithoutPIC +#define DoExtrasLib NO +#define DoDebugLib NO +#define DoProfileLib NO +#endif + +#define NeedToLinkMesaSrc +#define MesaDrvCommonBuildDir /**/ +#include "Imakefile.inc" + +XCOMM #if defined(i386Architecture) && MesaUseX86Asm +XCOMM #include "../../../x86/Imakefile.inc" +XCOMM #endif +XCOMM #ifdef SparcArchitecture +XCOMM #include "../../../sparc/Imakefile.inc" +XCOMM #endif + + DEFINES = $(ALLOC_DEFINES) $(COMMON_DRI_DEFINES) $(MESA_ASM_DEFINES) + INCLUDES = $(COMMON_X_INCLUDES) $(COMMON_MESA_INCLUDES) \ + $(COMMON_DRI_INCLUDES) $(COMMON_EXPATINCLUDES) + + SRCS = $(COMMONSRCS) + OBJS = $(COMMONOBJS) + +#include + +LibraryObjectRule() + +SubdirLibraryRule($(OBJS)) +NormalLintTarget($(SRCS)) + +DependTarget() diff --git a/xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc b/xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc new file mode 100644 index 000000000..6a779a906 --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc @@ -0,0 +1,80 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/common/Imakefile.inc,v 1.3 2003/05/27 16:34:32 tsi Exp $ + +#ifndef MesaDrvSrcDir +#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri +#endif + +MESADRVSRCDIR = MesaDrvSrcDir + +#ifndef MesaDrvCommonBuildDir +#define MesaDrvCommonBuildDir $(MESADRVSRCDIR)/common/ +#endif + +MESADRVCOMMONBUILDDIR = MesaDrvCommonBuildDir + +#if Malloc0ReturnsNull +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL +#endif + +#if BuildXF86DRI + COMMON_DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=$(X_BYTE_ORDER) + COMMON_DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ + -I$(XINCLUDESRC) \ + -I$(GLXLIBSRC)/glx \ + -I$(GLXLIBSRC)/include \ + -I$(SERVERSRC)/GL/dri \ + -I$(XF86OSSRC) \ + -I$(XF86COMSRC) \ + -I$(GLXLIBSRC)/dri/drm \ + -I$(GLXLIBSRC)/include +#endif + +COMMON_MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ + -I$(MESASRCDIR)/src/mesa/main \ + -I$(MESASRCDIR)/src/mesa/glapi \ + -I$(MESADRVSRCDIR)/common \ + -I$(MESASRCDIR)/include + COMMON_X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) + + COMMONSRCS = $(MESADRVCOMMONBUILDDIR)mm.c \ + $(MESADRVCOMMONBUILDDIR)utils.c \ + $(MESADRVCOMMONBUILDDIR)vblank.c \ + $(MESADRVCOMMONBUILDDIR)texmem.c \ + $(MESADRVCOMMONBUILDDIR)xmlconfig.c + + COMMONOBJS = $(MESADRVCOMMONBUILDDIR)mm.o \ + $(MESADRVCOMMONBUILDDIR)utils.o \ + $(MESADRVCOMMONBUILDDIR)vblank.o \ + $(MESADRVCOMMONBUILDDIR)texmem.o \ + $(MESADRVCOMMONBUILDDIR)xmlconfig.o + + COMMONUOBJS = $(MESADRVCOMMONBUILDDIR)unshared/mm.o \ + $(MESADRVCOMMONBUILDDIR)unshared/utils.o \ + $(MESADRVCOMMONBUILDDIR)unshared/vblank.o \ + $(MESADRVCOMMONBUILDDIR)unshared/texmem.o \ + $(MESADRVCOMMONBUILDDIR)unshared/xmlconfig.o + + COMMONDOBJS = $(MESADRVCOMMONBUILDDIR)debugger/mm.o \ + $(MESADRVCOMMONBUILDDIR)debugger/utils.o \ + $(MESADRVCOMMONBUILDDIR)debugger/vblank.o \ + $(MESADRVCOMMONBUILDDIR)debugger/texmem.o \ + $(MESADRVCOMMONBUILDDIR)debugger/xmlconfig.o + + COMMONPOBJS = $(MESADRVCOMMONBUILDDIR)profiled/mm.o \ + $(MESADRVCOMMONBUILDDIR)profiled/utils.o \ + $(MESADRVCOMMONBUILDDIR)profiled/vblank.o \ + $(MESADRVCOMMONBUILDDIR)profiled/texmem.o \ + $(MESADRVCOMMONBUILDDIR)profiled/xmlconfig.o + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(mm.c, $(MESADRVSRCDIR)/common) +LinkSourceFile(mm.h, $(MESADRVSRCDIR)/common) +LinkSourceFile(texmem.c, $(MESADRVSRCDIR)/common) +LinkSourceFile(texmem.h, $(MESADRVSRCDIR)/common) +LinkSourceFile(utils.c, $(MESADRVSRCDIR)/common) +LinkSourceFile(utils.h, $(MESADRVSRCDIR)/common) +LinkSourceFile(vblank.c, $(MESADRVSRCDIR)/common) +LinkSourceFile(vblank.h, $(MESADRVSRCDIR)/common) +LinkSourceFile(xmlconfig.c, $(MESADRVSRCDIR)/common) +LinkSourceFile(xmlconfig.h, $(MESADRVSRCDIR)/common) +#endif diff --git a/xc/lib/GL/mesa/drivers/dri/ffb/Imakefile b/xc/lib/GL/mesa/drivers/dri/ffb/Imakefile new file mode 100644 index 000000000..b8463babd --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/ffb/Imakefile @@ -0,0 +1,84 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/ffb/Imakefile,v 1.15 2002/02/23 00:45:48 dawes Exp $ + +#include + +#if GlxUseBuiltInDRIDriver +#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) +#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) +#define DoExtraLib SharedLibGlx +#define DoDebugLib DebugLibGlx +#define DoProfileLib ProfileLibGlx +#else +#define DoNormalLib SharedLibGlxWithoutPIC +#define DoSharedLib !SharedLibGlxWithoutPIC +#define DoExtrasLib NO +#define DoDebugLib NO +#define DoProfileLib NO +#endif + +#define MesaDrvCommonBuildDir ../common/ +#include "../common/Imakefile.inc" +#include "../../../array_cache/Imakefile.inc" +#include "../../../main/Imakefile.inc" +#include "../../../math/Imakefile.inc" +#include "../../../swrast/Imakefile.inc" +#include "../../../swrast_setup/Imakefile.inc" +#include "../../../tnl/Imakefile.inc" +#include "../../../tnl_dd/Imakefile.inc" +#include "../../../Imakefile.inc" +#if defined(i386Architecture) && MesaUseX86Asm +#include "../../../x86/Imakefile.inc" +#endif +#ifdef SparcArchitecture +#include "../../../sparc/Imakefile.inc" +#endif +#define NeedToLinkMesaSrc +#include "Imakefile.inc" + + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) + INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) \ + -I$(XF86DRIVERSRC)/sunffb + + DRIOBJS = $(GLXLIBSRC)/dri/dri_util.o \ + $(GLXLIBSRC)/dri/glcontextmodes.o + + DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ + $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ + $(GLXLIBSRC)/dri/drm/xf86drmRandom.o \ + $(GLXLIBSRC)/dri/drm/xf86drmSL.o + +#ifdef GlxSoProf + LOSRCS = ../../../../lowpc.c + HISRCS = ../../../../highpc.c + + LOOBJS = ../../../../lowpc.o + HIOBJS = ../../../../highpc.o +#endif + + SRCS = $(FFBSRCS) + OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ + $(MESA_ASM_OBJS) $(COMMONOBJS) $(FFBOBJS) $(HIOBJS) + +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) StaticLibrary($(BUILDLIBDIR),expat) + +#include + +LibraryObjectRule() + +SubdirLibraryRule($(FFBOBJS)) +NormalLintTarget($(SRCS)) + +#if !GlxUseBuiltInDRIDriver +LIBNAME = ffb_dri.so +SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS)) +InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri) + +#ifdef GlxSoProf +SOPROF_LIBNAME = _ffb_dri_p +NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS)) +InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri) +#endif +#endif + +DependTarget() + diff --git a/xc/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc b/xc/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc new file mode 100644 index 000000000..527745977 --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc @@ -0,0 +1,150 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/ffb/Imakefile.inc,v 1.3 2002/02/22 21:32:58 dawes Exp $ + +#ifndef MesaDrvSrcDir +#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri +#endif + +MESADRVSRCDIR = MesaDrvSrcDir + +#ifndef MesaDrvFfbBuildDir +#define MesaDrvFfbBuildDir /**/ +#endif +MESADRVFFBBUILDDIR = MesaDrvFfbBuildDir + +#if Malloc0ReturnsNull +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL +#endif + +#if BuildXF86DRI + DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder + DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ + -I$(XINCLUDESRC) \ + -I$(GLXLIBSRC)/glx \ + -I$(GLXLIBSRC)/include \ + -I$(SERVERSRC)/GL/dri \ + -I$(XF86OSSRC) \ + -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(GLXLIBSRC)/dri/drm +#endif + +MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ + -I$(MESASRCDIR)/src/mesa/main \ + -I$(MESASRCDIR)/src/mesa/glapi \ + -I$(MESASRCDIR)/include \ + -I$(MESADRVSRCDIR)/common \ + -I$(MESADRVSRCDIR)/ffb + X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) + + FFBSRCS = $(MESADRVFFBBUILDDIR)ffb_bitmap.c \ + $(MESADRVFFBBUILDDIR)ffb_clear.c \ + $(MESADRVFFBBUILDDIR)ffb_dd.c \ + $(MESADRVFFBBUILDDIR)ffb_depth.c \ + /* $(MESADRVFFBBUILDDIR)ffb_fog.c */ \ + $(MESADRVFFBBUILDDIR)ffb_lines.c \ + $(MESADRVFFBBUILDDIR)ffb_points.c \ + $(MESADRVFFBBUILDDIR)ffb_span.c \ + $(MESADRVFFBBUILDDIR)ffb_state.c \ + $(MESADRVFFBBUILDDIR)ffb_stencil.c \ + $(MESADRVFFBBUILDDIR)ffb_tex.c \ + $(MESADRVFFBBUILDDIR)ffb_tris.c \ + $(MESADRVFFBBUILDDIR)ffb_vb.c \ + $(MESADRVFFBBUILDDIR)ffb_xmesa.c + + FFBOBJS = $(MESADRVFFBBUILDDIR)ffb_bitmap.o \ + $(MESADRVFFBBUILDDIR)ffb_clear.o \ + $(MESADRVFFBBUILDDIR)ffb_dd.o \ + $(MESADRVFFBBUILDDIR)ffb_depth.o \ + /* $(MESADRVFFBBUILDDIR)ffb_fog.o */ \ + $(MESADRVFFBBUILDDIR)ffb_lines.o \ + $(MESADRVFFBBUILDDIR)ffb_points.o \ + $(MESADRVFFBBUILDDIR)ffb_span.o \ + $(MESADRVFFBBUILDDIR)ffb_state.o \ + $(MESADRVFFBBUILDDIR)ffb_stencil.o \ + $(MESADRVFFBBUILDDIR)ffb_tex.o \ + $(MESADRVFFBBUILDDIR)ffb_tris.o \ + $(MESADRVFFBBUILDDIR)ffb_vb.o \ + $(MESADRVFFBBUILDDIR)ffb_xmesa.o + + FFBUOBJS = $(MESADRVFFBBUILDDIR)unshared/ffb_bitmap.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_clear.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_dd.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_depth.o \ + /* $(MESADRVFFBBUILDDIR)unshared/ffb_fog.o */ \ + $(MESADRVFFBBUILDDIR)unshared/ffb_lines.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_points.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_span.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_state.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_stencil.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_tex.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_tris.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_vb.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_xmesa.o + + FFBDOBJS = $(MESADRVFFBBUILDDIR)debugger/ffb_bitmap.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_clear.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_dd.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_depth.o \ + /* $(MESADRVFFBBUILDDIR)debugger/ffb_fog.o */ \ + $(MESADRVFFBBUILDDIR)debugger/ffb_lines.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_points.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_span.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_state.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_stencil.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_tex.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_tris.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_vb.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_xmesa.o + + FFBPOBJS = $(MESADRVFFBBUILDDIR)profiled/ffb_bitmap.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_clear.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_dd.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_depth.o \ + /* $(MESADRVFFBBUILDDIR)profiled/ffb_fog.o */ \ + $(MESADRVFFBBUILDDIR)profiled/ffb_lines.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_points.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_span.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_state.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_stencil.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_tex.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_tris.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_vb.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_xmesa.o + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(ffb_bitmap.c, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_bitmap.h, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_clear.c, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_clear.h, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_context.h, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_dd.c, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_dd.h, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_depth.c, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_depth.h, $(MESADRVSRCDIR)/ffb) +/* LinkSourceFile(ffb_fog.c, $(MESADRVSRCDIR)/ffb) */ +LinkSourceFile(ffb_fifo.h, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_lines.c, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_lines.h, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_linetmp.h, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_lock.h, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_points.c, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_points.h, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_pointtmp.h, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_rendertmp.h, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_span.c, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_span.h, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_state.c, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_state.h, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_stencil.c, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_stencil.h, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_tex.c, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_tex.h, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_tris.c, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_tris.h, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_tritmp.h, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_vb.c, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_vb.h, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_vbtmp.h, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_vtxfmt.h, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_xmesa.c, $(MESADRVSRCDIR)/ffb) +LinkSourceFile(ffb_xmesa.h, $(MESADRVSRCDIR)/ffb) +#endif diff --git a/xc/lib/GL/mesa/drivers/dri/gamma/Imakefile b/xc/lib/GL/mesa/drivers/dri/gamma/Imakefile new file mode 100644 index 000000000..edbd4b980 --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/gamma/Imakefile @@ -0,0 +1,84 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/gamma/Imakefile,v 1.25 2002/02/23 00:45:49 dawes Exp $ + +#include + +#if GlxUseBuiltInDRIDriver +#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) +#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) +#define DoExtraLib SharedLibGlx +#define DoDebugLib DebugLibGlx +#define DoProfileLib ProfileLibGlx +#else +#define DoNormalLib SharedLibGlxWithoutPIC +#define DoSharedLib !SharedLibGlxWithoutPIC +#define DoExtrasLib NO +#define DoDebugLib NO +#define DoProfileLib NO +#endif + +#define MesaDrvCommonBuildDir ../common/ +#include "../common/Imakefile.inc" +#include "../../../array_cache/Imakefile.inc" +#include "../../../main/Imakefile.inc" +#include "../../../math/Imakefile.inc" +#include "../../../swrast/Imakefile.inc" +#include "../../../swrast_setup/Imakefile.inc" +#include "../../../tnl/Imakefile.inc" +#include "../../../tnl_dd/Imakefile.inc" +#include "../../../Imakefile.inc" +#if defined(i386Architecture) && MesaUseX86Asm +#include "../../../x86/Imakefile.inc" +#endif +#ifdef SparcArchitecture +#include "../../../sparc/Imakefile.inc" +#endif +#define NeedToLinkMesaSrc +#include "Imakefile.inc" + + + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) + INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) + + DRIOBJS = $(GLXLIBSRC)/dri/dri_util.o \ + $(GLXLIBSRC)/dri/glcontextmodes.o + + DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ + $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ + $(GLXLIBSRC)/dri/drm/xf86drmRandom.o \ + $(GLXLIBSRC)/dri/drm/xf86drmSL.o + +#ifdef GlxSoProf + LOSRCS = ../../../../lowpc.c + HISRCS = ../../../../highpc.c + + LOOBJS = ../../../../lowpc.o + HIOBJS = ../../../../highpc.o +#endif + + SRCS = $(GAMMASRCS) + OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ + $(MESA_ASM_OBJS) $(COMMONOBJS) $(GAMMAOBJS) $(HIOBJS) + +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) StaticLibrary($(BUILDLIBDIR),expat) + +#include + +LibraryObjectRule() + +SubdirLibraryRule($(GAMMAOBJS)) +NormalLintTarget($(SRCS)) + +#if !GlxUseBuiltInDRIDriver +LIBNAME = gamma_dri.so +SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS)) +InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri) + +#ifdef GlxSoProf +SOPROF_LIBNAME = _gamma_dri_p +NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS)) +InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri) +#endif +#endif + +DependTarget() + diff --git a/xc/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc b/xc/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc new file mode 100644 index 000000000..ccc81a94e --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc @@ -0,0 +1,139 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/gamma/Imakefile.inc,v 1.2 2001/05/02 15:06:03 dawes Exp $ + +#ifndef MesaDrvSrcDir +#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri +#endif + +MESADRVSRCDIR = MesaDrvSrcDir + +#ifndef MesaDrvGammaBuildDir +#define MesaDrvGammaBuildDir /**/ +#endif +MESADRVGAMMABUILDDIR = MesaDrvGammaBuildDir + +#if Malloc0ReturnsNull +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL +#endif + +#if BuildXF86DRI + DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder + DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ + -I$(XINCLUDESRC) \ + -I$(GLXLIBSRC)/glx \ + -I$(GLXLIBSRC)/include \ + -I$(SERVERSRC)/GL/dri \ + -I$(XF86OSSRC) \ + -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(XF86DRIVERSRC)/glint \ + -I$(GLXLIBSRC)/dri/drm +#endif + +MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ + -I$(MESASRCDIR)/src/mesa/main \ + -I$(MESASRCDIR)/src/mesa/glapi \ + -I$(MESASRCDIR)/include \ + -I$(MESADRVSRCDIR)/common \ + -I$(MESADRVSRCDIR)/gamma + X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) + + + GAMMASRCS = $(MESADRVGAMMABUILDDIR)gamma_context.c \ + $(MESADRVGAMMABUILDDIR)gamma_dd.c \ + $(MESADRVGAMMABUILDDIR)gamma_inithw.c \ + $(MESADRVGAMMABUILDDIR)gamma_lock.c \ + $(MESADRVGAMMABUILDDIR)gamma_render.c \ + $(MESADRVGAMMABUILDDIR)gamma_screen.c \ + $(MESADRVGAMMABUILDDIR)gamma_span.c \ + $(MESADRVGAMMABUILDDIR)gamma_state.c \ + $(MESADRVGAMMABUILDDIR)gamma_tex.c \ + $(MESADRVGAMMABUILDDIR)gamma_texmem.c \ + $(MESADRVGAMMABUILDDIR)gamma_texstate.c \ + $(MESADRVGAMMABUILDDIR)gamma_tris.c \ + $(MESADRVGAMMABUILDDIR)gamma_vb.c \ + $(MESADRVGAMMABUILDDIR)gamma_xmesa.c + + GAMMAOBJS = $(MESADRVGAMMABUILDDIR)gamma_context.o \ + $(MESADRVGAMMABUILDDIR)gamma_dd.o \ + $(MESADRVGAMMABUILDDIR)gamma_inithw.o \ + $(MESADRVGAMMABUILDDIR)gamma_lock.o \ + $(MESADRVGAMMABUILDDIR)gamma_render.o \ + $(MESADRVGAMMABUILDDIR)gamma_screen.o \ + $(MESADRVGAMMABUILDDIR)gamma_span.o \ + $(MESADRVGAMMABUILDDIR)gamma_state.o \ + $(MESADRVGAMMABUILDDIR)gamma_tex.o \ + $(MESADRVGAMMABUILDDIR)gamma_texmem.o \ + $(MESADRVGAMMABUILDDIR)gamma_texstate.o \ + $(MESADRVGAMMABUILDDIR)gamma_tris.o \ + $(MESADRVGAMMABUILDDIR)gamma_vb.o \ + $(MESADRVGAMMABUILDDIR)gamma_xmesa.o + + GAMMAUOBJS = $(MESADRVGAMMABUILDDIR)unshared/gamma_context.o \ + $(MESADRVGAMMABUILDDIR)unshared/gamma_dd.o \ + $(MESADRVGAMMABUILDDIR)unshared/gamma_inithw.o \ + $(MESADRVGAMMABUILDDIR)unshared/gamma_lock.o \ + $(MESADRVGAMMABUILDDIR)unshared/gamma_render.o \ + $(MESADRVGAMMABUILDDIR)unshared/gamma_screen.o \ + $(MESADRVGAMMABUILDDIR)unshared/gamma_span.o \ + $(MESADRVGAMMABUILDDIR)unshared/gamma_state.o \ + $(MESADRVGAMMABUILDDIR)unshared/gamma_tex.o \ + $(MESADRVGAMMABUILDDIR)unshared/gamma_texmem.o \ + $(MESADRVGAMMABUILDDIR)unshared/gamma_texstate.o \ + $(MESADRVGAMMABUILDDIR)unshared/gamma_tris.o \ + $(MESADRVGAMMABUILDDIR)unshared/gamma_vb.o \ + $(MESADRVGAMMABUILDDIR)unshared/gamma_xmesa.o + + GAMMADOBJS = $(MESADRVGAMMABUILDDIR)debugger/gamma_context.o \ + $(MESADRVGAMMABUILDDIR)debugger/gamma_dd.o \ + $(MESADRVGAMMABUILDDIR)debugger/gamma_inithw.o \ + $(MESADRVGAMMABUILDDIR)debugger/gamma_lock.o \ + $(MESADRVGAMMABUILDDIR)debugger/gamma_render.o \ + $(MESADRVGAMMABUILDDIR)debugger/gamma_screen.o \ + $(MESADRVGAMMABUILDDIR)debugger/gamma_span.o \ + $(MESADRVGAMMABUILDDIR)debugger/gamma_state.o \ + $(MESADRVGAMMABUILDDIR)debugger/gamma_tex.o \ + $(MESADRVGAMMABUILDDIR)debugger/gamma_texmem.o \ + $(MESADRVGAMMABUILDDIR)debugger/gamma_texstate.o \ + $(MESADRVGAMMABUILDDIR)debugger/gamma_tris.o \ + $(MESADRVGAMMABUILDDIR)debugger/gamma_vb.o \ + $(MESADRVGAMMABUILDDIR)debugger/gamma_xmesa.o + + GAMMAPOBJS = $(MESADRVGAMMABUILDDIR)profiled/gamma_context.o \ + $(MESADRVGAMMABUILDDIR)profiled/gamma_dd.o \ + $(MESADRVGAMMABUILDDIR)profiled/gamma_inithw.o \ + $(MESADRVGAMMABUILDDIR)profiled/gamma_lock.o \ + $(MESADRVGAMMABUILDDIR)profiled/gamma_render.o \ + $(MESADRVGAMMABUILDDIR)profiled/gamma_screen.o \ + $(MESADRVGAMMABUILDDIR)profiled/gamma_span.o \ + $(MESADRVGAMMABUILDDIR)profiled/gamma_state.o \ + $(MESADRVGAMMABUILDDIR)profiled/gamma_tex.o \ + $(MESADRVGAMMABUILDDIR)profiled/gamma_texmem.o \ + $(MESADRVGAMMABUILDDIR)profiled/gamma_texstate.o \ + $(MESADRVGAMMABUILDDIR)profiled/gamma_tris.o \ + $(MESADRVGAMMABUILDDIR)profiled/gamma_vb.o \ + $(MESADRVGAMMABUILDDIR)profiled/gamma_xmesa.o + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(gamma_context.c, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_context.h, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_client.h, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_dd.c, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_inithw.c, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_lock.c, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_lock.h, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_macros.h, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_render.c, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_regs.h, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_screen.c, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_screen.h, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_span.c, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_state.c, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_tex.c, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_texmem.c, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_texstate.c, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_tris.c, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_tris.h, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_tritmp.h, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_vb.c, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_vb.h, $(MESADRVSRCDIR)/gamma) +LinkSourceFile(gamma_xmesa.c, $(MESADRVSRCDIR)/gamma) +#endif diff --git a/xc/lib/GL/mesa/drivers/dri/i810/Imakefile b/xc/lib/GL/mesa/drivers/dri/i810/Imakefile new file mode 100644 index 000000000..bfa7bd339 --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/i810/Imakefile @@ -0,0 +1,84 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i810/Imakefile,v 1.23tsi Exp $ + +#include + +#if GlxUseBuiltInDRIDriver +#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) +#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) +#define DoExtraLib SharedLibGlx +#define DoDebugLib DebugLibGlx +#define DoProfileLib ProfileLibGlx +#else +#define DoNormalLib SharedLibGlxWithoutPIC +#define DoSharedLib !SharedLibGlxWithoutPIC +#define DoExtrasLib NO +#define DoDebugLib NO +#define DoProfileLib NO +#endif + +#define MesaDrvCommonBuildDir ../common/ +#include "../common/Imakefile.inc" +#include "../../../array_cache/Imakefile.inc" +#include "../../../main/Imakefile.inc" +#include "../../../math/Imakefile.inc" +#include "../../../swrast/Imakefile.inc" +#include "../../../swrast_setup/Imakefile.inc" +#include "../../../tnl/Imakefile.inc" +#include "../../../tnl_dd/Imakefile.inc" +#include "../../../Imakefile.inc" +#if defined(i386Architecture) && MesaUseX86Asm +#include "../../../x86/Imakefile.inc" +#endif +#ifdef SparcArchitecture +#include "../../../sparc/Imakefile.inc" +#endif +#define NeedToLinkMesaSrc +#include "Imakefile.inc" + + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) + + INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) + + DRIOBJS = $(GLXLIBSRC)/dri/dri_util.o \ + $(GLXLIBSRC)/dri/glcontextmodes.o + + DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ + $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ + $(GLXLIBSRC)/dri/drm/xf86drmRandom.o \ + $(GLXLIBSRC)/dri/drm/xf86drmSL.o + +#ifdef GlxSoProf + LOSRCS = ../../../../lowpc.c + HISRCS = ../../../../highpc.c + + LOOBJS = ../../../../lowpc.o + HIOBJS = ../../../../highpc.o +#endif + + SRCS = $(I810SRCS) + OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ + $(MESA_ASM_OBJS) $(COMMONOBJS) $(I810OBJS) $(HIOBJS) + +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) StaticLibrary($(BUILDLIBDIR),expat) + +#include + +LibraryObjectRule() + +SubdirLibraryRule($(I810OBJS)) +NormalLintTarget($(SRCS)) + +#if !GlxUseBuiltInDRIDriver +LIBNAME = i810_dri.so +SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS)) +InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri) + +#ifdef GlxSoProf +SOPROF_LIBNAME = _i810_dri_p +NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS)) +InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri) +#endif +#endif + +DependTarget() + diff --git a/xc/lib/GL/mesa/drivers/dri/i810/Imakefile.inc b/xc/lib/GL/mesa/drivers/dri/i810/Imakefile.inc new file mode 100644 index 000000000..e133cb937 --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/i810/Imakefile.inc @@ -0,0 +1,120 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i810/Imakefile.inc,v 1.2 2001/05/02 15:06:03 dawes Exp $ + +#ifndef MesaDrvSrcDir +#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri +#endif + +MESADRVSRCDIR = MesaDrvSrcDir + +#ifndef MesaDrvI810BuildDir +#define MesaDrvI810BuildDir /**/ +#endif +MESADRVI810BUILDDIR = MesaDrvI810BuildDir + +#if Malloc0ReturnsNull +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL +#endif + +#if BuildXF86DRI + DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder + DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ + -I$(XINCLUDESRC) \ + -I$(GLXLIBSRC)/glx \ + -I$(GLXLIBSRC)/include \ + -I$(SERVERSRC)/GL/dri \ + -I$(XF86OSSRC) \ + -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(XF86DRIVERSRC)/i810 \ + -I$(GLXLIBSRC)/dri/drm +#endif + +MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ + -I$(MESASRCDIR)/src/mesa/main \ + -I$(MESASRCDIR)/src/mesa/glapi \ + -I$(MESASRCDIR)/include \ + -I$(MESADRVSRCDIR)/common \ + -I$(MESADRVSRCDIR)/i810 + X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) + + I810SRCS = $(MESADRVI810BUILDDIR)i810context.c \ + $(MESADRVI810BUILDDIR)i810ioctl.c \ + $(MESADRVI810BUILDDIR)i810render.c \ + $(MESADRVI810BUILDDIR)i810screen.c \ + $(MESADRVI810BUILDDIR)i810span.c \ + $(MESADRVI810BUILDDIR)i810state.c \ + $(MESADRVI810BUILDDIR)i810tex.c \ + $(MESADRVI810BUILDDIR)i810texmem.c \ + $(MESADRVI810BUILDDIR)i810texstate.c \ + $(MESADRVI810BUILDDIR)i810tris.c \ + $(MESADRVI810BUILDDIR)i810vb.c + + I810OBJS = $(MESADRVI810BUILDDIR)i810context.o \ + $(MESADRVI810BUILDDIR)i810ioctl.o \ + $(MESADRVI810BUILDDIR)i810render.o \ + $(MESADRVI810BUILDDIR)i810screen.o \ + $(MESADRVI810BUILDDIR)i810span.o \ + $(MESADRVI810BUILDDIR)i810state.o \ + $(MESADRVI810BUILDDIR)i810tex.o \ + $(MESADRVI810BUILDDIR)i810texmem.o \ + $(MESADRVI810BUILDDIR)i810texstate.o \ + $(MESADRVI810BUILDDIR)i810tris.o \ + $(MESADRVI810BUILDDIR)i810vb.o + + I810UOBJS = $(MESADRVI810BUILDDIR)unshared/i810context.o \ + $(MESADRVI810BUILDDIR)unshared/i810ioctl.o \ + $(MESADRVI810BUILDDIR)unshared/i810render.o \ + $(MESADRVI810BUILDDIR)unshared/i810screen.o \ + $(MESADRVI810BUILDDIR)unshared/i810span.o \ + $(MESADRVI810BUILDDIR)unshared/i810state.o \ + $(MESADRVI810BUILDDIR)unshared/i810tex.o \ + $(MESADRVI810BUILDDIR)unshared/i810texmem.o \ + $(MESADRVI810BUILDDIR)unshared/i810texstate.o \ + $(MESADRVI810BUILDDIR)unshared/i810tris.o \ + $(MESADRVI810BUILDDIR)unshared/i810vb.o + + I810DOBJS = $(MESADRVI810BUILDDIR)debugger/i810context.o \ + $(MESADRVI810BUILDDIR)debugger/i810ioctl.o \ + $(MESADRVI810BUILDDIR)debugger/i810render.o \ + $(MESADRVI810BUILDDIR)debugger/i810screen.o \ + $(MESADRVI810BUILDDIR)debugger/i810span.o \ + $(MESADRVI810BUILDDIR)debugger/i810state.o \ + $(MESADRVI810BUILDDIR)debugger/i810tex.o \ + $(MESADRVI810BUILDDIR)debugger/i810texmem.o \ + $(MESADRVI810BUILDDIR)debugger/i810texstate.o \ + $(MESADRVI810BUILDDIR)debugger/i810tris.o \ + $(MESADRVI810BUILDDIR)debugger/i810vb.o + + I810POBJS = $(MESADRVI810BUILDDIR)profiled/i810context.o \ + $(MESADRVI810BUILDDIR)profiled/i810ioctl.o \ + $(MESADRVI810BUILDDIR)profiled/i810render.o \ + $(MESADRVI810BUILDDIR)profiled/i810screen.o \ + $(MESADRVI810BUILDDIR)profiled/i810span.o \ + $(MESADRVI810BUILDDIR)profiled/i810state.o \ + $(MESADRVI810BUILDDIR)profiled/i810tex.o \ + $(MESADRVI810BUILDDIR)profiled/i810texmem.o \ + $(MESADRVI810BUILDDIR)profiled/i810texstate.o \ + $(MESADRVI810BUILDDIR)profiled/i810tris.o \ + $(MESADRVI810BUILDDIR)profiled/i810vb.o + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(i810_3d_reg.h, $(MESADRVSRCDIR)/i810) +LinkSourceFile(i810context.c, $(MESADRVSRCDIR)/i810) +LinkSourceFile(i810context.h, $(MESADRVSRCDIR)/i810) +LinkSourceFile(i810ioctl.c, $(MESADRVSRCDIR)/i810) +LinkSourceFile(i810ioctl.h, $(MESADRVSRCDIR)/i810) +LinkSourceFile(i810render.c, $(MESADRVSRCDIR)/i810) +LinkSourceFile(i810screen.c, $(MESADRVSRCDIR)/i810) +LinkSourceFile(i810screen.h, $(MESADRVSRCDIR)/i810) +LinkSourceFile(i810span.c, $(MESADRVSRCDIR)/i810) +LinkSourceFile(i810span.h, $(MESADRVSRCDIR)/i810) +LinkSourceFile(i810state.c, $(MESADRVSRCDIR)/i810) +LinkSourceFile(i810state.h, $(MESADRVSRCDIR)/i810) +LinkSourceFile(i810tex.c, $(MESADRVSRCDIR)/i810) +LinkSourceFile(i810tex.h, $(MESADRVSRCDIR)/i810) +LinkSourceFile(i810texmem.c, $(MESADRVSRCDIR)/i810) +LinkSourceFile(i810texstate.c, $(MESADRVSRCDIR)/i810) +LinkSourceFile(i810tris.c, $(MESADRVSRCDIR)/i810) +LinkSourceFile(i810tris.h, $(MESADRVSRCDIR)/i810) +LinkSourceFile(i810vb.c, $(MESADRVSRCDIR)/i810) +LinkSourceFile(i810vb.h, $(MESADRVSRCDIR)/i810) +#endif diff --git a/xc/lib/GL/mesa/drivers/dri/i830/Imakefile b/xc/lib/GL/mesa/drivers/dri/i830/Imakefile new file mode 100644 index 000000000..2507397b1 --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/i830/Imakefile @@ -0,0 +1,81 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i830/Imakefile,v 1.5tsi Exp $ + +#include + +#if GlxUseBuiltInDRIDriver +#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) +#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) +#define DoExtraLib SharedLibGlx +#define DoDebugLib DebugLibGlx +#define DoProfileLib ProfileLibGlx +#else +#define DoNormalLib SharedLibGlxWithoutPIC +#define DoSharedLib !SharedLibGlxWithoutPIC +#define DoExtrasLib NO +#define DoDebugLib NO +#define DoProfileLib NO +#endif + +#define MesaDrvCommonBuildDir ../common/ +#include "../common/Imakefile.inc" +#include "../../../array_cache/Imakefile.inc" +#include "../../../main/Imakefile.inc" +#include "../../../math/Imakefile.inc" +#include "../../../swrast/Imakefile.inc" +#include "../../../swrast_setup/Imakefile.inc" +#include "../../../tnl/Imakefile.inc" +#include "../../../tnl_dd/Imakefile.inc" +#include "../../../Imakefile.inc" +#if defined(i386Architecture) && MesaUseX86Asm +#include "../../../x86/Imakefile.inc" +#endif +#define NeedToLinkMesaSrc +#include "Imakefile.inc" + + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) + + INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) + + DRIOBJS = $(GLXLIBSRC)/dri/dri_util.o \ + $(GLXLIBSRC)/dri/glcontextmodes.o + + DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ + $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ + $(GLXLIBSRC)/dri/drm/xf86drmRandom.o \ + $(GLXLIBSRC)/dri/drm/xf86drmSL.o + +#ifdef GlxSoProf + LOSRCS = ../../../../lowpc.c + HISRCS = ../../../../highpc.c + + LOOBJS = ../../../../lowpc.o + HIOBJS = ../../../../highpc.o +#endif + + SRCS = $(I830SRCS) + OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ + $(MESA_ASM_OBJS) $(COMMONOBJS) $(I830OBJS) $(HIOBJS) + +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) StaticLibrary($(BUILDLIBDIR),expat) + +#include + +LibraryObjectRule() + +SubdirLibraryRule($(I830OBJS)) +NormalLintTarget($(SRCS)) + +#if !GlxUseBuiltInDRIDriver +LIBNAME = i830_dri.so +SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS)) +InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri) + +#ifdef GlxSoProf +SOPROF_LIBNAME = _i830_dri_p +NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS)) +InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri) +#endif +#endif + +DependTarget() + diff --git a/xc/lib/GL/mesa/drivers/dri/i830/Imakefile.inc b/xc/lib/GL/mesa/drivers/dri/i830/Imakefile.inc new file mode 100644 index 000000000..de97b2880 --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/i830/Imakefile.inc @@ -0,0 +1,127 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i830/Imakefile.inc,v 1.1 2001/10/04 18:28:21 alanh Exp $ + +#ifndef MesaDrvSrcDir +#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri +#endif + +MESADRVSRCDIR = MesaDrvSrcDir + +#ifndef MesaDrvI830BuildDir +#define MesaDrvI830BuildDir /**/ +#endif +MESADRVI830BUILDDIR = MesaDrvI830BuildDir + +#if Malloc0ReturnsNull +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL +#endif + +#if BuildXF86DRI + DRI_DEFINES = GlxDefines + DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ + -I$(XINCLUDESRC) \ + -I$(GLXLIBSRC)/glx \ + -I$(GLXLIBSRC)/include \ + -I$(SERVERSRC)/GL/dri \ + -I$(XF86OSSRC) \ + -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(XF86DRIVERSRC)/i810 \ + -I$(GLXLIBSRC)/dri/drm +#endif + +MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ + -I$(MESASRCDIR)/src/mesa/main \ + -I$(MESASRCDIR)/src/mesa/glapi \ + -I$(MESASRCDIR)/include \ + -I$(MESADRVSRCDIR)/common \ + -I$(MESADRVSRCDIR)/i830 + X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) + + I830SRCS = $(MESADRVI830BUILDDIR)i830_context.c \ + $(MESADRVI830BUILDDIR)i830_debug.c \ + $(MESADRVI830BUILDDIR)i830_ioctl.c \ + $(MESADRVI830BUILDDIR)i830_render.c \ + $(MESADRVI830BUILDDIR)i830_screen.c \ + $(MESADRVI830BUILDDIR)i830_span.c \ + $(MESADRVI830BUILDDIR)i830_state.c \ + $(MESADRVI830BUILDDIR)i830_tex.c \ + $(MESADRVI830BUILDDIR)i830_texmem.c \ + $(MESADRVI830BUILDDIR)i830_texstate.c \ + $(MESADRVI830BUILDDIR)i830_tris.c \ + $(MESADRVI830BUILDDIR)i830_vb.c + + I830OBJS = $(MESADRVI830BUILDDIR)i830_context.o \ + $(MESADRVI830BUILDDIR)i830_debug.o \ + $(MESADRVI830BUILDDIR)i830_ioctl.o \ + $(MESADRVI830BUILDDIR)i830_render.o \ + $(MESADRVI830BUILDDIR)i830_screen.o \ + $(MESADRVI830BUILDDIR)i830_span.o \ + $(MESADRVI830BUILDDIR)i830_state.o \ + $(MESADRVI830BUILDDIR)i830_tex.o \ + $(MESADRVI830BUILDDIR)i830_texmem.o \ + $(MESADRVI830BUILDDIR)i830_texstate.o \ + $(MESADRVI830BUILDDIR)i830_tris.o \ + $(MESADRVI830BUILDDIR)i830_vb.o + + I830UOBJS = $(MESADRVI830BUILDDIR)unshared/i830_context.o \ + $(MESADRVI830BUILDDIR)unshared/i830_debug.o \ + $(MESADRVI830BUILDDIR)unshared/i830_ioctl.o \ + $(MESADRVI830BUILDDIR)unshared/i830_render.o \ + $(MESADRVI830BUILDDIR)unshared/i830_screen.o \ + $(MESADRVI830BUILDDIR)unshared/i830_span.o \ + $(MESADRVI830BUILDDIR)unshared/i830_state.o \ + $(MESADRVI830BUILDDIR)unshared/i830_tex.o \ + $(MESADRVI830BUILDDIR)unshared/i830_texmem.o \ + $(MESADRVI830BUILDDIR)unshared/i830_texstate.o \ + $(MESADRVI830BUILDDIR)unshared/i830_tris.o \ + $(MESADRVI830BUILDDIR)unshared/i830_vb.o + + I830DOBJS = $(MESADRVI830BUILDDIR)debugger/i830_context.o \ + $(MESADRVI830BUILDDIR)debugger/i830_debug.o \ + $(MESADRVI830BUILDDIR)debugger/i830_ioctl.o \ + $(MESADRVI830BUILDDIR)debugger/i830_render.o \ + $(MESADRVI830BUILDDIR)debugger/i830_screen.o \ + $(MESADRVI830BUILDDIR)debugger/i830_span.o \ + $(MESADRVI830BUILDDIR)debugger/i830_state.o \ + $(MESADRVI830BUILDDIR)debugger/i830_tex.o \ + $(MESADRVI830BUILDDIR)debugger/i830_texmem.o \ + $(MESADRVI830BUILDDIR)debugger/i830_texstate.o \ + $(MESADRVI830BUILDDIR)debugger/i830_tris.o \ + $(MESADRVI830BUILDDIR)debugger/i830_vb.o + + I830POBJS = $(MESADRVI830BUILDDIR)profiled/i830_context.o \ + $(MESADRVI830BUILDDIR)profiled/i830_debug.o \ + $(MESADRVI830BUILDDIR)profiled/i830_ioctl.o \ + $(MESADRVI830BUILDDIR)profiled/i830_render.o \ + $(MESADRVI830BUILDDIR)profiled/i830_screen.o \ + $(MESADRVI830BUILDDIR)profiled/i830_span.o \ + $(MESADRVI830BUILDDIR)profiled/i830_state.o \ + $(MESADRVI830BUILDDIR)profiled/i830_tex.o \ + $(MESADRVI830BUILDDIR)profiled/i830_texmem.o \ + $(MESADRVI830BUILDDIR)profiled/i830_texstate.o \ + $(MESADRVI830BUILDDIR)profiled/i830_tris.o \ + $(MESADRVI830BUILDDIR)profiled/i830_vb.o + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(i830_3d_reg.h, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_context.c, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_context.h, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_debug.c, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_debug.h, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_ioctl.c, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_ioctl.h, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_render.c, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_screen.c, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_screen.h, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_span.c, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_span.h, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_state.c, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_state.h, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_tex.c, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_tex.h, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_texmem.c, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_texstate.c, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_tris.c, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_tris.h, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_vb.c, $(MESADRVSRCDIR)/i830) +LinkSourceFile(i830_vb.h, $(MESADRVSRCDIR)/i830) +#endif diff --git a/xc/lib/GL/mesa/drivers/dri/mga/Imakefile b/xc/lib/GL/mesa/drivers/dri/mga/Imakefile new file mode 100644 index 000000000..c385705fd --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/mga/Imakefile @@ -0,0 +1,85 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/mga/Imakefile,v 1.22 2002/02/23 00:45:50 dawes Exp $ + +#include + +#if GlxUseBuiltInDRIDriver +#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) +#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) +#define DoExtraLib SharedLibGlx +#define DoDebugLib DebugLibGlx +#define DoProfileLib ProfileLibGlx +#else +#define DoNormalLib SharedLibGlxWithoutPIC +#define DoSharedLib !SharedLibGlxWithoutPIC +#define DoExtrasLib NO +#define DoDebugLib NO +#define DoProfileLib NO +#endif + +#define MesaDrvCommonBuildDir ../common/ +#include "../common/Imakefile.inc" +#include "../../../array_cache/Imakefile.inc" +#include "../../../main/Imakefile.inc" +#include "../../../math/Imakefile.inc" +#include "../../../swrast/Imakefile.inc" +#include "../../../swrast_setup/Imakefile.inc" +#include "../../../tnl/Imakefile.inc" +#include "../../../tnl_dd/Imakefile.inc" +#include "../../../Imakefile.inc" +#if defined(i386Architecture) && MesaUseX86Asm +#include "../../../x86/Imakefile.inc" +#endif +#ifdef SparcArchitecture +#include "../../../sparc/Imakefile.inc" +#endif +#define NeedToLinkMesaSrc +#include "Imakefile.inc" + + + + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) + INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) + + DRIOBJS = $(GLXLIBSRC)/dri/dri_util.o \ + $(GLXLIBSRC)/dri/glcontextmodes.o + + DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ + $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ + $(GLXLIBSRC)/dri/drm/xf86drmRandom.o \ + $(GLXLIBSRC)/dri/drm/xf86drmSL.o + +#ifdef GlxSoProf + LOSRCS = ../../../../lowpc.c + HISRCS = ../../../../highpc.c + + LOOBJS = ../../../../lowpc.o + HIOBJS = ../../../../highpc.o +#endif + + SRCS = $(MGASRCS) + OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ + $(MESA_ASM_OBJS) $(COMMONOBJS) $(MGAOBJS) $(HIOBJS) + +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) StaticLibrary($(BUILDLIBDIR),expat) + +#include + +LibraryObjectRule() + +SubdirLibraryRule($(MGAOBJS)) +NormalLintTarget($(SRCS)) + +#if !GlxUseBuiltInDRIDriver +LIBNAME = mga_dri.so +SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS)) +InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri) + +#ifdef GlxSoProf +SOPROF_LIBNAME = _mga_dri_p +NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS)) +InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri) +#endif +#endif + +DependTarget() + diff --git a/xc/lib/GL/mesa/drivers/dri/mga/Imakefile.inc b/xc/lib/GL/mesa/drivers/dri/mga/Imakefile.inc new file mode 100644 index 000000000..50ac1062c --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/mga/Imakefile.inc @@ -0,0 +1,134 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/mga/Imakefile.inc,v 1.2 2001/05/02 15:06:03 dawes Exp $ + +#ifndef MesaDrvSrcDir +#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/src/drv +#endif + +MESADRVSRCDIR = MesaDrvSrcDir + +#ifndef MesaDrvMgaBuildDir +#define MesaDrvMgaBuildDir /**/ +#endif +MESADRVMGABUILDDIR = MesaDrvMgaBuildDir + +#if Malloc0ReturnsNull +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL +#endif + +#if BuildXF86DRI + DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder + DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ + -I$(XINCLUDESRC) \ + -I$(GLXLIBSRC)/glx \ + -I$(GLXLIBSRC)/include \ + -I$(SERVERSRC)/GL/dri \ + -I$(XF86OSSRC) \ + -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(XF86DRIVERSRC)/mga \ + -I$(GLXLIBSRC)/dri/drm +#endif + +MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ + -I$(MESASRCDIR)/src/mesa/main \ + -I$(MESASRCDIR)/src/mesa/glapi \ + -I$(MESASRCDIR)/include \ + -I$(MESADRVSRCDIR)/common \ + -I$(MESADRVSRCDIR)/mga + X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) + + MGASRCS = $(MESADRVMGABUILDDIR)mgadd.c \ + $(MESADRVMGABUILDDIR)mgarender.c \ + $(MESADRVMGABUILDDIR)mgaioctl.c \ + $(MESADRVMGABUILDDIR)mgapixel.c \ + $(MESADRVMGABUILDDIR)mgaspan.c \ + $(MESADRVMGABUILDDIR)mgastate.c \ + $(MESADRVMGABUILDDIR)mgatex.c \ + $(MESADRVMGABUILDDIR)mga_texcombine.c \ + $(MESADRVMGABUILDDIR)mgatexmem.c \ + $(MESADRVMGABUILDDIR)mga_texstate.c \ + $(MESADRVMGABUILDDIR)mgatris.c \ + $(MESADRVMGABUILDDIR)mgavb.c \ + $(MESADRVMGABUILDDIR)mga_xmesa.c \ + + MGAOBJS = $(MESADRVMGABUILDDIR)mgadd.o \ + $(MESADRVMGABUILDDIR)mgarender.o \ + $(MESADRVMGABUILDDIR)mgaioctl.o \ + $(MESADRVMGABUILDDIR)mgapixel.o \ + $(MESADRVMGABUILDDIR)mgaspan.o \ + $(MESADRVMGABUILDDIR)mgastate.o \ + $(MESADRVMGABUILDDIR)mgatex.o \ + $(MESADRVMGABUILDDIR)mga_texcombine.o \ + $(MESADRVMGABUILDDIR)mgatexmem.o \ + $(MESADRVMGABUILDDIR)mga_texstate.o \ + $(MESADRVMGABUILDDIR)mgatris.o \ + $(MESADRVMGABUILDDIR)mgavb.o \ + $(MESADRVMGABUILDDIR)mga_xmesa.o + + MGAUOBJS = $(MESADRVMGABUILDDIR)unshared/mgadd.o \ + $(MESADRVMGABUILDDIR)unshared/mgarender.o \ + $(MESADRVMGABUILDDIR)unshared/mgaioctl.o \ + $(MESADRVMGABUILDDIR)unshared/mgapixel.o \ + $(MESADRVMGABUILDDIR)unshared/mgaspan.o \ + $(MESADRVMGABUILDDIR)unshared/mgastate.o \ + $(MESADRVMGABUILDDIR)unshared/mgatex.o \ + $(MESADRVMGABUILDDIR)unshared/mga_texcombine.o \ + $(MESADRVMGABUILDDIR)unshared/mgatexmem.o \ + $(MESADRVMGABUILDDIR)unshared/mga_texstate.o \ + $(MESADRVMGABUILDDIR)unshared/mgatris.o \ + $(MESADRVMGABUILDDIR)unshared/mgavb.o \ + $(MESADRVMGABUILDDIR)unshared/mga_xmesa.o + + MGADOBJS = $(MESADRVMGABUILDDIR)debugger/mgadd.o \ + $(MESADRVMGABUILDDIR)debugger/mgarender.o \ + $(MESADRVMGABUILDDIR)debugger/mgaioctl.o \ + $(MESADRVMGABUILDDIR)debugger/mgapixel.o \ + $(MESADRVMGABUILDDIR)debugger/mgaspan.o \ + $(MESADRVMGABUILDDIR)debugger/mgastate.o \ + $(MESADRVMGABUILDDIR)debugger/mgatex.o \ + $(MESADRVMGABUILDDIR)debugger/mga_texcombine.o \ + $(MESADRVMGABUILDDIR)debugger/mgatexmem.o \ + $(MESADRVMGABUILDDIR)debugger/mga_texstate.o \ + $(MESADRVMGABUILDDIR)debugger/mgatris.o \ + $(MESADRVMGABUILDDIR)debugger/mgavb.o \ + $(MESADRVMGABUILDDIR)debugger/mga_xmesa.o + + MGAPOBJS = $(MESADRVMGABUILDDIR)profiled/mgadd.o \ + $(MESADRVMGABUILDDIR)profiled/mgarender.o \ + $(MESADRVMGABUILDDIR)profiled/mgaioctl.o \ + $(MESADRVMGABUILDDIR)profiled/mgapixel.o \ + $(MESADRVMGABUILDDIR)profiled/mgaspan.o \ + $(MESADRVMGABUILDDIR)profiled/mgastate.o \ + $(MESADRVMGABUILDDIR)profiled/mgatex.o \ + $(MESADRVMGABUILDDIR)profiled/mga_texcombine.o \ + $(MESADRVMGABUILDDIR)profiled/mgatexmem.o \ + $(MESADRVMGABUILDDIR)profiled/mga_texstate.o \ + $(MESADRVMGABUILDDIR)profiled/mgatris.o \ + $(MESADRVMGABUILDDIR)profiled/mgavb.o \ + $(MESADRVMGABUILDDIR)profiled/mga_xmesa.o + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(mgacontext.h, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mgadd.c, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mgadd.h, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mgaioctl.c, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mgaioctl.h, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mgapixel.c, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mgapixel.h, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mgarender.c, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mgaregs.h, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mgaspan.c, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mgaspan.h, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mgastate.c, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mgastate.h, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mgatex.c, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mgatex.h, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mga_texcombine.c, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mgatexmem.c, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mga_texstate.c, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mgatris.c, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mgatris.h, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mgavb.c, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mgavb.h, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mga_xmesa.c, $(MESADRVSRCDIR)/mga) +LinkSourceFile(mga_xmesa.h, $(MESADRVSRCDIR)/mga) +#endif diff --git a/xc/lib/GL/mesa/drivers/dri/r128/Imakefile b/xc/lib/GL/mesa/drivers/dri/r128/Imakefile new file mode 100644 index 000000000..cb44cbc43 --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/r128/Imakefile @@ -0,0 +1,84 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r128/Imakefile,v 1.19 2002/02/23 00:45:50 dawes Exp $ + +#include + +#if GlxUseBuiltInDRIDriver +#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) +#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) +#define DoExtraLib SharedLibGlx +#define DoDebugLib DebugLibGlx +#define DoProfileLib ProfileLibGlx +#else +#define DoNormalLib SharedLibGlxWithoutPIC +#define DoSharedLib !SharedLibGlxWithoutPIC +#define DoExtrasLib NO +#define DoDebugLib NO +#define DoProfileLib NO +#endif + +#define MesaDrvCommonBuildDir ../common/ +#include "../common/Imakefile.inc" +#include "../../../array_cache/Imakefile.inc" +#include "../../../main/Imakefile.inc" +#include "../../../math/Imakefile.inc" +#include "../../../swrast/Imakefile.inc" +#include "../../../swrast_setup/Imakefile.inc" +#include "../../../tnl/Imakefile.inc" +#include "../../../tnl_dd/Imakefile.inc" +#include "../../../Imakefile.inc" +#if defined(i386Architecture) && MesaUseX86Asm +#include "../../../x86/Imakefile.inc" +#endif +#ifdef SparcArchitecture +#include "../../../sparc/Imakefile.inc" +#endif +#define NeedToLinkMesaSrc +#include "Imakefile.inc" + + + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) + INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) + + DRIOBJS = $(GLXLIBSRC)/dri/dri_util.o \ + $(GLXLIBSRC)/dri/glcontextmodes.o + + DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ + $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ + $(GLXLIBSRC)/dri/drm/xf86drmRandom.o \ + $(GLXLIBSRC)/dri/drm/xf86drmSL.o + +#ifdef GlxSoProf + LOSRCS = ../../../../lowpc.c + HISRCS = ../../../../highpc.c + + LOOBJS = ../../../../lowpc.o + HIOBJS = ../../../../highpc.o +#endif + + SRCS = $(R128SRCS) + OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ + $(MESA_ASM_OBJS) $(COMMONOBJS) $(R128OBJS) $(HIOBJS) + +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) StaticLibrary($(BUILDLIBDIR),expat) + +#include + +LibraryObjectRule() + +SubdirLibraryRule($(R128OBJS)) +NormalLintTarget($(SRCS)) + +#if !GlxUseBuiltInDRIDriver +LIBNAME = r128_dri.so +SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS)) +InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri) + +#ifdef GlxSoProf +SOPROF_LIBNAME = _r128_dri_p +NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS)) +InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri) +#endif +#endif + +DependTarget() + diff --git a/xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc b/xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc new file mode 100644 index 000000000..96db65086 --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc @@ -0,0 +1,129 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r128/Imakefile.inc,v 1.3 2001/05/02 15:06:04 dawes Exp $ + +#ifndef MesaDrvSrcDir +#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri +#endif + +MESADRVSRCDIR = MesaDrvSrcDir + +#ifndef MesaDrvR128BuildDir +#define MesaDrvR128BuildDir /**/ +#endif +MESADRVR128BUILDDIR = MesaDrvR128BuildDir + +#if Malloc0ReturnsNull +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL +#endif + +#if BuildXF86DRI + DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder + DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ + -I$(XINCLUDESRC) \ + -I$(GLXLIBSRC)/glx \ + -I$(GLXLIBSRC)/include \ + -I$(SERVERSRC)/GL/dri \ + -I$(XF86OSSRC) \ + -I$(XF86COMSRC) \ + -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(XF86DRIVERSRC)/ati \ + -I$(GLXLIBSRC)/dri/drm +#endif + +MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ + -I$(MESASRCDIR)/src/mesa/main \ + -I$(MESASRCDIR)/src/mesa/glapi \ + -I$(MESASRCDIR)/include \ + -I$(MESADRVSRCDIR)/common \ + -I$(MESADRVSRCDIR)/r128 + X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) + + R128SRCS = $(MESADRVR128BUILDDIR)r128_context.c \ + $(MESADRVR128BUILDDIR)r128_dd.c \ + $(MESADRVR128BUILDDIR)r128_ioctl.c \ + $(MESADRVR128BUILDDIR)r128_lock.c \ + $(MESADRVR128BUILDDIR)r128_screen.c \ + $(MESADRVR128BUILDDIR)r128_span.c \ + $(MESADRVR128BUILDDIR)r128_state.c \ + $(MESADRVR128BUILDDIR)r128_tex.c \ + $(MESADRVR128BUILDDIR)r128_texmem.c \ + $(MESADRVR128BUILDDIR)r128_texstate.c \ + $(MESADRVR128BUILDDIR)r128_tris.c \ + $(MESADRVR128BUILDDIR)r128_vb.c + + R128OBJS = $(MESADRVR128BUILDDIR)r128_context.o \ + $(MESADRVR128BUILDDIR)r128_dd.o \ + $(MESADRVR128BUILDDIR)r128_ioctl.o \ + $(MESADRVR128BUILDDIR)r128_lock.o \ + $(MESADRVR128BUILDDIR)r128_screen.o \ + $(MESADRVR128BUILDDIR)r128_span.o \ + $(MESADRVR128BUILDDIR)r128_state.o \ + $(MESADRVR128BUILDDIR)r128_tex.o \ + $(MESADRVR128BUILDDIR)r128_texmem.o \ + $(MESADRVR128BUILDDIR)r128_texstate.o \ + $(MESADRVR128BUILDDIR)r128_tris.o \ + $(MESADRVR128BUILDDIR)r128_vb.o + + R128UOBJS = $(MESADRVR128BUILDDIR)unshared/r128_context.o \ + $(MESADRVR128BUILDDIR)unshared/r128_dd.o \ + $(MESADRVR128BUILDDIR)unshared/r128_ioctl.o \ + $(MESADRVR128BUILDDIR)unshared/r128_lock.o \ + $(MESADRVR128BUILDDIR)unshared/r128_screen.o \ + $(MESADRVR128BUILDDIR)unshared/r128_span.o \ + $(MESADRVR128BUILDDIR)unshared/r128_state.o \ + $(MESADRVR128BUILDDIR)unshared/r128_tex.o \ + $(MESADRVR128BUILDDIR)unshared/r128_texmem.o \ + $(MESADRVR128BUILDDIR)unshared/r128_texstate.o \ + $(MESADRVR128BUILDDIR)unshared/r128_tris.o \ + $(MESADRVR128BUILDDIR)unshared/r128_vb.o + + R128DOBJS = $(MESADRVR128BUILDDIR)debugger/r128_context.o \ + $(MESADRVR128BUILDDIR)debugger/r128_dd.o \ + $(MESADRVR128BUILDDIR)debugger/r128_ioctl.o \ + $(MESADRVR128BUILDDIR)debugger/r128_lock.o \ + $(MESADRVR128BUILDDIR)debugger/r128_screen.o \ + $(MESADRVR128BUILDDIR)debugger/r128_span.o \ + $(MESADRVR128BUILDDIR)debugger/r128_state.o \ + $(MESADRVR128BUILDDIR)debugger/r128_tex.o \ + $(MESADRVR128BUILDDIR)debugger/r128_texmem.o \ + $(MESADRVR128BUILDDIR)debugger/r128_texstate.o \ + $(MESADRVR128BUILDDIR)debugger/r128_tris.o \ + $(MESADRVR128BUILDDIR)debugger/r128_vb.o + + R128POBJS = $(MESADRVR128BUILDDIR)profiled/r128_context.o \ + $(MESADRVR128BUILDDIR)profiled/r128_dd.o \ + $(MESADRVR128BUILDDIR)profiled/r128_ioctl.o \ + $(MESADRVR128BUILDDIR)profiled/r128_lock.o \ + $(MESADRVR128BUILDDIR)profiled/r128_screen.o \ + $(MESADRVR128BUILDDIR)profiled/r128_span.o \ + $(MESADRVR128BUILDDIR)profiled/r128_state.o \ + $(MESADRVR128BUILDDIR)profiled/r128_tex.o \ + $(MESADRVR128BUILDDIR)profiled/r128_texmem.o \ + $(MESADRVR128BUILDDIR)profiled/r128_texstate.o \ + $(MESADRVR128BUILDDIR)profiled/r128_tris.o \ + $(MESADRVR128BUILDDIR)profiled/r128_vb.o + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(r128_context.c, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_context.h, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_dd.c, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_dd.h, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_ioctl.c, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_ioctl.h, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_lock.c, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_lock.h, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_screen.c, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_screen.h, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_span.c, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_span.h, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_state.c, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_state.h, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_tex.c, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_tex.h, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_texmem.c, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_texobj.h, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_texstate.c, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_tris.c, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_tris.h, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_vb.c, $(MESADRVSRCDIR)/r128) +LinkSourceFile(r128_vb.h, $(MESADRVSRCDIR)/r128) +#endif diff --git a/xc/lib/GL/mesa/drivers/dri/r200/Imakefile b/xc/lib/GL/mesa/drivers/dri/r200/Imakefile new file mode 100644 index 000000000..a5fc730a8 --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/r200/Imakefile @@ -0,0 +1,83 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r200/Imakefile,v 1.9 2002/02/23 00:45:50 dawes Exp $ + +#include + +#if GlxUseBuiltInDRIDriver +#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) +#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) +#define DoExtraLib SharedLibGlx +#define DoDebugLib DebugLibGlx +#define DoProfileLib ProfileLibGlx +#else +#define DoNormalLib SharedLibGlxWithoutPIC +#define DoSharedLib !SharedLibGlxWithoutPIC +#define DoExtrasLib NO +#define DoDebugLib NO +#define DoProfileLib NO +#endif + +#define MesaDrvCommonBuildDir ../common/ +#include "../common/Imakefile.inc" +#include "../../../array_cache/Imakefile.inc" +#include "../../../main/Imakefile.inc" +#include "../../../math/Imakefile.inc" +#include "../../../swrast/Imakefile.inc" +#include "../../../swrast_setup/Imakefile.inc" +#include "../../../tnl/Imakefile.inc" +#include "../../../tnl_dd/Imakefile.inc" +#include "../../../Imakefile.inc" +#if defined(i386Architecture) && MesaUseX86Asm +#include "../../../x86/Imakefile.inc" +#endif +#ifdef SparcArchitecture +#include "../../../sparc/Imakefile.inc" +#endif +#define NeedToLinkMesaSrc +#include "Imakefile.inc" + + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) + INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) + + DRIOBJS = $(GLXLIBSRC)/dri/dri_util.o \ + $(GLXLIBSRC)/dri/glcontextmodes.o + + DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ + $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ + $(GLXLIBSRC)/dri/drm/xf86drmRandom.o \ + $(GLXLIBSRC)/dri/drm/xf86drmSL.o + +#ifdef GlxSoProf + LOSRCS = ../../../../lowpc.c + HISRCS = ../../../../highpc.c + + LOOBJS = ../../../../lowpc.o + HIOBJS = ../../../../highpc.o +#endif + + SRCS = $(R200SRCS) + OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ + $(MESA_ASM_OBJS) $(COMMONOBJS) $(R200OBJS) $(HIOBJS) + +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) StaticLibrary($(BUILDLIBDIR),expat) + +#include + +LibraryObjectRule() + +SubdirLibraryRule($(R200OBJS)) +NormalLintTarget($(SRCS)) + +#if !GlxUseBuiltInDRIDriver +LIBNAME = r200_dri.so +SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS)) +InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri) + +#ifdef GlxSoProf +SOPROF_LIBNAME = _r200_dri_p +NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS)) +InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri) +#endif +#endif + +DependTarget() + diff --git a/xc/lib/GL/mesa/drivers/dri/r200/Imakefile.inc b/xc/lib/GL/mesa/drivers/dri/r200/Imakefile.inc new file mode 100644 index 000000000..3bb2d92a8 --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/r200/Imakefile.inc @@ -0,0 +1,199 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r200/Imakefile.inc,v 1.2 2001/05/02 15:06:04 dawes Exp $ + +#ifndef MesaDrvSrcDir +#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri +#endif + +MESADRVSRCDIR = MesaDrvSrcDir + +#ifndef MesaDrvR200BuildDir +#define MesaDrvR200BuildDir /**/ +#endif +MESADRVR200BUILDDIR = MesaDrvR200BuildDir + +#if Malloc0ReturnsNull +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL +#endif + +#if BuildXF86DRI + DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder + DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ + -I$(XINCLUDESRC) \ + -I$(GLXLIBSRC)/glx \ + -I$(GLXLIBSRC)/include \ + -I$(SERVERSRC)/GL/dri \ + -I$(XF86COMSRC) \ + -I$(XF86OSSRC) \ + -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(XF86DRIVERSRC)/ati \ + -I$(GLXLIBSRC)/dri/drm +#endif + +MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ + -I$(MESASRCDIR)/src/mesa/main \ + -I$(MESASRCDIR)/src/mesa/glapi \ + -I$(MESASRCDIR)/include \ + -I$(MESADRVSRCDIR)/common \ + -I$(MESADRVSRCDIR)/r200 + X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) + + R200SRCS = $(MESADRVR200BUILDDIR)r200_context.c \ + $(MESADRVR200BUILDDIR)r200_sanity.c \ + $(MESADRVR200BUILDDIR)r200_state.c \ + $(MESADRVR200BUILDDIR)r200_state_init.c \ + $(MESADRVR200BUILDDIR)r200_swtcl.c \ + $(MESADRVR200BUILDDIR)r200_cmdbuf.c \ + $(MESADRVR200BUILDDIR)r200_ioctl.c \ + $(MESADRVR200BUILDDIR)r200_lock.c \ + $(MESADRVR200BUILDDIR)r200_maos.c \ + $(MESADRVR200BUILDDIR)r200_pixel.c \ + $(MESADRVR200BUILDDIR)r200_screen.c \ + $(MESADRVR200BUILDDIR)r200_span.c \ + $(MESADRVR200BUILDDIR)r200_tcl.c \ + $(MESADRVR200BUILDDIR)r200_tex.c \ + $(MESADRVR200BUILDDIR)r200_texmem.c \ + $(MESADRVR200BUILDDIR)r200_texstate.c \ + $(MESADRVR200BUILDDIR)r200_vtxfmt.c \ + $(MESADRVR200BUILDDIR)r200_vtxfmt_x86.c \ + $(MESADRVR200BUILDDIR)r200_vtxtmp_x86.S \ + $(MESADRVR200BUILDDIR)r200_vtxfmt_sse.c \ + $(MESADRVR200BUILDDIR)r200_vtxfmt_c.c + + R200OBJS = $(MESADRVR200BUILDDIR)r200_context.o \ + $(MESADRVR200BUILDDIR)r200_sanity.o \ + $(MESADRVR200BUILDDIR)r200_state.o \ + $(MESADRVR200BUILDDIR)r200_state_init.o \ + $(MESADRVR200BUILDDIR)r200_swtcl.o \ + $(MESADRVR200BUILDDIR)r200_cmdbuf.o \ + $(MESADRVR200BUILDDIR)r200_ioctl.o \ + $(MESADRVR200BUILDDIR)r200_lock.o \ + $(MESADRVR200BUILDDIR)r200_maos.o \ + $(MESADRVR200BUILDDIR)r200_pixel.o \ + $(MESADRVR200BUILDDIR)r200_screen.o \ + $(MESADRVR200BUILDDIR)r200_span.o \ + $(MESADRVR200BUILDDIR)r200_tcl.o \ + $(MESADRVR200BUILDDIR)r200_tex.o \ + $(MESADRVR200BUILDDIR)r200_texmem.o \ + $(MESADRVR200BUILDDIR)r200_texstate.o \ + $(MESADRVR200BUILDDIR)r200_vtxfmt.o \ + $(MESADRVR200BUILDDIR)r200_vtxfmt_c.o + +#ifdef i386Architecture + R200OBJS += $(MESADRVR200BUILDDIR)r200_vtxfmt_x86.o \ + $(MESADRVR200BUILDDIR)r200_vtxtmp_x86.o \ + $(MESADRVR200BUILDDIR)r200_vtxfmt_sse.o +#endif + + R200UOBJS = $(MESADRVR200BUILDDIR)unshared/r200_context.o \ + $(MESADRVR200BUILDDIR)unshared/r200_sanity.o \ + $(MESADRVR200BUILDDIR)unshared/r200_cmdbuf.o \ + $(MESADRVR200BUILDDIR)unshared/r200_ioctl.o \ + $(MESADRVR200BUILDDIR)unshared/r200_lock.o \ + $(MESADRVR200BUILDDIR)unshared/r200_maos.o \ + $(MESADRVR200BUILDDIR)unshared/r200_pixel.o \ + $(MESADRVR200BUILDDIR)unshared/r200_screen.o \ + $(MESADRVR200BUILDDIR)unshared/r200_span.o \ + $(MESADRVR200BUILDDIR)unshared/r200_state.o \ + $(MESADRVR200BUILDDIR)unshared/r200_state_init.o \ + $(MESADRVR200BUILDDIR)unshared/r200_swtcl.o \ + $(MESADRVR200BUILDDIR)unshared/r200_tcl.o \ + $(MESADRVR200BUILDDIR)unshared/r200_tex.o \ + $(MESADRVR200BUILDDIR)unshared/r200_texmem.o \ + $(MESADRVR200BUILDDIR)unshared/r200_texstate.o \ + $(MESADRVR200BUILDDIR)unshared/r200_vtxfmt.o \ + $(MESADRVR200BUILDDIR)unshared/r200_vtxfmt_c.o + +#ifdef i386Architecture + R200UOBJS += $(MESADRVR200BUILDDIR)unshared/r200_vtxfmt_x86.o \ + $(MESADRVR200BUILDDIR)unshared/r200_vtxtmp_x86.o \ + $(MESADRVR200BUILDDIR)unshared/r200_vtxfmt_sse.o +#endif + + R200DOBJS = $(MESADRVR200BUILDDIR)debugger/r200_context.o \ + $(MESADRVR200BUILDDIR)debugger/r200_sanity.o \ + $(MESADRVR200BUILDDIR)debugger/r200_cmdbuf.o \ + $(MESADRVR200BUILDDIR)debugger/r200_ioctl.o \ + $(MESADRVR200BUILDDIR)debugger/r200_lock.o \ + $(MESADRVR200BUILDDIR)debugger/r200_maos.o \ + $(MESADRVR200BUILDDIR)debugger/r200_pixel.o \ + $(MESADRVR200BUILDDIR)debugger/r200_screen.o \ + $(MESADRVR200BUILDDIR)debugger/r200_span.o \ + $(MESADRVR200BUILDDIR)debugger/r200_state.o \ + $(MESADRVR200BUILDDIR)debugger/r200_state_init.o \ + $(MESADRVR200BUILDDIR)debugger/r200_swtcl.o \ + $(MESADRVR200BUILDDIR)debugger/r200_tcl.o \ + $(MESADRVR200BUILDDIR)debugger/r200_tex.o \ + $(MESADRVR200BUILDDIR)debugger/r200_texmem.o \ + $(MESADRVR200BUILDDIR)debugger/r200_texstate.o \ + $(MESADRVR200BUILDDIR)debugger/r200_vtxfmt.o \ + $(MESADRVR200BUILDDIR)debugger/r200_vtxfmt_c.o + +#ifdef i386Architecture + R200DOBJS += $(MESADRVR200BUILDDIR)debugger/r200_vtxfmt_x86.o \ + $(MESADRVR200BUILDDIR)debugger/r200_vtxtmp_x86.o \ + $(MESADRVR200BUILDDIR)debugger/r200_vtxfmt_sse.o +#endif + + R200POBJS = $(MESADRVR200BUILDDIR)profiled/r200_context.o \ + $(MESADRVR200BUILDDIR)profiled/r200_sanity.o \ + $(MESADRVR200BUILDDIR)profiled/r200_cmdbuf.o \ + $(MESADRVR200BUILDDIR)profiled/r200_ioctl.o \ + $(MESADRVR200BUILDDIR)profiled/r200_lock.o \ + $(MESADRVR200BUILDDIR)profiled/r200_maos.o \ + $(MESADRVR200BUILDDIR)profiled/r200_pixel.o \ + $(MESADRVR200BUILDDIR)profiled/r200_screen.o \ + $(MESADRVR200BUILDDIR)profiled/r200_span.o \ + $(MESADRVR200BUILDDIR)profiled/r200_state.o \ + $(MESADRVR200BUILDDIR)profiled/r200_state_init.o \ + $(MESADRVR200BUILDDIR)profiled/r200_swtcl.o \ + $(MESADRVR200BUILDDIR)profiled/r200_tcl.o \ + $(MESADRVR200BUILDDIR)profiled/r200_tex.o \ + $(MESADRVR200BUILDDIR)profiled/r200_texmem.o \ + $(MESADRVR200BUILDDIR)profiled/r200_texstate.o \ + $(MESADRVR200BUILDDIR)profiled/r200_vtxfmt.o \ + $(MESADRVR200BUILDDIR)profiled/r200_vtxfmt_c.o + +#ifdef i386Architecture + R200POBJS += $(MESADRVR200BUILDDIR)profiled/r200_vtxfmt_x86.o \ + $(MESADRVR200BUILDDIR)profiled/r200_vtxtmp_x86.o \ + $(MESADRVR200BUILDDIR)profiled/r200_vtxfmt_sse.o +#endif + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(r200_context.c, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_context.h, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_cmdbuf.c, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_ioctl.c, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_ioctl.h, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_lock.c, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_lock.h, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_maos.c, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_maos.h, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_maos_vbtmp.h, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_pixel.c, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_pixel.h, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_reg.h, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_screen.c, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_screen.h, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_span.c, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_span.h, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_sanity.c, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_sanity.h, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_state.c, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_state.h, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_state_init.c, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_swtcl.c, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_swtcl.h, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_tcl.c, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_tcl.h, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_tex.c, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_tex.h, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_texmem.c, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_texstate.c, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_vtxfmt.c, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_vtxfmt.h, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_vtxfmt_c.c, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_vtxfmt_x86.c, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_vtxtmp_x86.S, $(MESADRVSRCDIR)/r200) +LinkSourceFile(r200_vtxfmt_sse.c, $(MESADRVSRCDIR)/r200) +#endif diff --git a/xc/lib/GL/mesa/drivers/dri/radeon/Imakefile b/xc/lib/GL/mesa/drivers/dri/radeon/Imakefile new file mode 100644 index 000000000..0fdaa556d --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/radeon/Imakefile @@ -0,0 +1,83 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/radeon/Imakefile,v 1.9 2002/02/23 00:45:50 dawes Exp $ + +#include + +#if GlxUseBuiltInDRIDriver +#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) +#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) +#define DoExtraLib SharedLibGlx +#define DoDebugLib DebugLibGlx +#define DoProfileLib ProfileLibGlx +#else +#define DoNormalLib SharedLibGlxWithoutPIC +#define DoSharedLib !SharedLibGlxWithoutPIC +#define DoExtrasLib NO +#define DoDebugLib NO +#define DoProfileLib NO +#endif + +#define MesaDrvCommonBuildDir ../common/ +#include "../common/Imakefile.inc" +#include "../../../array_cache/Imakefile.inc" +#include "../../../main/Imakefile.inc" +#include "../../../math/Imakefile.inc" +#include "../../../swrast/Imakefile.inc" +#include "../../../swrast_setup/Imakefile.inc" +#include "../../../tnl/Imakefile.inc" +#include "../../../tnl_dd/Imakefile.inc" +#include "../../../Imakefile.inc" +#if defined(i386Architecture) && MesaUseX86Asm +#include "../../../x86/Imakefile.inc" +#endif +#ifdef SparcArchitecture +#include "../../../sparc/Imakefile.inc" +#endif +#define NeedToLinkMesaSrc +#include "Imakefile.inc" + + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) + INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) + + DRIOBJS = $(GLXLIBSRC)/dri/dri_util.o \ + $(GLXLIBSRC)/dri/glcontextmodes.o + + DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ + $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ + $(GLXLIBSRC)/dri/drm/xf86drmRandom.o \ + $(GLXLIBSRC)/dri/drm/xf86drmSL.o + +#ifdef GlxSoProf + LOSRCS = ../../../../lowpc.c + HISRCS = ../../../../highpc.c + + LOOBJS = ../../../../lowpc.o + HIOBJS = ../../../../highpc.o +#endif + + SRCS = $(RADEONSRCS) + OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ + $(MESA_ASM_OBJS) $(COMMONOBJS) $(RADEONOBJS) $(HIOBJS) + +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) StaticLibrary($(BUILDLIBDIR),expat) + +#include + +LibraryObjectRule() + +SubdirLibraryRule($(RADEONOBJS)) +NormalLintTarget($(SRCS)) + +#if !GlxUseBuiltInDRIDriver +LIBNAME = radeon_dri.so +SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS)) +InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri) + +#ifdef GlxSoProf +SOPROF_LIBNAME = _radeon_dri_p +NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS)) +InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri) +#endif +#endif + +DependTarget() + diff --git a/xc/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc b/xc/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc new file mode 100644 index 000000000..070d6c499 --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc @@ -0,0 +1,192 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/radeon/Imakefile.inc,v 1.3 2002/02/22 21:45:00 dawes Exp $ + +#ifndef MesaDrvSrcDir +#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri +#endif + +MESADRVSRCDIR = MesaDrvSrcDir + +#ifndef MesaDrvRadeonBuildDir +#define MesaDrvRadeonBuildDir /**/ +#endif +MESADRVRADEONBUILDDIR = MesaDrvRadeonBuildDir + +#if Malloc0ReturnsNull +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL +#endif + +#if BuildXF86DRI + DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder + DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ + -I$(XINCLUDESRC) \ + -I$(GLXLIBSRC)/glx \ + -I$(GLXLIBSRC)/include \ + -I$(SERVERSRC)/GL/dri \ + -I$(XF86OSSRC) \ + -I$(XF86COMSRC) \ + -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(XF86DRIVERSRC)/ati \ + -I$(GLXLIBSRC)/dri/drm +#endif + +MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ + -I$(MESASRCDIR)/src/mesa/main \ + -I$(MESASRCDIR)/src/mesa/glapi \ + -I$(MESASRCDIR)/include \ + -I$(MESADRVSRCDIR)/common \ + -I$(MESADRVSRCDIR)/radeon + X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) + + RADEONSRCS = $(MESADRVRADEONBUILDDIR)radeon_context.c \ + $(MESADRVRADEONBUILDDIR)radeon_compat.c \ + $(MESADRVRADEONBUILDDIR)radeon_ioctl.c \ + $(MESADRVRADEONBUILDDIR)radeon_lock.c \ + $(MESADRVRADEONBUILDDIR)radeon_maos.c \ + $(MESADRVRADEONBUILDDIR)radeon_sanity.c \ + $(MESADRVRADEONBUILDDIR)radeon_screen.c \ + $(MESADRVRADEONBUILDDIR)radeon_span.c \ + $(MESADRVRADEONBUILDDIR)radeon_state.c \ + $(MESADRVRADEONBUILDDIR)radeon_state_init.c \ + $(MESADRVRADEONBUILDDIR)radeon_swtcl.c \ + $(MESADRVRADEONBUILDDIR)radeon_tcl.c \ + $(MESADRVRADEONBUILDDIR)radeon_tex.c \ + $(MESADRVRADEONBUILDDIR)radeon_texmem.c \ + $(MESADRVRADEONBUILDDIR)radeon_texstate.c \ + $(MESADRVRADEONBUILDDIR)radeon_vtxfmt.c \ + $(MESADRVRADEONBUILDDIR)radeon_vtxfmt_x86.c \ + $(MESADRVRADEONBUILDDIR)radeon_vtxtmp_x86.S \ + $(MESADRVRADEONBUILDDIR)radeon_vtxfmt_sse.c \ + $(MESADRVRADEONBUILDDIR)radeon_vtxfmt_c.c + + RADEONOBJS = $(MESADRVRADEONBUILDDIR)radeon_context.o \ + $(MESADRVRADEONBUILDDIR)radeon_compat.o \ + $(MESADRVRADEONBUILDDIR)radeon_ioctl.o \ + $(MESADRVRADEONBUILDDIR)radeon_lock.o \ + $(MESADRVRADEONBUILDDIR)radeon_maos.o \ + $(MESADRVRADEONBUILDDIR)radeon_sanity.o \ + $(MESADRVRADEONBUILDDIR)radeon_screen.o \ + $(MESADRVRADEONBUILDDIR)radeon_span.o \ + $(MESADRVRADEONBUILDDIR)radeon_state.o \ + $(MESADRVRADEONBUILDDIR)radeon_state_init.o \ + $(MESADRVRADEONBUILDDIR)radeon_swtcl.o \ + $(MESADRVRADEONBUILDDIR)radeon_tcl.o \ + $(MESADRVRADEONBUILDDIR)radeon_tex.o \ + $(MESADRVRADEONBUILDDIR)radeon_texmem.o \ + $(MESADRVRADEONBUILDDIR)radeon_texstate.o \ + $(MESADRVRADEONBUILDDIR)radeon_vtxfmt.o \ + $(MESADRVRADEONBUILDDIR)radeon_vtxfmt_c.o + +#ifdef i386Architecture + RADEONOBJS += $(MESADRVRADEONBUILDDIR)radeon_vtxfmt_x86.o \ + $(MESADRVRADEONBUILDDIR)radeon_vtxtmp_x86.o \ + $(MESADRVRADEONBUILDDIR)radeon_vtxfmt_sse.o +#endif + + RADEONUOBJS = $(MESADRVRADEONBUILDDIR)unshared/radeon_context.o \ + $(MESADRVRADEONBUILDDIR)unshared/radeon_compat.o \ + $(MESADRVRADEONBUILDDIR)unshared/radeon_ioctl.o \ + $(MESADRVRADEONBUILDDIR)unshared/radeon_lock.o \ + $(MESADRVRADEONBUILDDIR)unshared/radeon_maos.o \ + $(MESADRVRADEONBUILDDIR)unshared/radeon_sanity.o \ + $(MESADRVRADEONBUILDDIR)unshared/radeon_screen.o \ + $(MESADRVRADEONBUILDDIR)unshared/radeon_span.o \ + $(MESADRVRADEONBUILDDIR)unshared/radeon_state.o \ + $(MESADRVRADEONBUILDDIR)unshared/radeon_state_init.o \ + $(MESADRVRADEONBUILDDIR)unshared/radeon_swtcl.o \ + $(MESADRVRADEONBUILDDIR)unshared/radeon_tcl.o \ + $(MESADRVRADEONBUILDDIR)unshared/radeon_tex.o \ + $(MESADRVRADEONBUILDDIR)unshared/radeon_texmem.o \ + $(MESADRVRADEONBUILDDIR)unshared/radeon_texstate.o \ + $(MESADRVRADEONBUILDDIR)unshared/radeon_vtxfmt.o \ + $(MESADRVRADEONBUILDDIR)unshared/radeon_vtxfmt_c.o + +#ifdef i386Architecture + RADEONUOBJS += $(MESADRVRADEONBUILDDIR)unshared/radeon_vtxfmt_x86.o \ + $(MESADRVRADEONBUILDDIR)unshared/radeon_vtxtmp_x86.o \ + $(MESADRVRADEONBUILDDIR)unshared/radeon_vtxfmt_sse.o +#endif + + RADEONDOBJS = $(MESADRVRADEONBUILDDIR)debugger/radeon_context.o \ + $(MESADRVRADEONBUILDDIR)debugger/radeon_compat.o \ + $(MESADRVRADEONBUILDDIR)debugger/radeon_ioctl.o \ + $(MESADRVRADEONBUILDDIR)debugger/radeon_lock.o \ + $(MESADRVRADEONBUILDDIR)debugger/radeon_maos.o \ + $(MESADRVRADEONBUILDDIR)debugger/radeon_sanity.o \ + $(MESADRVRADEONBUILDDIR)debugger/radeon_screen.o \ + $(MESADRVRADEONBUILDDIR)debugger/radeon_span.o \ + $(MESADRVRADEONBUILDDIR)debugger/radeon_state.o \ + $(MESADRVRADEONBUILDDIR)debugger/radeon_state_init.o \ + $(MESADRVRADEONBUILDDIR)debugger/radeon_swtcl.o \ + $(MESADRVRADEONBUILDDIR)debugger/radeon_tcl.o \ + $(MESADRVRADEONBUILDDIR)debugger/radeon_tex.o \ + $(MESADRVRADEONBUILDDIR)debugger/radeon_texmem.o \ + $(MESADRVRADEONBUILDDIR)debugger/radeon_texstate.o \ + $(MESADRVRADEONBUILDDIR)debugger/radeon_vtxfmt.o \ + $(MESADRVRADEONBUILDDIR)debugger/radeon_vtxfmt_c.o + +#ifdef i386Architecture + RADEONDOBJS += $(MESADRVRADEONBUILDDIR)debugger/radeon_vtxfmt_x86.o \ + $(MESADRVRADEONBUILDDIR)debugger/radeon_vtxtmp_x86.o \ + $(MESADRVRADEONBUILDDIR)debugger/radeon_vtxfmt_sse.o +#endif + + RADEONPOBJS = $(MESADRVRADEONBUILDDIR)profiled/radeon_context.o \ + $(MESADRVRADEONBUILDDIR)profiled/radeon_compat.o \ + $(MESADRVRADEONBUILDDIR)profiled/radeon_ioctl.o \ + $(MESADRVRADEONBUILDDIR)profiled/radeon_lock.o \ + $(MESADRVRADEONBUILDDIR)profiled/radeon_maos.o \ + $(MESADRVRADEONBUILDDIR)profiled/radeon_sanity.o \ + $(MESADRVRADEONBUILDDIR)profiled/radeon_screen.o \ + $(MESADRVRADEONBUILDDIR)profiled/radeon_span.o \ + $(MESADRVRADEONBUILDDIR)profiled/radeon_state.o \ + $(MESADRVRADEONBUILDDIR)profiled/radeon_state_init.o \ + $(MESADRVRADEONBUILDDIR)profiled/radeon_swtcl.o \ + $(MESADRVRADEONBUILDDIR)profiled/radeon_tcl.o \ + $(MESADRVRADEONBUILDDIR)profiled/radeon_tex.o \ + $(MESADRVRADEONBUILDDIR)profiled/radeon_texmem.o \ + $(MESADRVRADEONBUILDDIR)profiled/radeon_texstate.o \ + $(MESADRVRADEONBUILDDIR)profiled/radeon_vtxfmt.o \ + $(MESADRVRADEONBUILDDIR)profiled/radeon_vtxfmt_c.o + +#ifdef i386Architecture + RADEONPOBJS += $(MESADRVRADEONBUILDDIR)profiled/radeon_vtxfmt_x86.o \ + $(MESADRVRADEONBUILDDIR)profiled/radeon_vtxtmp_x86.o \ + $(MESADRVRADEONBUILDDIR)profiled/radeon_vtxfmt_sse.o +#endif + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(radeon_context.c, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_context.h, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_compat.c, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_ioctl.c, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_ioctl.h, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_lock.c, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_lock.h, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_maos.c, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_maos.h, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_maos_vbtmp.h, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_sanity.c, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_sanity.h, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_screen.c, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_screen.h, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_span.c, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_span.h, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_state.c, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_state.h, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_state_init.c, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_subset.h, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_swtcl.c, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_swtcl.h, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_tcl.c, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_tcl.h, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_tex.c, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_tex.h, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_texmem.c, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_texstate.c, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_vtxfmt.c, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_vtxfmt.h, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_vtxfmt_c.c, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_vtxfmt_x86.c, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_vtxtmp_x86.S, $(MESADRVSRCDIR)/radeon) +LinkSourceFile(radeon_vtxfmt_sse.c, $(MESADRVSRCDIR)/radeon) +#endif diff --git a/xc/lib/GL/mesa/drivers/dri/sis/Imakefile b/xc/lib/GL/mesa/drivers/dri/sis/Imakefile new file mode 100644 index 000000000..3feb467a4 --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/sis/Imakefile @@ -0,0 +1,87 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/sis/Imakefile,v 1.22 2002/11/25 14:04:52 eich Exp $ + +#include + +#if GlxUseBuiltInDRIDriver +#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) +#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) +#define DoExtraLib SharedLibGlx +#define DoDebugLib DebugLibGlx +#define DoProfileLib ProfileLibGlx +#else +#define DoNormalLib SharedLibGlxWithoutPIC +#define DoSharedLib !SharedLibGlxWithoutPIC +#define DoExtrasLib NO +#define DoDebugLib NO +#define DoProfileLib NO +#endif + +#define MesaDrvCommonBuildDir ../common/ +#include "../common/Imakefile.inc" +#include "../../../array_cache/Imakefile.inc" +#include "../../../main/Imakefile.inc" +#include "../../../math/Imakefile.inc" +#include "../../../swrast/Imakefile.inc" +#include "../../../swrast_setup/Imakefile.inc" +#include "../../../tnl/Imakefile.inc" +#include "../../../tnl_dd/Imakefile.inc" +#include "../../../Imakefile.inc" +#if defined(i386Architecture) && MesaUseX86Asm +#include "../../../x86/Imakefile.inc" +#endif +#ifdef SparcArchitecture +#include "../../../sparc/Imakefile.inc" +#endif +#define NeedToLinkMesaSrc +#include "Imakefile.inc" + +XCOMM DEBUG_DEFINES = -DDEBUG_LOCKING +XCOMM DEBUG_DEFINES = -DSIS_DEBUG + + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) \ + $(DEBUG_DEFINES) + INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) + + DRIOBJS = $(GLXLIBSRC)/dri/dri_util.o \ + $(GLXLIBSRC)/dri/glcontextmodes.o + + DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ + $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ + $(GLXLIBSRC)/dri/drm/xf86drmRandom.o \ + $(GLXLIBSRC)/dri/drm/xf86drmSL.o + +#ifdef GlxSoProf + LOSRCS = ../../../../lowpc.c + HISRCS = ../../../../highpc.c + + LOOBJS = ../../../../lowpc.o + HIOBJS = ../../../../highpc.o +#endif + + SRCS = $(SISSRCS) + OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ + $(MESA_ASM_OBJS) $(COMMONOBJS) $(SISOBJS) $(HIOBJS) + +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) StaticLibrary($(BUILDLIBDIR),expat) + +#include + +LibraryObjectRule() + +SubdirLibraryRule($(SISOBJS)) +NormalLintTarget($(SRCS)) + +#if !GlxUseBuiltInDRIDriver +LIBNAME = sis_dri.so +SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS)) +InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri) + +#ifdef GlxSoProf +SOPROF_LIBNAME = _sis_dri_p +NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS)) +InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri) +#endif +#endif + +DependTarget() + diff --git a/xc/lib/GL/mesa/drivers/dri/sis/Imakefile.inc b/xc/lib/GL/mesa/drivers/dri/sis/Imakefile.inc new file mode 100644 index 000000000..631a00420 --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/sis/Imakefile.inc @@ -0,0 +1,162 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/sis/Imakefile.inc,v 1.1 2001/03/23 19:18:43 dawes Exp $ + +#ifndef MesaDrvSrcDir +#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri +#endif + +MESADRVSRCDIR = MesaDrvSrcDir + +#ifndef MesaDrvSisBuildDir +#define MesaDrvSisBuildDir /**/ +#endif +MESADRVSISBUILDDIR = MesaDrvSisBuildDir + +#if Malloc0ReturnsNull +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL +#endif + +#if BuildXF86DRI + DRI_DEFINES = GlxDefines $(SIS_DEFINES) -DX_BYTE_ORDER=$(X_BYTE_ORDER) + DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ + -I$(XINCLUDESRC) \ + -I$(GLXLIBSRC)/glx \ + -I$(GLXLIBSRC)/include \ + -I$(SERVERSRC)/GL/dri \ + -I$(XF86OSSRC) \ + -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(XF86DRIVERSRC)/sis \ + -I$(GLXLIBSRC)/dri/drm +#endif + +MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ + -I$(MESASRCDIR)/src/mesa/main \ + -I$(MESASRCDIR)/src/mesa/glapi \ + -I$(MESASRCDIR)/include \ + -I$(MESADRVSRCDIR)/common \ + -I$(MESADRVSRCDIR)/sis + X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) + +#if 0 + DEBUG_SRC = $(MESADRVSISBUILDDIR)sis_debug.c + DEBUG_OBJ = $(MESADRVSISBUILDDIR)sis_debug.o + DEBUG_UOBJ = $(MESADRVSISBUILDDIR)unshared/sis_debug.o + DEBUG_DOBJ = $(MESADRVSISBUILDDIR)debugger/sis_debug.o + DEBUG_POBJ = $(MESADRVSISBUILDDIR)profiled/sis_debug.o + DEBUG_DEFINES += -DSIS_DUMP +#ifdef NeedToLinkMesaSrc +LinkSourceFile(sis_debug.c, $(MESADRVSRCDIR)/sis) +#endif +#endif + + SISSRCS = $(MESADRVSISBUILDDIR)sis_alloc.c \ + $(MESADRVSISBUILDDIR)sis_dd.c \ + $(MESADRVSISBUILDDIR)sis_lock.c \ + $(MESADRVSISBUILDDIR)sis_context.c \ + $(MESADRVSISBUILDDIR)sis_fog.c \ + $(MESADRVSISBUILDDIR)sis_clear.c \ + $(MESADRVSISBUILDDIR)sis_screen.c \ + $(MESADRVSISBUILDDIR)sis_state.c \ + $(MESADRVSISBUILDDIR)sis_stencil.c \ + $(MESADRVSISBUILDDIR)sis_span.c \ + $(MESADRVSISBUILDDIR)sis_tex.c \ + $(MESADRVSISBUILDDIR)sis_texstate.c \ + $(MESADRVSISBUILDDIR)sis_tris.c \ + $(MESADRVSISBUILDDIR)sis_vb.c \ + $(DEBUG_SRC) + + SISOBJS = $(MESADRVSISBUILDDIR)sis_alloc.o \ + $(MESADRVSISBUILDDIR)sis_dd.o \ + $(MESADRVSISBUILDDIR)sis_lock.o \ + $(MESADRVSISBUILDDIR)sis_context.o \ + $(MESADRVSISBUILDDIR)sis_fog.o \ + $(MESADRVSISBUILDDIR)sis_clear.o \ + $(MESADRVSISBUILDDIR)sis_screen.o \ + $(MESADRVSISBUILDDIR)sis_state.o \ + $(MESADRVSISBUILDDIR)sis_stencil.o \ + $(MESADRVSISBUILDDIR)sis_span.o \ + $(MESADRVSISBUILDDIR)sis_tex.o \ + $(MESADRVSISBUILDDIR)sis_texstate.o \ + $(MESADRVSISBUILDDIR)sis_tris.o \ + $(MESADRVSISBUILDDIR)sis_vb.o \ + $(DEBUG_OBJ) + + SISUOBJS = $(MESADRVSISBUILDDIR)unshared/sis_alloc.o \ + $(MESADRVSISBUILDDIR)unshared/sis_dd.o \ + $(MESADRVSISBUILDDIR)unshared/sis_lock.o \ + $(MESADRVSISBUILDDIR)unshared/sis_context.o \ + $(MESADRVSISBUILDDIR)unshared/sis_fog.o \ + $(MESADRVSISBUILDDIR)unshared/sis_clear.o \ + $(MESADRVSISBUILDDIR)unshared/sis_screen.o \ + $(MESADRVSISBUILDDIR)unshared/sis_state.o \ + $(MESADRVSISBUILDDIR)unshared/sis_stencil.o \ + $(MESADRVSISBUILDDIR)unshared/sis_span.o \ + $(MESADRVSISBUILDDIR)unshared/sis_tex.o \ + $(MESADRVSISBUILDDIR)unshared/sis_texstate.o \ + $(MESADRVSISBUILDDIR)unshared/sis_tris.o \ + $(MESADRVSISBUILDDIR)unshared/sis_vb.o \ + $(DEBUG_UOBJ) + + SISDOBJS = $(MESADRVSISBUILDDIR)debugger/sis_alloc.o \ + $(MESADRVSISBUILDDIR)debugger/sis_dd.o \ + $(MESADRVSISBUILDDIR)debugger/sis_lock.o \ + $(MESADRVSISBUILDDIR)debugger/sis_context.o \ + $(MESADRVSISBUILDDIR)debugger/sis_fog.o \ + $(MESADRVSISBUILDDIR)debugger/sis_clear.o \ + $(MESADRVSISBUILDDIR)debugger/sis_screen.o \ + $(MESADRVSISBUILDDIR)debugger/sis_state.o \ + $(MESADRVSISBUILDDIR)debugger/sis_stencil.o \ + $(MESADRVSISBUILDDIR)debugger/sis_span.o \ + $(MESADRVSISBUILDDIR)debugger/sis_tex.o \ + $(MESADRVSISBUILDDIR)debugger/sis_texstate.o \ + $(MESADRVSISBUILDDIR)debugger/sis_tris.o \ + $(MESADRVSISBUILDDIR)debugger/sis_vb.o \ + $(DEBUG_DOBJ) + + SISPOBJS = $(MESADRVSISBUILDDIR)profiled/sis_alloc.o \ + $(MESADRVSISBUILDDIR)profiled/sis_dd.o \ + $(MESADRVSISBUILDDIR)profiled/sis_lock.o \ + $(MESADRVSISBUILDDIR)profiled/sis_context.o \ + $(MESADRVSISBUILDDIR)profiled/sis_fog.o \ + $(MESADRVSISBUILDDIR)profiled/sis_clear.o \ + $(MESADRVSISBUILDDIR)profiled/sis_screen.o \ + $(MESADRVSISBUILDDIR)profiled/sis_state.o \ + $(MESADRVSISBUILDDIR)profiled/sis_stencil.o \ + $(MESADRVSISBUILDDIR)profiled/sis_span.o \ + $(MESADRVSISBUILDDIR)profiled/sis_tex.o \ + $(MESADRVSISBUILDDIR)profiled/sis_texstate.o \ + $(MESADRVSISBUILDDIR)profiled/sis_tris.o \ + $(MESADRVSISBUILDDIR)profiled/sis_vb.o \ + $(DEBUG_POBJ) + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(sis_alloc.c, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_alloc.h, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_common2.h, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_context.h, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_dd.c, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_dd.h, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_debug.c, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_debug.h, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_lock.c, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_lock.h, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_context.c, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_fog.c, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_clear.c, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_reg.h, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_screen.c, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_screen.h, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_state.c, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_state.h, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_stencil.c, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_stencil.h, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_span.c, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_span.h, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_tex.c, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_tex.h, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_texstate.c, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_tris.c, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_tris.h, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_tritmp.h, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_vb.c, $(MESADRVSRCDIR)/sis) +LinkSourceFile(sis_vb.h, $(MESADRVSRCDIR)/sis) +#endif diff --git a/xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile b/xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile new file mode 100644 index 000000000..85b97e70e --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile @@ -0,0 +1,83 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/tdfx/Imakefile,v 1.30 2002/02/23 00:45:51 dawes Exp $ + +#include + +#if GlxUseBuiltInDRIDriver +#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) +#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) +#define DoExtraLib SharedLibGlx +#define DoDebugLib DebugLibGlx +#define DoProfileLib ProfileLibGlx +#else +#define DoNormalLib SharedLibGlxWithoutPIC +#define DoSharedLib !SharedLibGlxWithoutPIC +#define DoExtrasLib NO +#define DoDebugLib NO +#define DoProfileLib NO +#endif + +#define MesaDrvCommonBuildDir ../common/ +#include "../common/Imakefile.inc" +#include "../../../array_cache/Imakefile.inc" +#include "../../../main/Imakefile.inc" +#include "../../../math/Imakefile.inc" +#include "../../../swrast/Imakefile.inc" +#include "../../../swrast_setup/Imakefile.inc" +#include "../../../tnl/Imakefile.inc" +#include "../../../tnl_dd/Imakefile.inc" +#include "../../../Imakefile.inc" +#if defined(i386Architecture) && MesaUseX86Asm +#include "../../../x86/Imakefile.inc" +#endif +#ifdef SparcArchitecture +#include "../../../sparc/Imakefile.inc" +#endif +#define NeedToLinkMesaSrc +#include "Imakefile.inc" + + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) + INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) + + DRIOBJS = $(GLXLIBSRC)/dri/dri_util.o \ + $(GLXLIBSRC)/dri/glcontextmodes.o + + DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ + $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ + $(GLXLIBSRC)/dri/drm/xf86drmRandom.o \ + $(GLXLIBSRC)/dri/drm/xf86drmSL.o + +#ifdef GlxSoProf + LOSRCS = ../../../../lowpc.c + HISRCS = ../../../../highpc.c + + LOOBJS = ../../../../lowpc.o + HIOBJS = ../../../../highpc.o +#endif + + SRCS = $(TDFXSRCS) + OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ + $(MESA_ASM_OBJS) $(TDFXOBJS) $(HIOBJS) + +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) StaticLibrary($(BUILDLIBDIR),expat) + +#include + +LibraryObjectRule() + +SubdirLibraryRule($(TDFXOBJS)) +NormalLintTarget($(SRCS)) + +#if !GlxUseBuiltInDRIDriver +LIBNAME = tdfx_dri.so +SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS)) +InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri) + +#ifdef GlxSoProf +SOPROF_LIBNAME = _tdfx_dri_p +NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS)) +InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri) +#endif +#endif + +DependTarget() + diff --git a/xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc b/xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc new file mode 100644 index 000000000..51531e376 --- /dev/null +++ b/xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc @@ -0,0 +1,139 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/tdfx/Imakefile.inc,v 1.1 2001/03/23 19:18:44 dawes Exp $ + +#ifndef MesaDrvSrcDir +#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri +#endif + +MESADRVSRCDIR = MesaDrvSrcDir + +#ifndef MesaDrvTdfxBuildDir +#define MesaDrvTdfxBuildDir /**/ +#endif +MESADRVTDFXBUILDDIR = MesaDrvTdfxBuildDir + +#if Malloc0ReturnsNull +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL +#endif + +#if BuildXF86DRI + DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder + DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ + -I$(XINCLUDESRC) \ + -I$(GLXLIBSRC)/glx \ + -I$(GLXLIBSRC)/include \ + -I$(SERVERSRC)/GL/dri \ + -I$(XF86OSSRC) \ + -I$(XF86OSSRC)/shared/drm/kernel \ + -I$(XF86DRIVERSRC)/tdfx \ + -I$(GLXLIBSRC)/dri/drm +#endif + +MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ + -I$(MESASRCDIR)/src/mesa/main \ + -I$(MESASRCDIR)/src/mesa/glapi \ + -I$(MESASRCDIR)/include \ + -I$(MESADRVSRCDIR)/common \ + -I$(MESADRVSRCDIR)/tdfx + X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) + + TDFXSRCS = $(MESADRVTDFXBUILDDIR)tdfx_context.c \ + $(MESADRVTDFXBUILDDIR)tdfx_dd.c \ + $(MESADRVTDFXBUILDDIR)tdfx_lock.c \ + $(MESADRVTDFXBUILDDIR)tdfx_pixels.c \ + $(MESADRVTDFXBUILDDIR)tdfx_render.c \ + $(MESADRVTDFXBUILDDIR)tdfx_screen.c \ + $(MESADRVTDFXBUILDDIR)tdfx_span.c \ + $(MESADRVTDFXBUILDDIR)tdfx_state.c \ + $(MESADRVTDFXBUILDDIR)tdfx_tex.c \ + $(MESADRVTDFXBUILDDIR)tdfx_texman.c \ + $(MESADRVTDFXBUILDDIR)tdfx_texstate.c \ + $(MESADRVTDFXBUILDDIR)tdfx_tris.c \ + $(MESADRVTDFXBUILDDIR)tdfx_vb.c + + TDFXOBJS = $(MESADRVTDFXBUILDDIR)tdfx_context.o \ + $(MESADRVTDFXBUILDDIR)tdfx_dd.o \ + $(MESADRVTDFXBUILDDIR)tdfx_lock.o \ + $(MESADRVTDFXBUILDDIR)tdfx_pixels.o \ + $(MESADRVTDFXBUILDDIR)tdfx_render.o \ + $(MESADRVTDFXBUILDDIR)tdfx_screen.o \ + $(MESADRVTDFXBUILDDIR)tdfx_span.o \ + $(MESADRVTDFXBUILDDIR)tdfx_state.o \ + $(MESADRVTDFXBUILDDIR)tdfx_tex.o \ + $(MESADRVTDFXBUILDDIR)tdfx_texman.o \ + $(MESADRVTDFXBUILDDIR)tdfx_texstate.o \ + $(MESADRVTDFXBUILDDIR)tdfx_tris.o \ + $(MESADRVTDFXBUILDDIR)tdfx_vb.o + + TDFXUOBJS = $(MESADRVTDFXBUILDDIR)unshared/tdfx_context.o \ + $(MESADRVTDFXBUILDDIR)unshared/tdfx_dd.o \ + $(MESADRVTDFXBUILDDIR)unshared/tdfx_lock.o \ + $(MESADRVTDFXBUILDDIR)unshared/tdfx_pixels.o \ + $(MESADRVTDFXBUILDDIR)unshared/tdfx_render.o \ + $(MESADRVTDFXBUILDDIR)unshared/tdfx_screen.o \ + $(MESADRVTDFXBUILDDIR)unshared/tdfx_span.o \ + $(MESADRVTDFXBUILDDIR)unshared/tdfx_state.o \ + $(MESADRVTDFXBUILDDIR)unshared/tdfx_tex.o \ + $(MESADRVTDFXBUILDDIR)unshared/tdfx_texman.o \ + $(MESADRVTDFXBUILDDIR)unshared/tdfx_texstate.o \ + $(MESADRVTDFXBUILDDIR)unshared/tdfx_tris.o \ + $(MESADRVTDFXBUILDDIR)unshared/tdfx_vb.o + + TDFXDOBJS = $(MESADRVTDFXBUILDDIR)debugger/tdfx_context.o \ + $(MESADRVTDFXBUILDDIR)debugger/tdfx_dd.o \ + $(MESADRVTDFXBUILDDIR)debugger/tdfx_lock.o \ + $(MESADRVTDFXBUILDDIR)debugger/tdfx_pixels.o \ + $(MESADRVTDFXBUILDDIR)debugger/tdfx_render.o \ + $(MESADRVTDFXBUILDDIR)debugger/tdfx_screen.o \ + $(MESADRVTDFXBUILDDIR)debugger/tdfx_span.o \ + $(MESADRVTDFXBUILDDIR)debugger/tdfx_state.o \ + $(MESADRVTDFXBUILDDIR)debugger/tdfx_tex.o \ + $(MESADRVTDFXBUILDDIR)debugger/tdfx_texman.o \ + $(MESADRVTDFXBUILDDIR)debugger/tdfx_texstate.o \ + $(MESADRVTDFXBUILDDIR)debugger/tdfx_tris.o \ + $(MESADRVTDFXBUILDDIR)debugger/tdfx_vb.o + + TDFXPOBJS = $(MESADRVTDFXBUILDDIR)profiled/tdfx_context.o \ + $(MESADRVTDFXBUILDDIR)profiled/tdfx_dd.o \ + $(MESADRVTDFXBUILDDIR)profiled/tdfx_lock.o \ + $(MESADRVTDFXBUILDDIR)profiled/tdfx_pixels.o \ + $(MESADRVTDFXBUILDDIR)profiled/tdfx_render.o \ + $(MESADRVTDFXBUILDDIR)profiled/tdfx_screen.o \ + $(MESADRVTDFXBUILDDIR)profiled/tdfx_span.o \ + $(MESADRVTDFXBUILDDIR)profiled/tdfx_state.o \ + $(MESADRVTDFXBUILDDIR)profiled/tdfx_tex.o \ + $(MESADRVTDFXBUILDDIR)profiled/tdfx_texman.o \ + $(MESADRVTDFXBUILDDIR)profiled/tdfx_texstate.o \ + $(MESADRVTDFXBUILDDIR)profiled/tdfx_tris.o \ + $(MESADRVTDFXBUILDDIR)profiled/tdfx_vb.o + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(dri_glide.h, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_context.c, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_context.h, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_dd.c, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_dd.h, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_glide.h, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_lock.c, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_lock.h, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_pixels.c, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_pixels.h, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_render.c, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_render.h, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_screen.c, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_screen.h, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_span.c, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_span.h, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_state.c, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_state.h, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_tex.c, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_tex.h, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_texman.c, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_texman.h, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_texstate.c, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_texstate.h, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_tris.c, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_tris.h, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_vb.c, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_vb.h, $(MESADRVSRCDIR)/tdfx) +LinkSourceFile(tdfx_vbtmp.h, $(MESADRVSRCDIR)/tdfx) +#endif diff --git a/xc/lib/GL/mesa/drivers/osmesa/Imakefile b/xc/lib/GL/mesa/drivers/osmesa/Imakefile new file mode 100644 index 000000000..f20e4904c --- /dev/null +++ b/xc/lib/GL/mesa/drivers/osmesa/Imakefile @@ -0,0 +1,96 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/OSmesa/Imakefile,v 1.16 2002/11/25 14:04:50 eich Exp $ + +#include + +#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) +#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) +#define DoExtraLib SharedLibGlx +#define DoDebugLib DebugLibGlx +#define DoProfileLib ProfileLibGlx + +#include "../../array_cache/Imakefile.inc" +#include "../../math/Imakefile.inc" +#include "../../main/Imakefile.inc" +#include "../../swrast/Imakefile.inc" +#include "../../swrast_setup/Imakefile.inc" +#include "../../tnl/Imakefile.inc" +#include "../../tnl_dd/Imakefile.inc" +#include "../../Imakefile.inc" +#if defined(i386Architecture) && !SystemV4 && MesaUseX86Asm +#include "../../x86/Imakefile.inc" +#endif +#ifdef SparcArchitecture +#include "../../sparc/Imakefile.inc" +#endif + +LinkSourceFile(osmesa.c, $(MESASRCDIR)/src/mesa/drivers/osmesa) + +#if Malloc0ReturnsNull +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL +#endif + +MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ + -I$(MESASRCDIR)/src/mesa/glapi \ + -I$(MESASRCDIR)/src/mesa/main \ + -I$(MESASRCDIR)/include + + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) + INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) $(MESA_INCLUDES) \ + $(DRI_INCLUDES) -I$(GLXLIBSRC)/include + + MESAOBJS = $(COREMESAOBJS) $(MESA_ASM_OBJS) + MESAUOBJS = $(COREMESAUOBJS) $(MESA_ASM_UOBJS) + MESADOBJS = $(COREMESADOBJS) $(MESA_ASM_DOBJS) + MESAPOBJS = $(COREMESAPOBJS) $(MESA_ASM_POBJS) + + SRCS = osmesa.c + OBJS = osmesa.o $(MESAOBJS) +#if DoSharedLib + UOBJS = unshared/osmesa.o $(MESAUOBJS) +#else + UOBJS = $(OBJS) +#endif + DOBJS = debugger/osmesa.o $(MESADOBJS) + POBJS = profiled/osmesa.o $(MESAPOBJS) + +#if LocalThreads + THREADOBJS = $(THREADS_LIBS) +#endif + +#if !GlxUseBuiltInDRIDriver + REQUIREDLIBS = $(LDPRELIB) $(GLXLIB) +#endif + +#include + +LibraryObjectRule() + +SubdirLibraryRule($(OBJS)) +NormalLintTarget($(SRCS)) + +LIBNAME = OSMesa +SOREV = 4.0 + + +#if DoNormalLib +NormalLibraryTarget($(LIBNAME), $(UOBJS)) +InstallLibrary($(LIBNAME),$(USRLIBDIR)) +#endif + +#if SharedLibGlx +SharedLibraryTarget($(LIBNAME),$(SOREV), $(OBJS), ., .) +InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR)) +#endif + +#if DoDebugLib +DebuggedLibraryTarget($(LIBNAME),$(DOBJS)) +InstallLibrary($(LIBNAME_d,$(USRLIBDIR)) +#endif + +#if DoProfileLib +ProfiledLibraryTarget($(LIBNAME), $(POBJS)) +InstallLibrary($(LIBNAME)_p,$(USRLIBDIR)) +#endif + +DependTarget() + diff --git a/xc/lib/GL/mesa/drivers/x11/Imakefile b/xc/lib/GL/mesa/drivers/x11/Imakefile new file mode 100644 index 000000000..ab9a91970 --- /dev/null +++ b/xc/lib/GL/mesa/drivers/x11/Imakefile @@ -0,0 +1,70 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.12tsi Exp $ + +#include + +/* + * Need both shared and unshared Mesa objects in the following cases: + * GlxDriverUsesMesa + * GlxBuiltInXMesa + * BuildOSMesaLib + * + * In other cases, only the shared version is needed to link in to loadable + * driver modules. + */ + +#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) +#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) +#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) +#define DoExtraLib SharedLibGlx +#define DoDebugLib DebugLibGlx +#define DoProfileLib ProfileLibGlx +#else +#define DoNormalLib SharedLibGlxWithoutPIC +#define DoSharedLib !SharedLibGlxWithoutPIC +#define DoExtraLib NO +#define DoDebugLib NO +#define DoProfileLib NO +#endif + + +#define MesaXBuildDir /**/ +#define NeedToLinkMesaSrc +#include "Imakefile.inc" + +#if Malloc0ReturnsNull +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL +#endif + +#if BuildXF86DRI + DRI_DEFINES = GlxDefines + DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \ + -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri +#endif + +MESA_INCLUDES = -I$(MESASRCDIR)/src \ + -I$(MESASRCDIR)/src/X \ + -I$(MESASRCDIR)/include \ + -I../../../include -I$(XINCLUDESRC) + + INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) + +#ifdef UseCompaqMathLibrary + MATHDEF = -DCCPML +#endif + +#if BuildXF86DRI && GlxBuiltInXMesa + XMESA_DEFINES = -DGLX_BUILT_IN_XMESA +#endif + + SRCS = $(XMESA_SRCS) + OBJS = $(XMESA_OBJS) + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MATHDEF) $(XMESA_DEFINES) + +#include + +LibraryObjectRule() + +SubdirLibraryRule($(XMESA_OBJS)) +NormalLintTarget($(XMESA_SRCS)) + +DependTarget() diff --git a/xc/lib/GL/mesa/drivers/x11/Imakefile.inc b/xc/lib/GL/mesa/drivers/x11/Imakefile.inc new file mode 100644 index 000000000..c11f375d6 --- /dev/null +++ b/xc/lib/GL/mesa/drivers/x11/Imakefile.inc @@ -0,0 +1,98 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile.inc,v 1.3tsi Exp $ + +#ifndef MesaXBuildDir +#define MesaXBuildDir $(GLXLIBSRC)/src/mesa/drivers/x11/ +#endif + +MESAXBUILDDIR = MesaXBuildDir + +#ifndef MesaInXServer +XMESA_GLX_SRCS = $(MESAXBUILDDIR)fakeglx.c \ + $(MESAXBUILDDIR)glxapi.c \ + $(MESAXBUILDDIR)realglx.c \ + $(MESAXBUILDDIR)xfonts.c +#endif + + XMESA_SRCS = $(XMESA_GLX_SRCS) \ + $(MESAXBUILDDIR)xm_api.c \ + $(MESAXBUILDDIR)xm_dd.c \ + $(MESAXBUILDDIR)xm_line.c \ + $(MESAXBUILDDIR)xm_span.c \ + $(MESAXBUILDDIR)xm_tri.c + +#ifdef NeedToLinkMesaSrc +#ifndef MesaInXServer +LinkSourceFile(fakeglx.c, $(MESASRCDIR)/src/mesa/drivers/x11) +LinkSourceFile(glxapi.c, $(MESASRCDIR)/src/mesa/drivers/x11) +LinkSourceFile(glxapi.h, $(MESASRCDIR)/src/mesa/drivers/x11) +LinkSourceFile(realglx.c, $(MESASRCDIR)/src/mesa/drivers/x11) +LinkSourceFile(xfonts.c, $(MESASRCDIR)/src/mesa/drivers/x11) +#endif +LinkSourceFile(xm_api.c, $(MESASRCDIR)/src/mesa/drivers/x11) +LinkSourceFile(xm_dd.c, $(MESASRCDIR)/src/mesa/drivers/x11) +LinkSourceFile(xm_line.c, $(MESASRCDIR)/src/mesa/drivers/x11) +LinkSourceFile(xm_span.c, $(MESASRCDIR)/src/mesa/drivers/x11) +LinkSourceFile(xm_tri.c, $(MESASRCDIR)/src/mesa/drivers/x11) +#endif + +#ifndef MesaInXServer +XMESA_GLX_OBJS = $(MESAXBUILDDIR)fakeglx.o \ + $(MESAXBUILDDIR)glxapi.o \ + $(MESAXBUILDDIR)realglx.o \ + $(MESAXBUILDDIR)xfonts.o +#endif + + XMESA_OBJS = $(XMESA_GLX_OBJS) \ + $(MESAXBUILDDIR)xm_api.o \ + $(MESAXBUILDDIR)xm_dd.o \ + $(MESAXBUILDDIR)xm_line.o \ + $(MESAXBUILDDIR)xm_span.o \ + $(MESAXBUILDDIR)xm_tri.o + +#if defined(DoSharedLib) && DoSharedLib +#ifndef MesaInXServer +XMESA_GLX_UOBJS = $(MESAXBUILDDIR)unshared/fakeglx.o \ + $(MESAXBUILDDIR)unshared/glxapi.o \ + $(MESAXBUILDDIR)unshared/realglx.o \ + $(MESAXBUILDDIR)unshared/xfonts.o +#endif + + XMESA_UOBJS = $(XMESA_GLX_UOBJS) \ + $(MESAXBUILDDIR)unshared/xm_api.o \ + $(MESAXBUILDDIR)unshared/xm_dd.o \ + $(MESAXBUILDDIR)unshared/xm_line.o \ + $(MESAXBUILDDIR)unshared/xm_span.o \ + $(MESAXBUILDDIR)unshared/xm_tri.o +#else +XMESA_GLX_UOBJS = $(XMESA_GLX_OBJS) + XMESA_UOBJS = $(XMESA_OBJS) +#endif + +#ifndef MesaInXServer +XMESA_GLX_DOBJS = $(MESAXBUILDDIR)debugger/fakeglx.o \ + $(MESAXBUILDDIR)debugger/glxapi.o \ + $(MESAXBUILDDIR)debugger/realglx.o \ + $(MESAXBUILDDIR)debugger/xfonts.o +#endif + + XMESA_DOBJS = $(XMESA_GLX_DOBJS) \ + $(MESAXBUILDDIR)debugger/xm_api.o \ + $(MESAXBUILDDIR)debugger/xm_dd.o \ + $(MESAXBUILDDIR)debugger/xm_line.o \ + $(MESAXBUILDDIR)debugger/xm_span.o \ + $(MESAXBUILDDIR)debugger/xm_tri.o + +#ifndef MesaInXServer +XMESA_GLX_POBJS = $(MESAXBUILDDIR)profiled/fakeglx.o \ + $(MESAXBUILDDIR)profiled/glxapi.o \ + $(MESAXBUILDDIR)profiled/realglx.o \ + $(MESAXBUILDDIR)profiled/xfonts.o +#endif + + XMESA_POBJS = $(XMESA_GLX_POBJS) \ + $(MESAXBUILDDIR)profiled/xm_api.o \ + $(MESAXBUILDDIR)profiled/xm_dd.o \ + $(MESAXBUILDDIR)profiled/xm_line.o \ + $(MESAXBUILDDIR)profiled/xm_span.o \ + $(MESAXBUILDDIR)profiled/xm_tri.o + diff --git a/xc/lib/GL/mesa/main/Imakefile b/xc/lib/GL/mesa/main/Imakefile new file mode 100644 index 000000000..f0dcdb4b3 --- /dev/null +++ b/xc/lib/GL/mesa/main/Imakefile @@ -0,0 +1,59 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.30tsi Exp $ + +#include + +/* + * Need both shared and unshared Mesa objects in the following cases: + * GlxDriverUsesMesa + * GlxBuiltInXMesa + * BuildOSMesaLib + * + * In other cases, only the shared version is needed to link in to loadable + * driver modules. + */ + +#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) +#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) +#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) +#define DoExtraLib SharedLibGlx +#define DoDebugLib DebugLibGlx +#define DoProfileLib ProfileLibGlx +#else +#define DoNormalLib SharedLibGlxWithoutPIC +#define DoSharedLib !SharedLibGlxWithoutPIC +#define DoExtraLib NO +#define DoDebugLib NO +#define DoProfileLib NO +#endif + +#if Malloc0ReturnsNull +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL +#endif + +#define MesaBuildDir /**/ +#define NeedToLinkMesaSrc +#include "Imakefile.inc" + +#ifdef UseCompaqMathLibrary + MATH_DEFINES = -DCCPML +#endif + + DEFINES = $(ALLOC_DEFINES) GlxDefines \ + $(MESA_ASM_DEFINES) $(MATH_DEFINES) + INCLUDES = /*-I$(INCLUDESRC) -I$(EXTINCSRC) */ -I$(XINCLUDESRC) \ + -I$(MESASRCDIR)/src/mesa/glapi \ + -I$(MESASRCDIR)/src/mesa/math \ + -I$(MESASRCDIR)/src/mesa/main \ + -I$(MESASRCDIR)/src/mesa -I$(GLXLIBSRC)/dri \ + -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include + SRCS = $(COREMESABASESRCS) + OBJS = $(COREMESABASEOBJS) + +#include + +LibraryObjectRule() + +SubdirLibraryRule($(OBJS)) +NormalLintTarget($(SRCS)) + +DependTarget() diff --git a/xc/lib/GL/mesa/main/Imakefile.inc b/xc/lib/GL/mesa/main/Imakefile.inc new file mode 100644 index 000000000..c22585711 --- /dev/null +++ b/xc/lib/GL/mesa/main/Imakefile.inc @@ -0,0 +1,492 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $ + +#ifndef MesaBuildDir +#define MesaBuildDir $(GLXLIBSRC)/mesa/main/ +#endif + +MESABUILDDIR = MesaBuildDir + +#ifdef NeedAllMesaSrc + DISPATCHSRCS = $(MESABUILDDIR)dispatch.c + GLAPISRCS = $(MESABUILDDIR)glapi.c + GLTHREADSRCS = $(MESABUILDDIR)glthread.c +#endif + +MESA_CORE_INCLUDES = -I$(MESASRCDIR)/src/array_cache \ + -I$(MESASRCDIR)/src/math \ + -I$(MESASRCDIR)/src/swrast -I$(MESASRCDIR)/src/swrast_setup \ + -I$(MESASRCDIR)/src/tnl -I$(MESASRCDIR)/src/tnl_dd + +COREMESABASESRCS = \ + $(MESABUILDDIR)api_arrayelt.c \ + $(MESABUILDDIR)api_loopback.c \ + $(MESABUILDDIR)api_noop.c \ + $(MESABUILDDIR)api_validate.c \ + $(MESABUILDDIR)accum.c \ + $(MESABUILDDIR)arbparse.c \ + $(MESABUILDDIR)arbprogram.c \ + $(MESABUILDDIR)arbfragparse.c \ + $(MESABUILDDIR)arbvertparse.c \ + $(MESABUILDDIR)attrib.c \ + $(MESABUILDDIR)blend.c \ + $(MESABUILDDIR)bufferobj.c \ + $(MESABUILDDIR)buffers.c \ + $(MESABUILDDIR)clip.c \ + $(MESABUILDDIR)colortab.c \ + $(MESABUILDDIR)context.c \ + $(MESABUILDDIR)convolve.c \ + $(MESABUILDDIR)debug.c \ + $(MESABUILDDIR)depth.c \ + $(MESABUILDDIR)dlist.c \ + $(MESABUILDDIR)drawpix.c \ + $(MESABUILDDIR)enable.c \ + $(MESABUILDDIR)enums.c \ + $(MESABUILDDIR)eval.c \ + $(MESABUILDDIR)extensions.c \ + $(MESABUILDDIR)feedback.c \ + $(MESABUILDDIR)fog.c \ + $(MESABUILDDIR)get.c \ + $(MESABUILDDIR)hash.c \ + $(MESABUILDDIR)hint.c \ + $(MESABUILDDIR)histogram.c \ + $(MESABUILDDIR)image.c \ + $(MESABUILDDIR)imports.c \ + $(MESABUILDDIR)light.c \ + $(MESABUILDDIR)lines.c \ + $(MESABUILDDIR)matrix.c \ + $(MESABUILDDIR)nvprogram.c \ + $(MESABUILDDIR)nvfragparse.c \ + $(MESABUILDDIR)nvvertexec.c \ + $(MESABUILDDIR)nvvertparse.c \ + $(MESABUILDDIR)occlude.c \ + $(MESABUILDDIR)pixel.c \ + $(MESABUILDDIR)points.c \ + $(MESABUILDDIR)polygon.c \ + $(MESABUILDDIR)program.c \ + $(MESABUILDDIR)rastpos.c \ + $(MESABUILDDIR)state.c \ + $(MESABUILDDIR)stencil.c \ + $(MESABUILDDIR)texcompress.c \ + $(MESABUILDDIR)texformat.c \ + $(MESABUILDDIR)teximage.c \ + $(MESABUILDDIR)texobj.c \ + $(MESABUILDDIR)texstate.c \ + $(MESABUILDDIR)texstore.c \ + $(MESABUILDDIR)texutil.c \ + $(MESABUILDDIR)varray.c \ + $(MESABUILDDIR)vtxfmt.c + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(api_arrayelt.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(api_arrayelt.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(api_eval.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(api_loopback.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(api_loopback.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(api_noop.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(api_noop.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(api_validate.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(api_validate.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(accum.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(accum.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(arbparse.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(arbprogram.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(arbfragparse.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(arbfragparse.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(arbparse.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(arbparse_syn.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(arbprogram.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(arbvertparse.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(arbvertparse.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(attrib.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(attrib.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(blend.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(blend.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(bufferobj.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(bufferobj.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(buffers.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(buffers.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(clip.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(clip.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(colormac.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(colortab.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(colortab.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(config.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(context.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(context.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(convolve.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(convolve.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(dd.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(debug.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(debug.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(depth.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(depth.h, $(MESASRCDIR)/src/mesa/main) +#ifdef NeedAllMesaSrc +LinkSourceFile(dispatch.c, $(MESASRCDIR)/src/mesa/main) +#endif +LinkSourceFile(dlist.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(dlist.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(drawpix.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(drawpix.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(enable.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(enable.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(enums.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(enums.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(eval.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(eval.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(extensions.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(extensions.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(feedback.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(feedback.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(fog.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(fog.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(get.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(get.h, $(MESASRCDIR)/src/mesa/main) +#ifdef NeedAllMesaSrc +LinkSourceFile(glapi.c, $(MESASRCDIR)/src/mesa/glapi) +LinkSourceFile(glthread.c, $(MESASRCDIR)/src/mesa/glapi) +#endif +LinkSourceFile(glheader.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(hash.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(hash.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(hint.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(hint.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(histogram.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(histogram.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(image.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(image.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(imports.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(imports.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(light.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(light.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(lines.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(lines.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(macros.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(matrix.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(matrix.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(mtypes.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(nvfragparse.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(nvfragprog.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(nvprogram.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(nvprogram.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(nvfragparse.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(nvvertexec.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(nvvertexec.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(nvvertparse.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(nvvertparse.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(nvvertprog.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(occlude.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(occlude.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(pixel.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(pixel.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(points.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(points.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(polygon.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(polygon.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(program.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(program.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(rastpos.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(rastpos.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(simple_list.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(state.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(state.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(stencil.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(stencil.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(texcompress.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(texcompress.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(texformat.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(texformat.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(texformat_tmp.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(teximage.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(teximage.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(texobj.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(texobj.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(texstate.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(texstate.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(texstore.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(texstore.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(texutil.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(texutil.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(texutil_tmp.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(varray.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(varray.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(version.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(vtxfmt.c, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(vtxfmt.h, $(MESASRCDIR)/src/mesa/main) +LinkSourceFile(vtxfmt_tmp.h, $(MESASRCDIR)/src/mesa/main) +#endif + +#ifdef NeedAllMesaSrc + DISPATCHOBJS = $(MESABUILDDIR)dispatch.o + GLAPIOBJS = $(MESABUILDDIR)glapi.o + GLTHREADOBJS = $(MESABUILDDIR)glthread.o +#endif + +COREMESABASEOBJS = \ + $(DISPATCHOBJS) \ + $(GLAPIOBJS) \ + $(GLTHREADOBJS) \ + $(MESABUILDDIR)api_arrayelt.o \ + $(MESABUILDDIR)api_loopback.o \ + $(MESABUILDDIR)api_noop.o \ + $(MESABUILDDIR)api_validate.o \ + $(MESABUILDDIR)accum.o \ + $(MESABUILDDIR)arbparse.o \ + $(MESABUILDDIR)arbprogram.o \ + $(MESABUILDDIR)arbfragparse.o \ + $(MESABUILDDIR)arbvertparse.o \ + $(MESABUILDDIR)attrib.o \ + $(MESABUILDDIR)blend.o \ + $(MESABUILDDIR)bufferobj.o \ + $(MESABUILDDIR)buffers.o \ + $(MESABUILDDIR)clip.o \ + $(MESABUILDDIR)colortab.o \ + $(MESABUILDDIR)context.o \ + $(MESABUILDDIR)convolve.o \ + $(MESABUILDDIR)debug.o \ + $(MESABUILDDIR)depth.o \ + $(MESABUILDDIR)dlist.o \ + $(MESABUILDDIR)drawpix.o \ + $(MESABUILDDIR)enable.o \ + $(MESABUILDDIR)enums.o \ + $(MESABUILDDIR)eval.o \ + $(MESABUILDDIR)extensions.o \ + $(MESABUILDDIR)feedback.o \ + $(MESABUILDDIR)fog.o \ + $(MESABUILDDIR)get.o \ + $(MESABUILDDIR)hash.o \ + $(MESABUILDDIR)hint.o \ + $(MESABUILDDIR)histogram.o \ + $(MESABUILDDIR)image.o \ + $(MESABUILDDIR)imports.o \ + $(MESABUILDDIR)light.o \ + $(MESABUILDDIR)lines.o \ + $(MESABUILDDIR)matrix.o \ + $(MESABUILDDIR)nvprogram.o \ + $(MESABUILDDIR)nvfragparse.o \ + $(MESABUILDDIR)nvvertexec.o \ + $(MESABUILDDIR)nvvertparse.o \ + $(MESABUILDDIR)occlude.o \ + $(MESABUILDDIR)pixel.o \ + $(MESABUILDDIR)points.o \ + $(MESABUILDDIR)polygon.o \ + $(MESABUILDDIR)program.o \ + $(MESABUILDDIR)rastpos.o \ + $(MESABUILDDIR)state.o \ + $(MESABUILDDIR)stencil.o \ + $(MESABUILDDIR)texcompress.o \ + $(MESABUILDDIR)texformat.o \ + $(MESABUILDDIR)teximage.o \ + $(MESABUILDDIR)texobj.o \ + $(MESABUILDDIR)texstate.o \ + $(MESABUILDDIR)texstore.o \ + $(MESABUILDDIR)texutil.o \ + $(MESABUILDDIR)varray.o \ + $(MESABUILDDIR)vtxfmt.o + +#ifdef NeedAllMesaSrc + DISPATCHUOBJS = $(MESABUILDDIR)unshared/dispatch.o + GLAPIUOBJS = $(MESABUILDDIR)unshared/glapi.o + GLTHREADUOBJS = $(MESABUILDDIR)unshared/glthread.o +#endif + +#if defined(DoSharedLib) && DoSharedLib +COREMESABASEUOBJS = \ + $(DISPATCHUOBJS) \ + $(GLAPIUOBJS) \ + $(GLTHREADUOBJS) \ + $(MESABUILDDIR)unshared/api_arrayelt.o \ + $(MESABUILDDIR)unshared/api_loopback.o \ + $(MESABUILDDIR)unshared/api_noop.o \ + $(MESABUILDDIR)unshared/api_validate.o \ + $(MESABUILDDIR)unshared/accum.o \ + $(MESABUILDDIR)unshared/arbparse.o \ + $(MESABUILDDIR)unshared/arbprogram.o \ + $(MESABUILDDIR)unshared/arbfragparse.o \ + $(MESABUILDDIR)unshared/arbvertparse.o \ + $(MESABUILDDIR)unshared/attrib.o \ + $(MESABUILDDIR)unshared/blend.o \ + $(MESABUILDDIR)unshared/bufferobj.o \ + $(MESABUILDDIR)unshared/buffers.o \ + $(MESABUILDDIR)unshared/clip.o \ + $(MESABUILDDIR)unshared/colortab.o \ + $(MESABUILDDIR)unshared/context.o \ + $(MESABUILDDIR)unshared/convolve.o \ + $(MESABUILDDIR)unshared/debug.o \ + $(MESABUILDDIR)unshared/depth.o \ + $(MESABUILDDIR)unshared/dlist.o \ + $(MESABUILDDIR)unshared/drawpix.o \ + $(MESABUILDDIR)unshared/enable.o \ + $(MESABUILDDIR)unshared/enums.o \ + $(MESABUILDDIR)unshared/eval.o \ + $(MESABUILDDIR)unshared/extensions.o \ + $(MESABUILDDIR)unshared/feedback.o \ + $(MESABUILDDIR)unshared/fog.o \ + $(MESABUILDDIR)unshared/get.o \ + $(MESABUILDDIR)unshared/hash.o \ + $(MESABUILDDIR)unshared/hint.o \ + $(MESABUILDDIR)unshared/histogram.o \ + $(MESABUILDDIR)unshared/image.o \ + $(MESABUILDDIR)unshared/imports.o \ + $(MESABUILDDIR)unshared/light.o \ + $(MESABUILDDIR)unshared/lines.o \ + $(MESABUILDDIR)unshared/matrix.o \ + $(MESABUILDDIR)unshared/nvprogram.o \ + $(MESABUILDDIR)unshared/nvfragparse.o \ + $(MESABUILDDIR)unshared/nvvertexec.o \ + $(MESABUILDDIR)unshared/nvvertparse.o \ + $(MESABUILDDIR)unshared/occlude.o \ + $(MESABUILDDIR)unshared/pixel.o \ + $(MESABUILDDIR)unshared/points.o \ + $(MESABUILDDIR)unshared/polygon.o \ + $(MESABUILDDIR)unshared/program.o \ + $(MESABUILDDIR)unshared/rastpos.o \ + $(MESABUILDDIR)unshared/state.o \ + $(MESABUILDDIR)unshared/stencil.o \ + $(MESABUILDDIR)unshared/texcompress.o \ + $(MESABUILDDIR)unshared/texformat.o \ + $(MESABUILDDIR)unshared/teximage.o \ + $(MESABUILDDIR)unshared/texobj.o \ + $(MESABUILDDIR)unshared/texstate.o \ + $(MESABUILDDIR)unshared/texstore.o \ + $(MESABUILDDIR)unshared/texutil.o \ + $(MESABUILDDIR)unshared/varray.o \ + $(MESABUILDDIR)unshared/vtxfmt.o +#else +COREMESABASEUOBJS = $(COREMESABASEOBJS) +#endif + +#ifdef NeedAllMesaSrc + DISPATCHDOBJS = $(MESABUILDDIR)debugger/dispatch.o + GLAPIDOBJS = $(MESABUILDDIR)debugger/glapi.o + GLTHREADDOBJS = $(MESABUILDDIR)debugger/glthread.o +#endif + +COREMESABASEDOBJS = \ + $(DISPATCHDOBJS) \ + $(GLAPIDOBJS) \ + $(GLTHREADDOBJS) \ + $(MESABUILDDIR)debugger/api_arrayelt.o \ + $(MESABUILDDIR)debugger/api_loopback.o \ + $(MESABUILDDIR)debugger/api_noop.o \ + $(MESABUILDDIR)debugger/api_validate.o \ + $(MESABUILDDIR)debugger/accum.o \ + $(MESABUILDDIR)debugger/arbparse.o \ + $(MESABUILDDIR)debugger/arbprogram.o \ + $(MESABUILDDIR)debugger/arbfragparse.o \ + $(MESABUILDDIR)debugger/arbvertparse.o \ + $(MESABUILDDIR)debugger/attrib.o \ + $(MESABUILDDIR)debugger/blend.o \ + $(MESABUILDDIR)debugger/bufferobj.o \ + $(MESABUILDDIR)debugger/buffers.o \ + $(MESABUILDDIR)debugger/clip.o \ + $(MESABUILDDIR)debugger/colortab.o \ + $(MESABUILDDIR)debugger/context.o \ + $(MESABUILDDIR)debugger/convolve.o \ + $(MESABUILDDIR)debugger/debug.o \ + $(MESABUILDDIR)debugger/depth.o \ + $(MESABUILDDIR)debugger/dlist.o \ + $(MESABUILDDIR)debugger/drawpix.o \ + $(MESABUILDDIR)debugger/enable.o \ + $(MESABUILDDIR)debugger/enums.o \ + $(MESABUILDDIR)debugger/eval.o \ + $(MESABUILDDIR)debugger/extensions.o \ + $(MESABUILDDIR)debugger/feedback.o \ + $(MESABUILDDIR)debugger/fog.o \ + $(MESABUILDDIR)debugger/get.o \ + $(MESABUILDDIR)debugger/hash.o \ + $(MESABUILDDIR)debugger/hint.o \ + $(MESABUILDDIR)debugger/histogram.o \ + $(MESABUILDDIR)debugger/image.o \ + $(MESABUILDDIR)debugger/imports.o \ + $(MESABUILDDIR)debugger/light.o \ + $(MESABUILDDIR)debugger/lines.o \ + $(MESABUILDDIR)debugger/matrix.o \ + $(MESABUILDDIR)debugger/nvprogram.o \ + $(MESABUILDDIR)debugger/nvfragparse.o \ + $(MESABUILDDIR)debugger/nvvertexec.o \ + $(MESABUILDDIR)debugger/nvvertparse.o \ + $(MESABUILDDIR)debugger/occlude.o \ + $(MESABUILDDIR)debugger/pixel.o \ + $(MESABUILDDIR)debugger/points.o \ + $(MESABUILDDIR)debugger/polygon.o \ + $(MESABUILDDIR)debugger/program.o \ + $(MESABUILDDIR)debugger/rastpos.o \ + $(MESABUILDDIR)debugger/state.o \ + $(MESABUILDDIR)debugger/stencil.o \ + $(MESABUILDDIR)debugger/texcompress.o \ + $(MESABUILDDIR)debugger/texformat.o \ + $(MESABUILDDIR)debugger/teximage.o \ + $(MESABUILDDIR)debugger/texobj.o \ + $(MESABUILDDIR)debugger/texstate.o \ + $(MESABUILDDIR)debugger/texstore.o \ + $(MESABUILDDIR)debugger/texutil.o \ + $(MESABUILDDIR)debugger/varray.o \ + $(MESABUILDDIR)debugger/vtxfmt.o + +#ifdef NeedAllMesaSrc + DISPATCHPOBJS = $(MESABUILDDIR)profiled/dispatch.o + GLAPIPOBJS = $(MESABUILDDIR)profiled/glapi.o + GLTHREADPOBJS = $(MESABUILDDIR)profiled/glthread.o +#endif + +COREMESABASEPOBJS = \ + $(DISPATCHPOBJS) \ + $(GLAPIPOBJS) \ + $(GLTHREADPOBJS) \ + $(MESABUILDDIR)profiled/api_arrayelt.o \ + $(MESABUILDDIR)profiled/api_loopback.o \ + $(MESABUILDDIR)profiled/api_noop.o \ + $(MESABUILDDIR)profiled/api_validate.o \ + $(MESABUILDDIR)profiled/accum.o \ + $(MESABUILDDIR)profiled/arbparse.o \ + $(MESABUILDDIR)profiled/arbprogram.o \ + $(MESABUILDDIR)profiled/arbfragparse.o \ + $(MESABUILDDIR)profiled/arbvertparse.o \ + $(MESABUILDDIR)profiled/attrib.o \ + $(MESABUILDDIR)profiled/blend.o \ + $(MESABUILDDIR)profiled/bufferobj.o \ + $(MESABUILDDIR)profiled/buffers.o \ + $(MESABUILDDIR)profiled/clip.o \ + $(MESABUILDDIR)profiled/colortab.o \ + $(MESABUILDDIR)profiled/context.o \ + $(MESABUILDDIR)profiled/convolve.o \ + $(MESABUILDDIR)profiled/debug.o \ + $(MESABUILDDIR)profiled/depth.o \ + $(MESABUILDDIR)profiled/dlist.o \ + $(MESABUILDDIR)profiled/drawpix.o \ + $(MESABUILDDIR)profiled/enable.o \ + $(MESABUILDDIR)profiled/enums.o \ + $(MESABUILDDIR)profiled/eval.o \ + $(MESABUILDDIR)profiled/extensions.o \ + $(MESABUILDDIR)profiled/feedback.o \ + $(MESABUILDDIR)profiled/fog.o \ + $(MESABUILDDIR)profiled/get.o \ + $(MESABUILDDIR)profiled/hash.o \ + $(MESABUILDDIR)profiled/hint.o \ + $(MESABUILDDIR)profiled/histogram.o \ + $(MESABUILDDIR)profiled/image.o \ + $(MESABUILDDIR)profiled/imports.o \ + $(MESABUILDDIR)profiled/light.o \ + $(MESABUILDDIR)profiled/lines.o \ + $(MESABUILDDIR)profiled/matrix.o \ + $(MESABUILDDIR)profiled/nvprogram.o \ + $(MESABUILDDIR)profiled/nvfragparse.o \ + $(MESABUILDDIR)profiled/nvvertexec.o \ + $(MESABUILDDIR)profiled/nvvertparse.o \ + $(MESABUILDDIR)profiled/occlude.o \ + $(MESABUILDDIR)profiled/pixel.o \ + $(MESABUILDDIR)profiled/points.o \ + $(MESABUILDDIR)profiled/polygon.o \ + $(MESABUILDDIR)profiled/program.o \ + $(MESABUILDDIR)profiled/rastpos.o \ + $(MESABUILDDIR)profiled/state.o \ + $(MESABUILDDIR)profiled/stencil.o \ + $(MESABUILDDIR)profiled/texcompress.o \ + $(MESABUILDDIR)profiled/texformat.o \ + $(MESABUILDDIR)profiled/teximage.o \ + $(MESABUILDDIR)profiled/texobj.o \ + $(MESABUILDDIR)profiled/texstate.o \ + $(MESABUILDDIR)profiled/texstore.o \ + $(MESABUILDDIR)profiled/texutil.o \ + $(MESABUILDDIR)profiled/varray.o \ + $(MESABUILDDIR)profiled/vtxfmt.o diff --git a/xc/lib/GL/mesa/math/Imakefile b/xc/lib/GL/mesa/math/Imakefile new file mode 100644 index 000000000..c0333c02a --- /dev/null +++ b/xc/lib/GL/mesa/math/Imakefile @@ -0,0 +1,93 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $ + +#include + +/* + * Need both shared and unshared Mesa objects in the following cases: + * GlxDriverUsesMesa + * GlxBuiltInXMesa + * BuildOSMesaLib + * + * In other cases, only the shared version is needed to link in to loadable + * driver modules. + */ + +#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) +#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) +#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) +#define DoExtraLib SharedLibGlx +#define DoDebugLib DebugLibGlx +#define DoProfileLib ProfileLibGlx +#else +#define DoNormalLib SharedLibGlxWithoutPIC +#define DoSharedLib !SharedLibGlxWithoutPIC +#define DoExtraLib NO +#define DoDebugLib NO +#define DoProfileLib NO +#endif + + +#define MesaMathBuildDir /**/ +#define NeedToLinkMesaSrc +#include "Imakefile.inc" + + +#if Malloc0ReturnsNull +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL +#endif + +#if BuildXF86DRI + DRI_DEFINES = GlxDefines + DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \ + -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri +#endif + +#if defined(i386Architecture) && MesaUseX86Asm + ASM_DIR = x86 + ASM_SRCS = + ASM_OBJS = +#if MesaUseMMX + MMX_DEFS = -DUSE_MMX_ASM +#endif +#if MesaUse3DNow + 3DNOW_DEFS = -DUSE_3DNOW_ASM +#endif +#if MesaUseSSE + SSE_DEFS = -DUSE_SSE_ASM +#endif + ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) +#endif + +#ifdef SparcArchitecture + ASM_DIR = sparc + ASM_SRCS = + ASM_OBJS = + ASM_DEFS = -DUSE_SPARC_ASM +#endif + +#ifdef UseCompaqMathLibrary + MATHDEF = -DCCPML +#endif + +MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \ + -I$(MESASRCDIR)/src/mesa/math \ + -I$(MESASRCDIR)/src/mesa/glapi \ + -I$(MESASRCDIR)/src/mesa \ + -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ + -I$(MESASRCDIR)/include \ + -I../../../include -I$(XINCLUDESRC) + + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) + INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) + SRCS = $(MESA_MATH_SRCS) + OBJS = $(MESA_MATH_OBJS) + + +#include + +LibraryObjectRule() + +SubdirLibraryRule($(OBJS)) +NormalLintTarget($(SRCS)) + +DependTarget() diff --git a/xc/lib/GL/mesa/math/Imakefile.inc b/xc/lib/GL/mesa/math/Imakefile.inc new file mode 100644 index 000000000..cd1dcc427 --- /dev/null +++ b/xc/lib/GL/mesa/math/Imakefile.inc @@ -0,0 +1,82 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile.inc,v 1.1tsi Exp $ + +#ifndef MesaMathBuildDir +#define MesaMathBuildDir $(GLXLIBSRC)/mesa/math/ +#endif + +MESAMATHBUILDDIR = MesaMathBuildDir + + MESA_MATH_SRCS = $(MESAMATHBUILDDIR)m_debug_clip.c \ + $(MESAMATHBUILDDIR)m_debug_norm.c \ + $(MESAMATHBUILDDIR)m_debug_xform.c \ + $(MESAMATHBUILDDIR)m_eval.c \ + $(MESAMATHBUILDDIR)m_matrix.c \ + $(MESAMATHBUILDDIR)m_translate.c \ + $(MESAMATHBUILDDIR)m_vector.c \ + $(MESAMATHBUILDDIR)m_xform.c + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(mathmod.h, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_clip_tmp.h, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_copy_tmp.h, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_debug_clip.c, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_debug.h, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_debug_util.h, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_debug_norm.c, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_debug_xform.c, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_dotprod_tmp.h, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_eval.c, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_eval.h, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_matrix.c, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_matrix.h, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_norm_tmp.h, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_translate.c, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_translate.h, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_trans_tmp.h, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_vector.c, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_vector.h, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_xform.c, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_xform.h, $(MESASRCDIR)/src/mesa/math) +LinkSourceFile(m_xform_tmp.h, $(MESASRCDIR)/src/mesa/math) +#endif + + MESA_MATH_OBJS = $(MESAMATHBUILDDIR)m_debug_clip.o \ + $(MESAMATHBUILDDIR)m_debug_norm.o \ + $(MESAMATHBUILDDIR)m_debug_xform.o \ + $(MESAMATHBUILDDIR)m_eval.o \ + $(MESAMATHBUILDDIR)m_matrix.o \ + $(MESAMATHBUILDDIR)m_translate.o \ + $(MESAMATHBUILDDIR)m_vector.o \ + $(MESAMATHBUILDDIR)m_xform.o + +#if defined(DoSharedLib) && DoSharedLib + MESA_MATH_UOBJS = $(MESAMATHBUILDDIR)unshared/m_debug_clip.o \ + $(MESAMATHBUILDDIR)unshared/m_debug_norm.o \ + $(MESAMATHBUILDDIR)unshared/m_debug_xform.o \ + $(MESAMATHBUILDDIR)unshared/m_eval.o \ + $(MESAMATHBUILDDIR)unshared/m_matrix.o \ + $(MESAMATHBUILDDIR)unshared/m_translate.o \ + $(MESAMATHBUILDDIR)unshared/m_vector.o \ + $(MESAMATHBUILDDIR)unshared/m_xform.o +#else + MATH_MESA_UOBJS = $(MESA_MATH_OBJS) +#endif + + MESA_MATH_DOBJS = $(MESAMATHBUILDDIR)debugger/m_debug_clip.o \ + $(MESAMATHBUILDDIR)debugger/m_debug_norm.o \ + $(MESAMATHBUILDDIR)debugger/m_debug_xform.o \ + $(MESAMATHBUILDDIR)debugger/m_eval.o \ + $(MESAMATHBUILDDIR)debugger/m_matrix.o \ + $(MESAMATHBUILDDIR)debugger/m_translate.o \ + $(MESAMATHBUILDDIR)debugger/m_vector.o \ + $(MESAMATHBUILDDIR)debugger/m_xform.o + + MESA_MATH_POBJS = $(MESAMATHBUILDDIR)profiled/m_debug_clip.o \ + $(MESAMATHBUILDDIR)profiled/m_debug_norm.o \ + $(MESAMATHBUILDDIR)profiled/m_debug_xform.o \ + $(MESAMATHBUILDDIR)profiled/m_eval.o \ + $(MESAMATHBUILDDIR)profiled/m_matrix.o \ + $(MESAMATHBUILDDIR)profiled/m_translate.o \ + $(MESAMATHBUILDDIR)profiled/m_vector.o \ + $(MESAMATHBUILDDIR)profiled/m_xform.o + diff --git a/xc/lib/GL/mesa/sparc/Imakefile b/xc/lib/GL/mesa/sparc/Imakefile new file mode 100644 index 000000000..32176f3fd --- /dev/null +++ b/xc/lib/GL/mesa/sparc/Imakefile @@ -0,0 +1,57 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/SPARC/Imakefile,v 1.3 2002/11/22 22:55:58 tsi Exp $ + +/* + * Need both shared and unshared Mesa objects in the following cases: + * GlxDriverUsesMesa + * GlxBuiltInXMesa + * BuildOSMesaLib + * + * In other cases, only the shared version is needed to link in to loadable + * driver modules. + */ + +#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) +#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) +#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) +#define DoExtraLib SharedLibGlx +#define DoDebugLib DebugLibGlx +#define DoProfileLib ProfileLibGlx +#else +#define DoNormalLib SharedLibGlxWithoutPIC +#define DoSharedLib !SharedLibGlxWithoutPIC +#define DoExtraLib NO +#define DoDebugLib NO +#define DoProfileLib NO +#endif + + +#if Malloc0ReturnsNull +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL +#endif + +#define MesaSPARCBuildDir /**/ +#define NeedToLinkMesaSrc +#include "Imakefile.inc" + + DEFINES = $(ALLOC_DEFINES) GlxDefines $(MESA_ASM_DEFINES) + INCLUDES = -I$(INCLUDESRC) -I$(EXTINCSRC) -I$(MESASRCDIR)/src \ + -I$(MESASRCDIR)/src/SPARC \ + -I../../../include + + SRCS = $(MESA_ASM_SRCS) + OBJS = $(MESA_ASM_OBJS) + +#include + +LibraryObjectRule() + +STD_CPP_DEFINES = StandardDefines $(PROJECT_DEFINES) + +SubdirLibraryRule($(OBJS)) +NormalLintTarget($(SRCS)) + +ObjectFromAsmSource(xform, NullParameter) +ObjectFromAsmSource(clip, NullParameter) +ObjectFromAsmSource(norm, NullParameter) + +DependTarget() diff --git a/xc/lib/GL/mesa/sparc/Imakefile.inc b/xc/lib/GL/mesa/sparc/Imakefile.inc new file mode 100644 index 000000000..6bd006749 --- /dev/null +++ b/xc/lib/GL/mesa/sparc/Imakefile.inc @@ -0,0 +1,58 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/SPARC/Imakefile.inc,v 1.2 2002/11/14 21:01:16 tsi Exp $ + +#ifndef MesaSPARCBuildDir +#define MesaSPARCBuildDir $(GLXLIBSRC)/mesa/sparc/ +#endif + +MESASPARCBUILDDIR = MesaSPARCBuildDir + +MESA_SPARC_SRCS = $(MESASPARCBUILDDIR)sparc.c \ + $(MESASPARCBUILDDIR)xform.S \ + $(MESASPARCBUILDDIR)clip.S + +#ifdef NeedToLinkMesaSrc +/* If $(MESASRCDIR)/src/mesa/sparc isn't in the INCLUDES, it should be. */ +LinkSourceFile(sparc.c, $(MESASRCDIR)/src/mesa/sparc) +LinkSourceFile(xform.S, $(MESASRCDIR)/src/mesa/sparc) +LinkSourceFile(clip.S, $(MESASRCDIR)/src/mesa/sparc) +LinkSourceFile(norm.S, $(MESASRCDIR)/src/mesa/sparc) +#endif + +MESA_SPARC_OBJS = $(MESASPARCBUILDDIR)sparc.o \ + $(MESASPARCBUILDDIR)xform.o \ + $(MESASPARCBUILDDIR)clip.o \ + $(MESASPARCBUILDDIR)norm.o + +#if defined(DoSharedLib) && DoSharedLib +MESA_SPARC_UOBJS = $(MESASPARCBUILDDIR)unshared/sparc.o \ + $(MESASPARCBUILDDIR)xform.o \ + $(MESASPARCBUILDDIR)clip.o \ + $(MESASPARCBUILDDIR)norm.o +#else +MESA_SPARC_UOBJS = $(MESA_SPARC_OBJS) +#endif + +MESA_SPARC_DOBJS = $(MESASPARCBUILDDIR)debugger/sparc.o \ + $(MESASPARCBUILDDIR)xform.o \ + $(MESASPARCBUILDDIR)clip.o \ + $(MESASPARCBUILDDIR)norm.o + +MESA_SPARC_POBJS = $(MESAX86BUILDDIR)profiled/sparc.o \ + $(MESAX86BUILDDIR)xform.o \ + $(MESAX86BUILDDIR)clip.o \ + $(MESAX86BUILDDIR)norm.o + +MESA_SPARC_DEFS = -DUSE_SPARC_ASM + +MESA_ASM_SRCS = $(MESA_SPARC_SRCS) + +MESA_ASM_OBJS = $(MESA_SPARC_OBJS) + +MESA_ASM_UOBJS = $(MESA_SPARC_UOBJS) + +MESA_ASM_DOBJS = $(MESA_SPARC_DOBJS) + +MESA_ASM_POBJS = $(MESA_SPARC_POBJS) + +MESA_ASM_DEFINES = $(MESA_SPARC_DEFS) + diff --git a/xc/lib/GL/mesa/src/Imakefile b/xc/lib/GL/mesa/src/Imakefile deleted file mode 100644 index 57330df6a..000000000 --- a/xc/lib/GL/mesa/src/Imakefile +++ /dev/null @@ -1,76 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.32 2002/11/25 14:04:50 eich Exp $ - -#include - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if defined(i386Architecture) && MesaUseX86Asm -#define MesaX86BuildDir /**/ -#include "X86/Imakefile.inc" -ASM_SUBDIRS = X86 -#endif -#ifdef SparcArchitecture -#define MesaSparcBuildDir /**/ -#include "SPARC/Imakefile.inc" -ASM_SUBDIRS = SPARC -#endif -#define MesaBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - -#ifdef UseCompaqMathLibrary - MATH_DEFINES = -DCCPML -#endif - - DEFINES = $(ALLOC_DEFINES) GlxDefines \ - $(MESA_ASM_DEFINES) $(MATH_DEFINES) - INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(MESASRCDIR)/src -I$(GLXLIBSRC)/dri \ - -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include - SRCS = $(COREMESABASESRCS) - OBJS = $(COREMESABASEOBJS) - -#include - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -#define IHaveSubdirs -#define PassCDebugFlags - -SUBDIRS = $(ASM_SUBDIRS) math array_cache swrast swrast_setup tnl /*tnl_dd*/ X - - -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) - - -DependTarget() diff --git a/xc/lib/GL/mesa/src/Imakefile.inc b/xc/lib/GL/mesa/src/Imakefile.inc deleted file mode 100644 index 741d4c99c..000000000 --- a/xc/lib/GL/mesa/src/Imakefile.inc +++ /dev/null @@ -1,495 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.8 2002/11/14 21:01:16 tsi Exp $ - -#ifndef MesaBuildDir -#define MesaBuildDir $(GLXLIBSRC)/mesa/src/ -#endif - -MESABUILDDIR = MesaBuildDir - -#ifdef NeedAllMesaSrc - DISPATCHSRCS = $(MESABUILDDIR)dispatch.c - GLAPISRCS = $(MESABUILDDIR)glapi.c -GLAPINOOPSRCS = $(MESABUILDDIR)glapinoop.c - GLTHREADSRCS = $(MESABUILDDIR)glthread.c -#endif - -MESA_CORE_INCLUDES = -I$(MESASRCDIR)/src/array_cache \ - -I$(MESASRCDIR)/src/math \ - -I$(MESASRCDIR)/src/swrast -I$(MESASRCDIR)/src/swrast_setup \ - -I$(MESASRCDIR)/src/tnl -I$(MESASRCDIR)/src/tnl_dd - - -COREMESABASESRCS = \ - $(MESABUILDDIR)accum.c \ - $(MESABUILDDIR)api_arrayelt.c \ - $(MESABUILDDIR)api_eval.c \ - $(MESABUILDDIR)api_loopback.c \ - $(MESABUILDDIR)api_noop.c \ - $(MESABUILDDIR)api_validate.c \ - $(MESABUILDDIR)attrib.c \ - $(MESABUILDDIR)blend.c \ - $(MESABUILDDIR)buffers.c \ - $(MESABUILDDIR)clip.c \ - $(MESABUILDDIR)colortab.c \ - $(MESABUILDDIR)context.c \ - $(MESABUILDDIR)convolve.c \ - $(MESABUILDDIR)debug.c \ - $(MESABUILDDIR)depth.c \ - $(DISPATCHSRCS) \ - $(MESABUILDDIR)dlist.c \ - $(MESABUILDDIR)drawpix.c \ - $(MESABUILDDIR)enable.c \ - $(MESABUILDDIR)enums.c \ - $(MESABUILDDIR)eval.c \ - $(MESABUILDDIR)extensions.c \ - $(MESABUILDDIR)feedback.c \ - $(MESABUILDDIR)fog.c \ - $(MESABUILDDIR)get.c \ - $(GLAPISRCS) \ - $(GLTHREADSRCS) \ - $(MESABUILDDIR)hash.c \ - $(MESABUILDDIR)hint.c \ - $(MESABUILDDIR)histogram.c \ - $(MESABUILDDIR)image.c \ - $(MESABUILDDIR)imports.c \ - $(MESABUILDDIR)light.c \ - $(MESABUILDDIR)lines.c \ - $(MESABUILDDIR)matrix.c \ - $(MESABUILDDIR)mmath.c \ - $(MESABUILDDIR)pixel.c \ - $(MESABUILDDIR)points.c \ - $(MESABUILDDIR)polygon.c \ - $(MESABUILDDIR)rastpos.c \ - $(MESABUILDDIR)state.c \ - $(MESABUILDDIR)stencil.c \ - $(MESABUILDDIR)texcompress.c \ - $(MESABUILDDIR)texformat.c \ - $(MESABUILDDIR)teximage.c \ - $(MESABUILDDIR)texobj.c \ - $(MESABUILDDIR)texstate.c \ - $(MESABUILDDIR)texstore.c \ - $(MESABUILDDIR)texutil.c \ - $(MESABUILDDIR)varray.c \ - $(MESABUILDDIR)vtxfmt.c \ - $(MESABUILDDIR)vpexec.c \ - $(MESABUILDDIR)vpexec.h \ - $(MESABUILDDIR)vpparse.c \ - $(MESABUILDDIR)vpparse.h \ - $(MESABUILDDIR)vpstate.c \ - $(MESABUILDDIR)vpstate.h - - -COREMESASRCS = $(COREMESABASESRCS) \ - $(MESABUILDDIR)array_cache/ac_context.c \ - $(MESABUILDDIR)array_cache/ac_import.c \ - $(MESABUILDDIR)math/m_debug_clip.c \ - $(MESABUILDDIR)math/m_debug_norm.c \ - $(MESABUILDDIR)math/m_debug_vertex.c \ - $(MESABUILDDIR)math/m_debug_xform.c \ - $(MESABUILDDIR)math/m_eval.c \ - $(MESABUILDDIR)math/m_matrix.c \ - $(MESABUILDDIR)math/m_translate.c \ - $(MESABUILDDIR)math/m_vector.c \ - $(MESABUILDDIR)math/m_vertices.c \ - $(MESABUILDDIR)math/m_xform.c \ - $(MESABUILDDIR)swrast/s_aaline.c \ - $(MESABUILDDIR)swrast/s_aatriangle.c \ - $(MESABUILDDIR)swrast/s_accum.c \ - $(MESABUILDDIR)swrast/s_alpha.c \ - $(MESABUILDDIR)swrast/s_alphabuf.c \ - $(MESABUILDDIR)swrast/s_bitmap.c \ - $(MESABUILDDIR)swrast/s_blend.c \ - $(MESABUILDDIR)swrast/s_buffers.c \ - $(MESABUILDDIR)swrast/s_copypix.c \ - $(MESABUILDDIR)swrast/s_context.c \ - $(MESABUILDDIR)swrast/s_depth.c \ - $(MESABUILDDIR)swrast/s_drawpix.c \ - $(MESABUILDDIR)swrast/s_feedback.c \ - $(MESABUILDDIR)swrast/s_fog.c \ - $(MESABUILDDIR)swrast/s_histogram.c \ - $(MESABUILDDIR)swrast/s_imaging.c \ - $(MESABUILDDIR)swrast/s_lines.c \ - $(MESABUILDDIR)swrast/s_logic.c \ - $(MESABUILDDIR)swrast/s_masking.c \ - $(MESABUILDDIR)swrast/s_pixeltex.c \ - $(MESABUILDDIR)swrast/s_points.c \ - $(MESABUILDDIR)swrast/s_readpix.c \ - $(MESABUILDDIR)swrast/s_span.c \ - $(MESABUILDDIR)swrast/s_stencil.c \ - $(MESABUILDDIR)swrast/s_texture.c \ - $(MESABUILDDIR)swrast/s_texstore.c \ - $(MESABUILDDIR)swrast/s_triangle.c \ - $(MESABUILDDIR)swrast/s_zoom.c \ - $(MESABUILDDIR)swrast_setup/ss_context.c \ - $(MESABUILDDIR)swrast_setup/ss_triangle.c \ - $(MESABUILDDIR)swrast_setup/ss_vb.c \ - $(MESABUILDDIR)tnl/t_array_api.c \ - $(MESABUILDDIR)tnl/t_array_import.c \ - $(MESABUILDDIR)tnl/t_context.c \ - $(MESABUILDDIR)tnl/t_eval_api.c \ - $(MESABUILDDIR)tnl/t_imm_alloc.c \ - $(MESABUILDDIR)tnl/t_imm_api.c \ - $(MESABUILDDIR)tnl/t_imm_debug.c \ - $(MESABUILDDIR)tnl/t_imm_dlist.c \ - $(MESABUILDDIR)tnl/t_imm_elt.c \ - $(MESABUILDDIR)tnl/t_imm_eval.c \ - $(MESABUILDDIR)tnl/t_imm_exec.c \ - $(MESABUILDDIR)tnl/t_imm_fixup.c \ - $(MESABUILDDIR)tnl/t_pipeline.c \ - $(MESABUILDDIR)tnl/t_vb_fog.c \ - $(MESABUILDDIR)tnl/t_vb_light.c \ - $(MESABUILDDIR)tnl/t_vb_normals.c \ - $(MESABUILDDIR)tnl/t_vb_points.c \ - $(MESABUILDDIR)tnl/t_vb_program.c \ - $(MESABUILDDIR)tnl/t_vb_render.c \ - $(MESABUILDDIR)tnl/t_vb_texgen.c \ - $(MESABUILDDIR)tnl/t_vb_texmat.c \ - $(MESABUILDDIR)tnl/t_vb_vertex.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(accum.c, $(MESASRCDIR)/src) -LinkSourceFile(api_arrayelt.c, $(MESASRCDIR)/src) -LinkSourceFile(api_eval.c, $(MESASRCDIR)/src) -LinkSourceFile(api_loopback.c, $(MESASRCDIR)/src) -LinkSourceFile(api_noop.c, $(MESASRCDIR)/src) -LinkSourceFile(api_validate.c, $(MESASRCDIR)/src) -LinkSourceFile(attrib.c, $(MESASRCDIR)/src) -LinkSourceFile(blend.c, $(MESASRCDIR)/src) -LinkSourceFile(buffers.c, $(MESASRCDIR)/src) -LinkSourceFile(clip.c, $(MESASRCDIR)/src) -LinkSourceFile(colortab.c, $(MESASRCDIR)/src) -LinkSourceFile(context.c, $(MESASRCDIR)/src) -LinkSourceFile(convolve.c, $(MESASRCDIR)/src) -LinkSourceFile(debug.c, $(MESASRCDIR)/src) -LinkSourceFile(depth.c, $(MESASRCDIR)/src) -#ifdef NeedAllMesaSrc -LinkSourceFile(dispatch.c, $(MESASRCDIR)/src) -#endif -LinkSourceFile(dlist.c, $(MESASRCDIR)/src) -LinkSourceFile(drawpix.c, $(MESASRCDIR)/src) -LinkSourceFile(enable.c, $(MESASRCDIR)/src) -LinkSourceFile(enums.c, $(MESASRCDIR)/src) -LinkSourceFile(eval.c, $(MESASRCDIR)/src) -LinkSourceFile(extensions.c, $(MESASRCDIR)/src) -LinkSourceFile(feedback.c, $(MESASRCDIR)/src) -LinkSourceFile(fog.c, $(MESASRCDIR)/src) -LinkSourceFile(get.c, $(MESASRCDIR)/src) -#ifdef NeedAllMesaSrc -LinkSourceFile(glapi.c, $(MESASRCDIR)/src) -LinkSourceFile(glthread.c, $(MESASRCDIR)/src) -#endif -LinkSourceFile(hash.c, $(MESASRCDIR)/src) -LinkSourceFile(hint.c, $(MESASRCDIR)/src) -LinkSourceFile(histogram.c, $(MESASRCDIR)/src) -LinkSourceFile(image.c, $(MESASRCDIR)/src) -LinkSourceFile(imports.c, $(MESASRCDIR)/src) -LinkSourceFile(light.c, $(MESASRCDIR)/src) -LinkSourceFile(lines.c, $(MESASRCDIR)/src) -LinkSourceFile(matrix.c, $(MESASRCDIR)/src) -LinkSourceFile(mmath.c, $(MESASRCDIR)/src) -LinkSourceFile(pixel.c, $(MESASRCDIR)/src) -LinkSourceFile(points.c, $(MESASRCDIR)/src) -LinkSourceFile(polygon.c, $(MESASRCDIR)/src) -LinkSourceFile(rastpos.c, $(MESASRCDIR)/src) -LinkSourceFile(state.c, $(MESASRCDIR)/src) -LinkSourceFile(stencil.c, $(MESASRCDIR)/src) -LinkSourceFile(texcompress.c, $(MESASRCDIR)/src) -LinkSourceFile(texformat.c, $(MESASRCDIR)/src) -LinkSourceFile(teximage.c, $(MESASRCDIR)/src) -LinkSourceFile(texobj.c, $(MESASRCDIR)/src) -LinkSourceFile(texstate.c, $(MESASRCDIR)/src) -LinkSourceFile(texstore.c, $(MESASRCDIR)/src) -LinkSourceFile(texutil.c, $(MESASRCDIR)/src) -LinkSourceFile(varray.c, $(MESASRCDIR)/src) -LinkSourceFile(vtxfmt.c, $(MESASRCDIR)/src) -LinkSourceFile(vpexec.c, $(MESASRCDIR)/src) -LinkSourceFile(vpexec.h, $(MESASRCDIR)/src) -LinkSourceFile(vpparse.c, $(MESASRCDIR)/src) -LinkSourceFile(vpparse.h, $(MESASRCDIR)/src) -LinkSourceFile(vpstate.c, $(MESASRCDIR)/src) -LinkSourceFile(vpstate.h, $(MESASRCDIR)/src) - -#endif - -#ifdef NeedAllMesaSrc - DISPATCHOBJS = $(MESABUILDDIR)dispatch.o - GLAPIOBJS = $(MESABUILDDIR)glapi.o -GLAPINOOPOBJS = $(MESABUILDDIR)glapinoop.o - GLTHREADOBJS = $(MESABUILDDIR)glthread.o -#endif - -COREMESABASEOBJS = \ - $(MESABUILDDIR)accum.o \ - $(MESABUILDDIR)api_arrayelt.o \ - $(MESABUILDDIR)api_eval.o \ - $(MESABUILDDIR)api_loopback.o \ - $(MESABUILDDIR)api_noop.o \ - $(MESABUILDDIR)api_validate.o \ - $(MESABUILDDIR)attrib.o \ - $(MESABUILDDIR)blend.o \ - $(MESABUILDDIR)buffers.o \ - $(MESABUILDDIR)clip.o \ - $(MESABUILDDIR)colortab.o \ - $(MESABUILDDIR)context.o \ - $(MESABUILDDIR)convolve.o \ - $(MESABUILDDIR)debug.o \ - $(MESABUILDDIR)depth.o \ - $(DISPATCHOBJS) \ - $(MESABUILDDIR)dlist.o \ - $(MESABUILDDIR)drawpix.o \ - $(MESABUILDDIR)enable.o \ - $(MESABUILDDIR)enums.o \ - $(MESABUILDDIR)eval.o \ - $(MESABUILDDIR)extensions.o \ - $(MESABUILDDIR)feedback.o \ - $(MESABUILDDIR)fog.o \ - $(MESABUILDDIR)get.o \ - $(GLAPIOBJS) \ - $(GLTHREADOBJS) \ - $(MESABUILDDIR)hash.o \ - $(MESABUILDDIR)hint.o \ - $(MESABUILDDIR)histogram.o \ - $(MESABUILDDIR)image.o \ - $(MESABUILDDIR)imports.o \ - $(MESABUILDDIR)light.o \ - $(MESABUILDDIR)lines.o \ - $(MESABUILDDIR)matrix.o \ - $(MESABUILDDIR)mmath.o \ - $(MESABUILDDIR)pixel.o \ - $(MESABUILDDIR)points.o \ - $(MESABUILDDIR)polygon.o \ - $(MESABUILDDIR)rastpos.o \ - $(MESABUILDDIR)state.o \ - $(MESABUILDDIR)stencil.o \ - $(MESABUILDDIR)texcompress.o \ - $(MESABUILDDIR)texformat.o \ - $(MESABUILDDIR)teximage.o \ - $(MESABUILDDIR)texobj.o \ - $(MESABUILDDIR)texstate.o \ - $(MESABUILDDIR)texstore.o \ - $(MESABUILDDIR)texutil.o \ - $(MESABUILDDIR)varray.o \ - $(MESABUILDDIR)vtxfmt.o \ - $(MESABUILDDIR)vpexec.o \ - $(MESABUILDDIR)vpparse.o \ - $(MESABUILDDIR)vpstate.o - - -COREMESAOBJS = $(COREMESABASEOBJS) \ - $(MESA_AC_OBJS) \ - $(MESA_MATH_OBJS) \ - $(MESA_SWRAST_OBJS) \ - $(MESA_SWR_SETUP_OBJS) \ - $(MESA_TNL_OBJS) - -#ifdef NeedAllMesaSrc - DISPATCHUOBJS = $(MESABUILDDIR)unshared/dispatch.o - GLAPIUOBJS = $(MESABUILDDIR)unshared/glapi.o -GLAPINOOPUOBJS = $(MESABUILDDIR)unshared/glapinoop.o - GLTHREADUOBJS = $(MESABUILDDIR)unshared/glthread.o -#endif - -#if defined(DoSharedLib) && DoSharedLib -COREMESABASEUOBJS = $(MESABUILDDIR)unshared/accum.o \ - $(MESABUILDDIR)unshared/api_arrayelt.o \ - $(MESABUILDDIR)unshared/api_eval.o \ - $(MESABUILDDIR)unshared/api_loopback.o \ - $(MESABUILDDIR)unshared/api_noop.o \ - $(MESABUILDDIR)unshared/api_validate.o \ - $(MESABUILDDIR)unshared/attrib.o \ - $(MESABUILDDIR)unshared/blend.o \ - $(MESABUILDDIR)unshared/buffers.o \ - $(MESABUILDDIR)unshared/clip.o \ - $(MESABUILDDIR)unshared/colortab.o \ - $(MESABUILDDIR)unshared/context.o \ - $(MESABUILDDIR)unshared/convolve.o \ - $(MESABUILDDIR)unshared/debug.o \ - $(MESABUILDDIR)unshared/depth.o \ - $(DISPATCHUOBJS) \ - $(MESABUILDDIR)unshared/dlist.o \ - $(MESABUILDDIR)unshared/drawpix.o \ - $(MESABUILDDIR)unshared/enable.o \ - $(MESABUILDDIR)unshared/enums.o \ - $(MESABUILDDIR)unshared/eval.o \ - $(MESABUILDDIR)unshared/extensions.o \ - $(MESABUILDDIR)unshared/feedback.o \ - $(MESABUILDDIR)unshared/fog.o \ - $(MESABUILDDIR)unshared/get.o \ - $(GLAPIUOBJS) \ - $(GLTHREADUOBJS) \ - $(MESABUILDDIR)unshared/hash.o \ - $(MESABUILDDIR)unshared/hint.o \ - $(MESABUILDDIR)unshared/histogram.o \ - $(MESABUILDDIR)unshared/image.o \ - $(MESABUILDDIR)unshared/imports.o \ - $(MESABUILDDIR)unshared/light.o \ - $(MESABUILDDIR)unshared/lines.o \ - $(MESABUILDDIR)unshared/matrix.o \ - $(MESABUILDDIR)unshared/mmath.o \ - $(MESABUILDDIR)unshared/pixel.o \ - $(MESABUILDDIR)unshared/points.o \ - $(MESABUILDDIR)unshared/polygon.o \ - $(MESABUILDDIR)unshared/rastpos.o \ - $(MESABUILDDIR)unshared/state.o \ - $(MESABUILDDIR)unshared/stencil.o \ - $(MESABUILDDIR)unshared/texcompress.o \ - $(MESABUILDDIR)unshared/texformat.o \ - $(MESABUILDDIR)unshared/teximage.o \ - $(MESABUILDDIR)unshared/texobj.o \ - $(MESABUILDDIR)unshared/texstate.o \ - $(MESABUILDDIR)unshared/texstore.o \ - $(MESABUILDDIR)unshared/texutil.o \ - $(MESABUILDDIR)unshared/varray.o \ - $(MESABUILDDIR)unshared/vtxfmt.o \ - $(MESABUILDDIR)unshared/vpexec.o \ - $(MESABUILDDIR)unshared/vpparse.o \ - $(MESABUILDDIR)unshared/vpstate.o -#else -COREMESABASEUOBJS = $(COREMESABASEOBJS) -#endif - -COREMESAUOBJS = $(COREMESABASEUOBJS) \ - $(MESA_AC_UOBJS) \ - $(MESA_MATH_UOBJS) \ - $(MESA_SWRAST_UOBJS) \ - $(MESA_SWR_SETUP_UOBJS) \ - $(MESA_TNL_UOBJS) - -#ifdef NeedAllMesaSrc - DISPATCHDOBJS = $(MESABUILDDIR)debugger/dispatch.o - GLAPIDOBJS = $(MESABUILDDIR)debugger/glapi.o -GLAPINOOPDOBJS = $(MESABUILDDIR)debugger/glapinoop.o - GLTHREADDOBJS = $(MESABUILDDIR)debugger/glthread.o -#endif - -COREMESABASEDOBJS = $(MESABUILDDIR)debugger/accum.o \ - $(MESABUILDDIR)debugger/api_arrayelt.o \ - $(MESABUILDDIR)debugger/api_eval.o \ - $(MESABUILDDIR)debugger/api_loopback.o \ - $(MESABUILDDIR)debugger/api_noop.o \ - $(MESABUILDDIR)debugger/api_validate.o \ - $(MESABUILDDIR)debugger/attrib.o \ - $(MESABUILDDIR)debugger/blend.o \ - $(MESABUILDDIR)debugger/buffers.o \ - $(MESABUILDDIR)debugger/clip.o \ - $(MESABUILDDIR)debugger/colortab.o \ - $(MESABUILDDIR)debugger/context.o \ - $(MESABUILDDIR)debugger/convolve.o \ - $(MESABUILDDIR)debugger/debug.o \ - $(MESABUILDDIR)debugger/depth.o \ - $(DISPATCHDOBJS) \ - $(MESABUILDDIR)debugger/dlist.o \ - $(MESABUILDDIR)debugger/drawpix.o \ - $(MESABUILDDIR)debugger/enable.o \ - $(MESABUILDDIR)debugger/enums.o \ - $(MESABUILDDIR)debugger/eval.o \ - $(MESABUILDDIR)debugger/extensions.o \ - $(MESABUILDDIR)debugger/feedback.o \ - $(MESABUILDDIR)debugger/fog.o \ - $(MESABUILDDIR)debugger/get.o \ - $(GLAPIDOBJS) \ - $(GLTHREADDOBJS) \ - $(MESABUILDDIR)debugger/hash.o \ - $(MESABUILDDIR)debugger/hint.o \ - $(MESABUILDDIR)debugger/histogram.o \ - $(MESABUILDDIR)debugger/image.o \ - $(MESABUILDDIR)debugger/imports.o \ - $(MESABUILDDIR)debugger/light.o \ - $(MESABUILDDIR)debugger/lines.o \ - $(MESABUILDDIR)debugger/matrix.o \ - $(MESABUILDDIR)debugger/mmath.o \ - $(MESABUILDDIR)debugger/pixel.o \ - $(MESABUILDDIR)debugger/points.o \ - $(MESABUILDDIR)debugger/polygon.o \ - $(MESABUILDDIR)debugger/rastpos.o \ - $(MESABUILDDIR)debugger/state.o \ - $(MESABUILDDIR)debugger/stencil.o \ - $(MESABUILDDIR)debugger/texcompress.o \ - $(MESABUILDDIR)debugger/texformat.o \ - $(MESABUILDDIR)debugger/teximage.o \ - $(MESABUILDDIR)debugger/texobj.o \ - $(MESABUILDDIR)debugger/texstate.o \ - $(MESABUILDDIR)debugger/texstore.o \ - $(MESABUILDDIR)debugger/texutil.o \ - $(MESABUILDDIR)debugger/varray.o \ - $(MESABUILDDIR)debugger/vtxfmt.o \ - $(MESABUILDDIR)debugger/vpexec.o \ - $(MESABUILDDIR)debugger/vpparse.o \ - $(MESABUILDDIR)debugger/vpstate.o - -COREMESADOBJS = $(COREMESABASEDOBJS) \ - $(MESA_AC_DOBJS) \ - $(MESA_MATH_DOBJS) \ - $(MESA_SWRAST_DOBJS) \ - $(MESA_SWR_SETUP_DOBJS) \ - $(MESA_TNL_DOBJS) - -#ifdef NeedAllMesaSrc - DISPATCHPOBJS = $(MESABUILDDIR)profiled/dispatch.o - GLAPIPOBJS = $(MESABUILDDIR)profiled/glapi.o -GLAPINOOPPOBJS = $(MESABUILDDIR)profiled/glapinoop.o - GLTHREADPOBJS = $(MESABUILDDIR)profiled/glthread.o -#endif - -COREMESABASEPOBJS = $(MESABUILDDIR)profiled/accum.o \ - $(MESABUILDDIR)profiled/api_arrayelt.o \ - $(MESABUILDDIR)profiled/api_eval.o \ - $(MESABUILDDIR)profiled/api_loopback.o \ - $(MESABUILDDIR)profiled/api_noop.o \ - $(MESABUILDDIR)profiled/api_validate.o \ - $(MESABUILDDIR)profiled/attrib.o \ - $(MESABUILDDIR)profiled/blend.o \ - $(MESABUILDDIR)profiled/buffers.o \ - $(MESABUILDDIR)profiled/clip.o \ - $(MESABUILDDIR)profiled/colortab.o \ - $(MESABUILDDIR)profiled/context.o \ - $(MESABUILDDIR)profiled/convolve.o \ - $(MESABUILDDIR)profiled/debug.o \ - $(MESABUILDDIR)profiled/depth.o \ - $(DISPATCHPOBJS) \ - $(MESABUILDDIR)profiled/dlist.o \ - $(MESABUILDDIR)profiled/drawpix.o \ - $(MESABUILDDIR)profiled/enable.o \ - $(MESABUILDDIR)profiled/enums.o \ - $(MESABUILDDIR)profiled/eval.o \ - $(MESABUILDDIR)profiled/extensions.o \ - $(MESABUILDDIR)profiled/feedback.o \ - $(MESABUILDDIR)profiled/fog.o \ - $(MESABUILDDIR)profiled/get.o \ - $(GLAPIPOBJS) \ - $(GLTHREADPOBJS) \ - $(MESABUILDDIR)profiled/hash.o \ - $(MESABUILDDIR)profiled/hint.o \ - $(MESABUILDDIR)profiled/histogram.o \ - $(MESABUILDDIR)profiled/image.o \ - $(MESABUILDDIR)profiled/imports.o \ - $(MESABUILDDIR)profiled/light.o \ - $(MESABUILDDIR)profiled/lines.o \ - $(MESABUILDDIR)profiled/matrix.o \ - $(MESABUILDDIR)profiled/mmath.o \ - $(MESABUILDDIR)profiled/pixel.o \ - $(MESABUILDDIR)profiled/points.o \ - $(MESABUILDDIR)profiled/polygon.o \ - $(MESABUILDDIR)profiled/rastpos.o \ - $(MESABUILDDIR)profiled/state.o \ - $(MESABUILDDIR)profiled/stencil.o \ - $(MESABUILDDIR)profiled/texcompress.o \ - $(MESABUILDDIR)profiled/texformat.o \ - $(MESABUILDDIR)profiled/teximage.o \ - $(MESABUILDDIR)profiled/texobj.o \ - $(MESABUILDDIR)profiled/texstate.o \ - $(MESABUILDDIR)profiled/texstore.o \ - $(MESABUILDDIR)profiled/texutil.o \ - $(MESABUILDDIR)profiled/varray.o \ - $(MESABUILDDIR)profiled/vtxfmt.o \ - $(MESABUILDDIR)profiled/vpexec.o \ - $(MESABUILDDIR)profiled/vpparse.o \ - $(MESABUILDDIR)profiled/vpstate.o - -COREMESAPOBJS = $(COREMESABASEPOBJS) \ - $(MESA_AC_POBJS) \ - $(MESA_MATH_POBJS) \ - $(MESA_SWRAST_POBJS) \ - $(MESA_SWR_SETUP_POBJS) \ - $(MESA_TNL_POBJS) - diff --git a/xc/lib/GL/mesa/src/OSmesa/Imakefile b/xc/lib/GL/mesa/src/OSmesa/Imakefile deleted file mode 100644 index 66f34d80b..000000000 --- a/xc/lib/GL/mesa/src/OSmesa/Imakefile +++ /dev/null @@ -1,97 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/OSmesa/Imakefile,v 1.18 2003/03/25 04:18:08 dawes Exp $ - -#include - -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx - -#include "../array_cache/Imakefile.inc" -#include "../math/Imakefile.inc" -#include "../swrast/Imakefile.inc" -#include "../swrast_setup/Imakefile.inc" -#include "../tnl/Imakefile.inc" -#include "../tnl_dd/Imakefile.inc" -#include "../Imakefile.inc" -#if defined(i386Architecture) && !SystemV4 && MesaUseX86Asm -#include "../X86/Imakefile.inc" -#endif -#ifdef SparcArchitecture -#include "../SPARC/Imakefile.inc" -#endif - -LinkSourceFile(osmesa.c, $(MESASRCDIR)/src/OSmesa) - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/OSmesa -I$(MESASRCDIR)/src \ - -I$(MESASRCDIR)/include - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) - INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) $(MESA_INCLUDES) \ - $(DRI_INCLUDES) -I$(GLXLIBSRC)/include - - MESAOBJS = $(COREMESAOBJS) $(MESA_ASM_OBJS) - MESAUOBJS = $(COREMESAUOBJS) $(MESA_ASM_UOBJS) - MESADOBJS = $(COREMESADOBJS) $(MESA_ASM_DOBJS) - MESAPOBJS = $(COREMESAPOBJS) $(MESA_ASM_POBJS) - - SRCS = osmesa.c - OBJS = osmesa.o $(MESAOBJS) -#if DoSharedLib - UOBJS = unshared/osmesa.o $(MESAUOBJS) -#else - UOBJS = $(OBJS) -#endif - DOBJS = debugger/osmesa.o $(MESADOBJS) - POBJS = profiled/osmesa.o $(MESAPOBJS) - -#if LocalThreads - THREADOBJS = $(THREADS_LIBS) -#endif - -#if !GlxUseBuiltInDRIDriver - REQUIREDLIBS = $(LDPRELIB) $(GLXLIB) -#endif - -#include - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -LIBNAME = OSMesa -#if !defined(OS2Architecture) -SOREV = 4.0 -#else -SOREV = -#endif - - -#if DoNormalLib -NormalLibraryTarget($(LIBNAME), $(UOBJS)) -InstallLibrary($(LIBNAME),$(USRLIBDIR)) -#endif - -#if SharedLibGlx -SharedLibraryTarget($(LIBNAME),$(SOREV), $(OBJS), ., .) -InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR)) -#endif - -#if DoDebugLib -DebuggedLibraryTarget($(LIBNAME),$(DOBJS)) -InstallLibrary($(LIBNAME_d,$(USRLIBDIR)) -#endif - -#if DoProfileLib -ProfiledLibraryTarget($(LIBNAME), $(POBJS)) -InstallLibrary($(LIBNAME)_p,$(USRLIBDIR)) -#endif - -DependTarget() - diff --git a/xc/lib/GL/mesa/src/OSmesa/OSMesa-def.cpp b/xc/lib/GL/mesa/src/OSmesa/OSMesa-def.cpp deleted file mode 100644 index 51d51139b..000000000 --- a/xc/lib/GL/mesa/src/OSmesa/OSMesa-def.cpp +++ /dev/null @@ -1,29 +0,0 @@ -LIBRARY libOSmesa -VERSION LIBRARY_VERSION -EXPORTS - OSMesaCreateContext - OSMesaDestroyContext - OSMesaGetColorBuffer - OSMesaGetCurrentContext - OSMesaGetDepthBuffer - OSMesaGetIntegerv - OSMesaMakeCurrent - OSMesaPixelStore -#ifndef __UNIXOS2__ - _glapi_Context - _glapi_noop_enable_warnings - _glapi_add_entrypoint - _glapi_get_dispatch_table_size - _glapi_set_dispatch - _glapi_check_multithread - _glapi_set_context - glTexCoordPointer - glColorPointer - glNormalPointer - glVertexPointer - glDrawElements -#else - OSMesaCreateContextExt -#endif /* __UNIXOS2__ */ - -/* $XFree86: xc/lib/GL/mesa/src/OSmesa/OSMesa-def.cpp,v 1.2 2003/03/25 04:18:08 dawes Exp $ */ diff --git a/xc/lib/GL/mesa/src/SPARC/Imakefile b/xc/lib/GL/mesa/src/SPARC/Imakefile deleted file mode 100644 index 32176f3fd..000000000 --- a/xc/lib/GL/mesa/src/SPARC/Imakefile +++ /dev/null @@ -1,57 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/SPARC/Imakefile,v 1.3 2002/11/22 22:55:58 tsi Exp $ - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#define MesaSPARCBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - DEFINES = $(ALLOC_DEFINES) GlxDefines $(MESA_ASM_DEFINES) - INCLUDES = -I$(INCLUDESRC) -I$(EXTINCSRC) -I$(MESASRCDIR)/src \ - -I$(MESASRCDIR)/src/SPARC \ - -I../../../include - - SRCS = $(MESA_ASM_SRCS) - OBJS = $(MESA_ASM_OBJS) - -#include - -LibraryObjectRule() - -STD_CPP_DEFINES = StandardDefines $(PROJECT_DEFINES) - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -ObjectFromAsmSource(xform, NullParameter) -ObjectFromAsmSource(clip, NullParameter) -ObjectFromAsmSource(norm, NullParameter) - -DependTarget() diff --git a/xc/lib/GL/mesa/src/SPARC/Imakefile.inc b/xc/lib/GL/mesa/src/SPARC/Imakefile.inc deleted file mode 100644 index 444c2c551..000000000 --- a/xc/lib/GL/mesa/src/SPARC/Imakefile.inc +++ /dev/null @@ -1,58 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/SPARC/Imakefile.inc,v 1.2 2002/11/14 21:01:16 tsi Exp $ - -#ifndef MesaSPARCBuildDir -#define MesaSPARCBuildDir $(GLXLIBSRC)/mesa/src/SPARC/ -#endif - -MESASPARCBUILDDIR = MesaSPARCBuildDir - -MESA_SPARC_SRCS = $(MESASPARCBUILDDIR)sparc.c \ - $(MESASPARCBUILDDIR)xform.S \ - $(MESASPARCBUILDDIR)clip.S - -#ifdef NeedToLinkMesaSrc -/* If $(MESASRCDIR)/src/SPARC isn't in the INCLUDES, it should be. */ -LinkSourceFile(sparc.c, $(MESASRCDIR)/src/SPARC) -LinkSourceFile(xform.S, $(MESASRCDIR)/src/SPARC) -LinkSourceFile(clip.S, $(MESASRCDIR)/src/SPARC) -LinkSourceFile(norm.S, $(MESASRCDIR)/src/SPARC) -#endif - -MESA_SPARC_OBJS = $(MESASPARCBUILDDIR)sparc.o \ - $(MESASPARCBUILDDIR)xform.o \ - $(MESASPARCBUILDDIR)clip.o \ - $(MESASPARCBUILDDIR)norm.o - -#if defined(DoSharedLib) && DoSharedLib -MESA_SPARC_UOBJS = $(MESASPARCBUILDDIR)unshared/sparc.o \ - $(MESASPARCBUILDDIR)xform.o \ - $(MESASPARCBUILDDIR)clip.o \ - $(MESASPARCBUILDDIR)norm.o -#else -MESA_SPARC_UOBJS = $(MESA_SPARC_OBJS) -#endif - -MESA_SPARC_DOBJS = $(MESASPARCBUILDDIR)debugger/sparc.o \ - $(MESASPARCBUILDDIR)xform.o \ - $(MESASPARCBUILDDIR)clip.o \ - $(MESASPARCBUILDDIR)norm.o - -MESA_SPARC_POBJS = $(MESAX86BUILDDIR)profiled/sparc.o \ - $(MESAX86BUILDDIR)xform.o \ - $(MESAX86BUILDDIR)clip.o \ - $(MESAX86BUILDDIR)norm.o - -MESA_SPARC_DEFS = -DUSE_SPARC_ASM - -MESA_ASM_SRCS = $(MESA_SPARC_SRCS) - -MESA_ASM_OBJS = $(MESA_SPARC_OBJS) - -MESA_ASM_UOBJS = $(MESA_SPARC_UOBJS) - -MESA_ASM_DOBJS = $(MESA_SPARC_DOBJS) - -MESA_ASM_POBJS = $(MESA_SPARC_POBJS) - -MESA_ASM_DEFINES = $(MESA_SPARC_DEFS) - diff --git a/xc/lib/GL/mesa/src/X/Imakefile b/xc/lib/GL/mesa/src/X/Imakefile deleted file mode 100644 index cfdc45f8c..000000000 --- a/xc/lib/GL/mesa/src/X/Imakefile +++ /dev/null @@ -1,70 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.13 2002/11/22 22:55:59 tsi Exp $ - -#include - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - - -#define MesaXBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src \ - -I$(MESASRCDIR)/src/X \ - -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) - - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - -#if BuildXF86DRI && GlxBuiltInXMesa - XMESA_DEFINES = -DGLX_BUILT_IN_XMESA -#endif - - SRCS = $(XMESA_SRCS) - OBJS = $(XMESA_OBJS) - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MATHDEF) $(XMESA_DEFINES) - -#include - -LibraryObjectRule() - -SubdirLibraryRule($(XMESA_OBJS)) -NormalLintTarget($(XMESA_SRCS)) - -DependTarget() diff --git a/xc/lib/GL/mesa/src/X/Imakefile.inc b/xc/lib/GL/mesa/src/X/Imakefile.inc deleted file mode 100644 index 7c3575290..000000000 --- a/xc/lib/GL/mesa/src/X/Imakefile.inc +++ /dev/null @@ -1,98 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile.inc,v 1.4 2002/11/14 21:01:16 tsi Exp $ - -#ifndef MesaXBuildDir -#define MesaXBuildDir $(GLXLIBSRC)/mesa/src/X/ -#endif - -MESAXBUILDDIR = MesaXBuildDir - -#ifndef MesaInXServer -XMESA_GLX_SRCS = $(MESAXBUILDDIR)fakeglx.c \ - $(MESAXBUILDDIR)glxapi.c \ - $(MESAXBUILDDIR)realglx.c \ - $(MESAXBUILDDIR)xfonts.c -#endif - - XMESA_SRCS = $(XMESA_GLX_SRCS) \ - $(MESAXBUILDDIR)xm_api.c \ - $(MESAXBUILDDIR)xm_dd.c \ - $(MESAXBUILDDIR)xm_line.c \ - $(MESAXBUILDDIR)xm_span.c \ - $(MESAXBUILDDIR)xm_tri.c - -#ifdef NeedToLinkMesaSrc -#ifndef MesaInXServer -LinkSourceFile(fakeglx.c, $(MESASRCDIR)/src/X) -LinkSourceFile(glxapi.c, $(MESASRCDIR)/src/X) -LinkSourceFile(glxapi.h, $(MESASRCDIR)/src/X) -LinkSourceFile(realglx.c, $(MESASRCDIR)/src/X) -LinkSourceFile(xfonts.c, $(MESASRCDIR)/src/X) -#endif -LinkSourceFile(xm_api.c, $(MESASRCDIR)/src/X) -LinkSourceFile(xm_dd.c, $(MESASRCDIR)/src/X) -LinkSourceFile(xm_line.c, $(MESASRCDIR)/src/X) -LinkSourceFile(xm_span.c, $(MESASRCDIR)/src/X) -LinkSourceFile(xm_tri.c, $(MESASRCDIR)/src/X) -#endif - -#ifndef MesaInXServer -XMESA_GLX_OBJS = $(MESAXBUILDDIR)fakeglx.o \ - $(MESAXBUILDDIR)glxapi.o \ - $(MESAXBUILDDIR)realglx.o \ - $(MESAXBUILDDIR)xfonts.o -#endif - - XMESA_OBJS = $(XMESA_GLX_OBJS) \ - $(MESAXBUILDDIR)xm_api.o \ - $(MESAXBUILDDIR)xm_dd.o \ - $(MESAXBUILDDIR)xm_line.o \ - $(MESAXBUILDDIR)xm_span.o \ - $(MESAXBUILDDIR)xm_tri.o - -#if defined(DoSharedLib) && DoSharedLib -#ifndef MesaInXServer -XMESA_GLX_UOBJS = $(MESAXBUILDDIR)unshared/fakeglx.o \ - $(MESAXBUILDDIR)unshared/glxapi.o \ - $(MESAXBUILDDIR)unshared/realglx.o \ - $(MESAXBUILDDIR)unshared/xfonts.o -#endif - - XMESA_UOBJS = $(XMESA_GLX_UOBJS) \ - $(MESAXBUILDDIR)unshared/xm_api.o \ - $(MESAXBUILDDIR)unshared/xm_dd.o \ - $(MESAXBUILDDIR)unshared/xm_line.o \ - $(MESAXBUILDDIR)unshared/xm_span.o \ - $(MESAXBUILDDIR)unshared/xm_tri.o -#else -XMESA_GLX_UOBJS = $(XMESA_GLX_OBJS) - XMESA_UOBJS = $(XMESA_OBJS) -#endif - -#ifndef MesaInXServer -XMESA_GLX_DOBJS = $(MESAXBUILDDIR)debugger/fakeglx.o \ - $(MESAXBUILDDIR)debugger/glxapi.o \ - $(MESAXBUILDDIR)debugger/realglx.o \ - $(MESAXBUILDDIR)debugger/xfonts.o -#endif - - XMESA_DOBJS = $(XMESA_GLX_DOBJS) \ - $(MESAXBUILDDIR)debugger/xm_api.o \ - $(MESAXBUILDDIR)debugger/xm_dd.o \ - $(MESAXBUILDDIR)debugger/xm_line.o \ - $(MESAXBUILDDIR)debugger/xm_span.o \ - $(MESAXBUILDDIR)debugger/xm_tri.o - -#ifndef MesaInXServer -XMESA_GLX_POBJS = $(MESAXBUILDDIR)profiled/fakeglx.o \ - $(MESAXBUILDDIR)profiled/glxapi.o \ - $(MESAXBUILDDIR)profiled/realglx.o \ - $(MESAXBUILDDIR)profiled/xfonts.o -#endif - - XMESA_POBJS = $(XMESA_GLX_POBJS) \ - $(MESAXBUILDDIR)profiled/xm_api.o \ - $(MESAXBUILDDIR)profiled/xm_dd.o \ - $(MESAXBUILDDIR)profiled/xm_line.o \ - $(MESAXBUILDDIR)profiled/xm_span.o \ - $(MESAXBUILDDIR)profiled/xm_tri.o - diff --git a/xc/lib/GL/mesa/src/X86/Imakefile b/xc/lib/GL/mesa/src/X86/Imakefile deleted file mode 100644 index d32d565d7..000000000 --- a/xc/lib/GL/mesa/src/X86/Imakefile +++ /dev/null @@ -1,98 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile,v 1.26 2003/03/06 22:24:50 herrb Exp $ - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#define MesaX86BuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - DEFINES = $(ALLOC_DEFINES) GlxDefines $(MESA_ASM_DEFINES) - INCLUDES = -I$(INCLUDESRC) -I$(EXTINCSRC) -I$(MESASRCDIR)/src \ - -I$(MESASRCDIR)/src/X86 \ - -I../../../include - - SRCS = $(MESA_ASM_SRCS) gen_matypes.c - OBJS = $(MESA_ASM_OBJS) - -#include - -LibraryObjectRule() - -STD_CPP_DEFINES = StandardDefines $(PROJECT_DEFINES) - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -ObjectFromAsmSource(common_x86_asm, NullParameter) - -ObjectFromAsmSource(x86_cliptest, NullParameter) -ObjectFromAsmSource(x86_xform2, NullParameter) -ObjectFromAsmSource(x86_xform3, NullParameter) -ObjectFromAsmSource(x86_xform4, NullParameter) - -#if MesaUseMMX -ObjectFromAsmSource(mmx_blend, NullParameter) -#endif - -#if MesaUse3DNow -ObjectFromAsmSource(3dnow_normal, NullParameter) -ObjectFromAsmSource(3dnow_xform1, NullParameter) -ObjectFromAsmSource(3dnow_xform2, NullParameter) -ObjectFromAsmSource(3dnow_xform3, NullParameter) -ObjectFromAsmSource(3dnow_xform4, NullParameter) -#endif - -#if MesaUseSSE -ObjectFromAsmSource(sse_normal, NullParameter) -ObjectFromAsmSource(sse_xform1, NullParameter) -ObjectFromAsmSource(sse_xform2, NullParameter) -ObjectFromAsmSource(sse_xform3, NullParameter) -ObjectFromAsmSource(sse_xform4, NullParameter) -#endif - -LinkSourceFile(gen_matypes.c, $(MESASRCDIR)/src/X86) - -MATYPES = ./gen_matypes - -matypes.h: gen_matypes.c - RemoveFiles($@ HostProgramTargetName(gen_matypes)) - -HostLinkRule(HostProgramTargetName(gen_matypes),$(CFLAGS) $(LOCAL_LDFLAGS),gen_matypes.c,$(LDLIBS)) - RunProgram(MATYPES,> matypes_h) - $(MV) matypes_h $@ - RemoveFiles(HostProgramTargetName(gen_matypes)) - -includes:: matypes.h - -depend:: matypes.h - -clean:: - RemoveFiles(matypes.h HostProgramTargetName(gen_matypes)) - -DependTarget() diff --git a/xc/lib/GL/mesa/src/X86/Imakefile.inc b/xc/lib/GL/mesa/src/X86/Imakefile.inc deleted file mode 100644 index ff16a3373..000000000 --- a/xc/lib/GL/mesa/src/X86/Imakefile.inc +++ /dev/null @@ -1,203 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile.inc,v 1.6 2002/11/25 12:58:55 tsi Exp $ - -#ifndef MesaX86BuildDir -#define MesaX86BuildDir $(GLXLIBSRC)/mesa/src/X86/ -#endif - -MESAX86BUILDDIR = MesaX86BuildDir - -MESA_X86_SRCS = $(MESAX86BUILDDIR)common_x86.c \ - $(MESAX86BUILDDIR)common_x86_asm.S \ - $(MESAX86BUILDDIR)glapi_x86.S \ - $(MESAX86BUILDDIR)x86.c \ - $(MESAX86BUILDDIR)x86_cliptest.S \ - $(MESAX86BUILDDIR)x86_xform2.S \ - $(MESAX86BUILDDIR)x86_xform3.S \ - $(MESAX86BUILDDIR)x86_xform4.S - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(common_x86.c, $(MESASRCDIR)/src/X86) -LinkSourceFile(common_x86_asm.S, $(MESASRCDIR)/src/X86) -LinkSourceFile(glapi_x86.S, $(MESASRCDIR)/src/X86) -LinkSourceFile(x86.c, $(MESASRCDIR)/src/X86) -LinkSourceFile(x86_cliptest.S, $(MESASRCDIR)/src/X86) -LinkSourceFile(x86_xform2.S, $(MESASRCDIR)/src/X86) -LinkSourceFile(x86_xform3.S, $(MESASRCDIR)/src/X86) -LinkSourceFile(x86_xform4.S, $(MESASRCDIR)/src/X86) -#endif - -MESA_X86_OBJS = $(MESAX86BUILDDIR)common_x86.o \ - $(MESAX86BUILDDIR)common_x86_asm.o \ - $(MESAX86BUILDDIR)x86.o \ - $(MESAX86BUILDDIR)x86_cliptest.o \ - $(MESAX86BUILDDIR)x86_xform2.o \ - $(MESAX86BUILDDIR)x86_xform3.o \ - $(MESAX86BUILDDIR)x86_xform4.o - -#if defined(DoSharedLib) && DoSharedLib -MESA_X86_UOBJS = $(MESAX86BUILDDIR)unshared/common_x86.o \ - $(MESAX86BUILDDIR)common_x86_asm.o \ - $(MESAX86BUILDDIR)unshared/x86.o \ - $(MESAX86BUILDDIR)x86_cliptest.o \ - $(MESAX86BUILDDIR)x86_xform2.o \ - $(MESAX86BUILDDIR)x86_xform3.o \ - $(MESAX86BUILDDIR)x86_xform4.o -#else -MESA_X86_UOBJS = $(MESA_X86_OBJS) -#endif - -MESA_X86_DOBJS = $(MESAX86BUILDDIR)debugger/common_x86.o \ - $(MESAX86BUILDDIR)common_x86_asm.o \ - $(MESAX86BUILDDIR)debugger/x86.o \ - $(MESAX86BUILDDIR)x86_cliptest.o \ - $(MESAX86BUILDDIR)x86_xform2.o \ - $(MESAX86BUILDDIR)x86_xform3.o \ - $(MESAX86BUILDDIR)x86_xform4.o - -MESA_X86_POBJS = $(MESAX86BUILDDIR)profiled/common_x86.o \ - $(MESAX86BUILDDIR)common_x86_asm.o \ - $(MESAX86BUILDDIR)profiled/x86.o \ - $(MESAX86BUILDDIR)x86_cliptest.o \ - $(MESAX86BUILDDIR)x86_xform2.o \ - $(MESAX86BUILDDIR)x86_xform3.o \ - $(MESAX86BUILDDIR)x86_xform4.o - -MESA_X86_DEFS = -DUSE_X86_ASM - - -#if MesaUseMMX -MESA_MMX_SRCS = $(MESAX86BUILDDIR)mmx_blend.S - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(mmx_blend.S, $(MESASRCDIR)/src/X86) -#endif - -MESA_MMX_OBJS = $(MESAX86BUILDDIR)mmx_blend.o - -MESA_MMX_UOBJS = $(MESA_MMX_OBJS) -MESA_MMX_DOBJS = $(MESA_MMX_OBJS) -MESA_MMX_POBJS = $(MESA_MMX_OBJS) - -MESA_MMX_DEFS = -DUSE_MMX_ASM -#endif - -#if MesaUse3DNow -MESA_3DNOW_SRCS = $(MESAX86BUILDDIR)3dnow.c \ - $(MESAX86BUILDDIR)3dnow_normal.S \ - $(MESAX86BUILDDIR)3dnow_xform1.S \ - $(MESAX86BUILDDIR)3dnow_xform2.S \ - $(MESAX86BUILDDIR)3dnow_xform3.S \ - $(MESAX86BUILDDIR)3dnow_xform4.S - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(3dnow.c, $(MESASRCDIR)/src/X86) -LinkSourceFile(3dnow_normal.S, $(MESASRCDIR)/src/X86) -LinkSourceFile(3dnow_xform1.S, $(MESASRCDIR)/src/X86) -LinkSourceFile(3dnow_xform2.S, $(MESASRCDIR)/src/X86) -LinkSourceFile(3dnow_xform3.S, $(MESASRCDIR)/src/X86) -LinkSourceFile(3dnow_xform4.S, $(MESASRCDIR)/src/X86) -#endif -MESA_3DNOW_OBJS = $(MESAX86BUILDDIR)3dnow.o \ - $(MESAX86BUILDDIR)3dnow_normal.o \ - $(MESAX86BUILDDIR)3dnow_xform1.o \ - $(MESAX86BUILDDIR)3dnow_xform2.o \ - $(MESAX86BUILDDIR)3dnow_xform3.o \ - $(MESAX86BUILDDIR)3dnow_xform4.o - -#if defined(DoSharedLib) && DoSharedLib -MESA_3DNOW_UOBJS = $(MESAX86BUILDDIR)unshared/3dnow.o \ - $(MESAX86BUILDDIR)3dnow_normal.o \ - $(MESAX86BUILDDIR)3dnow_xform1.o \ - $(MESAX86BUILDDIR)3dnow_xform2.o \ - $(MESAX86BUILDDIR)3dnow_xform3.o \ - $(MESAX86BUILDDIR)3dnow_xform4.o -#else -MESA_3DNOW_UOBJS = $(MESA_3DNOW_OBJS) -#endif - -MESA_3DNOW_DOBJS = $(MESAX86BUILDDIR)debugger/3dnow.o \ - $(MESAX86BUILDDIR)3dnow_normal.o \ - $(MESAX86BUILDDIR)3dnow_xform1.o \ - $(MESAX86BUILDDIR)3dnow_xform2.o \ - $(MESAX86BUILDDIR)3dnow_xform3.o \ - $(MESAX86BUILDDIR)3dnow_xform4.o - -MESA_3DNOW_POBJS = $(MESAX86BUILDDIR)profiled/3dnow.o \ - $(MESAX86BUILDDIR)3dnow_normal.o \ - $(MESAX86BUILDDIR)3dnow_xform1.o \ - $(MESAX86BUILDDIR)3dnow_xform2.o \ - $(MESAX86BUILDDIR)3dnow_xform3.o \ - $(MESAX86BUILDDIR)3dnow_xform4.o - -MESA_3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif - -#if MesaUseSSE -MESA_SSE_SRCS = $(MESAX86BUILDDIR)sse.c \ - $(MESAX86BUILDDIR)sse_normal.S \ - $(MESAX86BUILDDIR)sse_xform1.S \ - $(MESAX86BUILDDIR)sse_xform2.S \ - $(MESAX86BUILDDIR)sse_xform3.S \ - $(MESAX86BUILDDIR)sse_xform4.S - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(sse.c, $(MESASRCDIR)/src/X86) -LinkSourceFile(sse_normal.S, $(MESASRCDIR)/src/X86) -LinkSourceFile(sse_xform1.S, $(MESASRCDIR)/src/X86) -LinkSourceFile(sse_xform2.S, $(MESASRCDIR)/src/X86) -LinkSourceFile(sse_xform3.S, $(MESASRCDIR)/src/X86) -LinkSourceFile(sse_xform4.S, $(MESASRCDIR)/src/X86) -#endif - -MESA_SSE_OBJS = $(MESAX86BUILDDIR)sse.o \ - $(MESAX86BUILDDIR)sse_normal.o \ - $(MESAX86BUILDDIR)sse_xform1.o \ - $(MESAX86BUILDDIR)sse_xform2.o \ - $(MESAX86BUILDDIR)sse_xform3.o \ - $(MESAX86BUILDDIR)sse_xform4.o - -#if defined(DoSharedLib) && DoSharedLib -MESA_SSE_UOBJS = $(MESAX86BUILDDIR)unshared/sse.o \ - $(MESAX86BUILDDIR)sse_normal.o \ - $(MESAX86BUILDDIR)sse_xform1.o \ - $(MESAX86BUILDDIR)sse_xform2.o \ - $(MESAX86BUILDDIR)sse_xform3.o \ - $(MESAX86BUILDDIR)sse_xform4.o -#else -MESA_SSE_UOBJS = $(MESA_SSE_OBJS) -#endif - -MESA_SSE_DOBJS = $(MESAX86BUILDDIR)debugger/sse.o \ - $(MESAX86BUILDDIR)sse_normal.o \ - $(MESAX86BUILDDIR)sse_xform1.o \ - $(MESAX86BUILDDIR)sse_xform2.o \ - $(MESAX86BUILDDIR)sse_xform3.o \ - $(MESAX86BUILDDIR)sse_xform4.o - -MESA_SSE_POBJS = $(MESAX86BUILDDIR)profiled/sse.o \ - $(MESAX86BUILDDIR)sse_normal.o \ - $(MESAX86BUILDDIR)sse_xform1.o \ - $(MESAX86BUILDDIR)sse_xform2.o \ - $(MESAX86BUILDDIR)sse_xform3.o \ - $(MESAX86BUILDDIR)sse_xform4.o - -MESA_SSE_DEFS = -DUSE_SSE_ASM -#endif - -MESA_ASM_SRCS = $(MESA_X86_SRCS) $(MESA_MMX_SRCS) $(MESA_3DNOW_SRCS) \ - $(MESA_SSE_SRCS) - -MESA_ASM_OBJS = $(MESA_X86_OBJS) $(MESA_MMX_OBJS) $(MESA_3DNOW_OBJS) \ - $(MESA_SSE_OBJS) - -MESA_ASM_UOBJS = $(MESA_X86_UOBJS) $(MESA_MMX_UOBJS) $(MESA_3DNOW_UOBJS) \ - $(MESA_SSE_UOBJS) - -MESA_ASM_DOBJS = $(MESA_X86_DOBJS) $(MESA_MMX_DOBJS) $(MESA_3DNOW_DOBJS) \ - $(MESA_SSE_DOBJS) - -MESA_ASM_POBJS = $(MESA_X86_POBJS) $(MESA_MMX_POBJS) $(MESA_3DNOW_POBJS) \ - $(MESA_SSE_POBJS) - -MESA_ASM_DEFINES = $(MESA_X86_DEFS) $(MESA_MMX_DEFS) $(MESA_3DNOW_DEFS) $(MESA_SSE_DEFS) - diff --git a/xc/lib/GL/mesa/src/array_cache/Imakefile b/xc/lib/GL/mesa/src/array_cache/Imakefile deleted file mode 100644 index cffb06cba..000000000 --- a/xc/lib/GL/mesa/src/array_cache/Imakefile +++ /dev/null @@ -1,89 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/array_cache/Imakefile,v 1.9 2002/11/25 14:04:50 eich Exp $ - -#include - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - - -#define MesaACBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src \ - -I$(MESASRCDIR)/src/array_cache \ - -I$(MESASRCDIR)/src/math \ - -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) - - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = $(MESA_AC_SRCS) - OBJS = $(MESA_AC_OBJS) - - -#if defined(i386Architecture) && MesaUseX86Asm - ASM_SRCS = - ASM_OBJS = -#if MesaUseMMX - MMX_DEFS = -DUSE_MMX_ASM -#endif -#if MesaUse3DNow - 3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif -#if MesaUseSSE - SSE_DEFS = -DUSE_SSE_ASM -#endif - ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) -#endif - -#ifdef SparcArchitecture - ASM_SRCS = - ASM_OBJS = - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) - -#include - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/xc/lib/GL/mesa/src/array_cache/Imakefile.inc b/xc/lib/GL/mesa/src/array_cache/Imakefile.inc deleted file mode 100644 index d3ee37046..000000000 --- a/xc/lib/GL/mesa/src/array_cache/Imakefile.inc +++ /dev/null @@ -1,32 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/array_cache/Imakefile.inc,v 1.2 2002/11/14 21:01:16 tsi Exp $ - -#ifndef MesaACBuildDir -#define MesaACBuildDir $(GLXLIBSRC)/mesa/src/array_cache/ -#endif - -MESAACBUILDDIR = MesaACBuildDir - - MESA_AC_SRCS = $(MESAACBUILDDIR)ac_context.c \ - $(MESAACBUILDDIR)ac_import.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(ac_context.c, $(MESASRCDIR)/src/array_cache) -LinkSourceFile(ac_import.c, $(MESASRCDIR)/src/array_cache) -#endif - - MESA_AC_OBJS = $(MESAACBUILDDIR)ac_context.o \ - $(MESAACBUILDDIR)ac_import.o - -#if defined(DoSharedLib) && DoSharedLib - MESA_AC_UOBJS = $(MESAACBUILDDIR)unshared/ac_context.o \ - $(MESAACBUILDDIR)unshared/ac_import.o -#else - MESA_AC_UOBJS = $(MESA_AC_OBJS) -#endif - - MESA_AC_DOBJS = $(MESAACBUILDDIR)debugger/ac_context.o \ - $(MESAACBUILDDIR)debugger/ac_import.o - - MESA_AC_POBJS = $(MESAACBUILDDIR)profiled/ac_context.o \ - $(MESAACBUILDDIR)profiled/ac_import.o - diff --git a/xc/lib/GL/mesa/src/drv/Imakefile b/xc/lib/GL/mesa/src/drv/Imakefile deleted file mode 100644 index 8c7068088..000000000 --- a/xc/lib/GL/mesa/src/drv/Imakefile +++ /dev/null @@ -1,15 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/Imakefile,v 1.19 2001/03/23 20:56:33 dawes Exp $ - -#ifdef DriDrivers - -#define IHaveSubdirs -#define PassCDebugFlags - -SUBDIRS = common DriDrivers - -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) - -DependTarget() - -#endif diff --git a/xc/lib/GL/mesa/src/drv/common/Imakefile b/xc/lib/GL/mesa/src/drv/common/Imakefile deleted file mode 100644 index 0f244f73d..000000000 --- a/xc/lib/GL/mesa/src/drv/common/Imakefile +++ /dev/null @@ -1,42 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/common/Imakefile,v 1.6 2001/04/03 02:29:34 dawes Exp $ - -#include - -#if GlxUseBuiltInDRIDriver -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtrasLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -#define MesaDrvCommonBuildDir /**/ -#include "Imakefile.inc" - -#if defined(i386Architecture) && MesaUseX86Asm -#include "../../X86/Imakefile.inc" -#endif -#ifdef SparcArchitecture -#include "../../SPARC/Imakefile.inc" -#endif - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) - INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) $(EXPATINCLUDES) - - SRCS = $(MMSRC) $(UTILSSRC) $(TEXMEMSRC) $(VBLANKSRC) $(XMLCONFIGSRC) - OBJS = $(MMOBJ) $(UTILSOBJ) $(TEXMEMOBJ) $(VBLANKOBJ) $(XMLCONFIGOBJ) - -#include - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/xc/lib/GL/mesa/src/drv/common/Imakefile.inc b/xc/lib/GL/mesa/src/drv/common/Imakefile.inc deleted file mode 100644 index 2c65e9d2e..000000000 --- a/xc/lib/GL/mesa/src/drv/common/Imakefile.inc +++ /dev/null @@ -1,72 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/common/Imakefile.inc,v 1.3 2003/05/27 16:34:32 tsi Exp $ - -#ifndef MesaDrvSrcDir -#define MesaDrvSrcDir $(GLXLIBSRC)/mesa/src/drv -#endif - -MESADRVSRCDIR = MesaDrvSrcDir - -#ifndef MesaDrvCommonBuildDir -#define MesaDrvCommonBuildDir $(MESADRVSRCDIR)/common/ -#endif -MESADRVCOMMONBUILDDIR = MesaDrvCommonBuildDir - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=$(X_BYTE_ORDER) - DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ - -I$(GLXLIBSRC)/glx \ - -I$(INCLUDESRC) \ - -I$(INCLUDESRC)/GL \ - -I$(SERVERSRC)/GL/dri \ - -I$(XF86OSSRC) \ - -I$(XF86COMSRC) \ - -I$(GLXLIBSRC)/dri/drm \ - -I$(GLXLIBSRC)/include -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src \ - -I$(MESADRVSRCDIR)/common - X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) - - MMSRC = $(MESADRVCOMMONBUILDDIR)mm.c - UTILSSRC = $(MESADRVCOMMONBUILDDIR)utils.c - TEXMEMSRC = $(MESADRVCOMMONBUILDDIR)texmem.c - VBLANKSRC = $(MESADRVCOMMONBUILDDIR)vblank.c - XMLCONFIGSRC = $(MESADRVCOMMONBUILDDIR)xmlconfig.c - - MMOBJ = $(MESADRVCOMMONBUILDDIR)mm.o - UTILSOBJ = $(MESADRVCOMMONBUILDDIR)utils.o - TEXMEMOBJ = $(MESADRVCOMMONBUILDDIR)texmem.o - VBLANKOBJ = $(MESADRVCOMMONBUILDDIR)vblank.o - XMLCONFIGOBJ = $(MESADRVCOMMONBUILDDIR)xmlconfig.o - - MMUOBJ = $(MESADRVCOMMONBUILDDIR)unshared/mm.o - UTILSUOBJ = $(MESADRVCOMMONBUILDDIR)unshared/utils.o - TEXMEMUOBJ = $(MESADRVCOMMONBUILDDIR)unshared/texmem.o - VBLANKUOBJ = $(MESADRVCOMMONBUILDDIR)unshared/vblank.o -XMLCONFIGUOBJ = $(MESADRVCOMMONBUILDDIR)unshared/xmlconfig.o - - MMDOBJ = $(MESADRVCOMMONBUILDDIR)debugger/mm.o - UTILSDOBJ = $(MESADRVCOMMONBUILDDIR)debugger/utils.o - TEXMEMDOBJ = $(MESADRVCOMMONBUILDDIR)debugger/texmem.o - VBLANKDOBJ = $(MESADRVCOMMONBUILDDIR)debugger/vblank.o -XMLCONFIGDOBJ = $(MESADRVCOMMONBUILDDIR)debugger/xmlconfig.o - - MMPOBJ = $(MESADRVCOMMONBUILDDIR)profiled/mm.o - UTILSPOBJ = $(MESADRVCOMMONBUILDDIR)profiled/utils.o - TEXMEMPOBJ = $(MESADRVCOMMONBUILDDIR)profiled/texmem.o - VBLANKPOBJ = $(MESADRVCOMMONBUILDDIR)profiled/vblank.o -XMLCONFIGPOBJ = $(MESADRVCOMMONBUILDDIR)profiled/xmlconfig.o - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(hwlog.c, $(MESADRVSRCDIR)/common) -LinkSourceFile(mm.c, $(MESADRVSRCDIR)/common) -LinkSourceFile(texmem.c, $(MESADRVSRCDIR)/common) -LinkSourceFile(utils.c, $(MESADRVSRCDIR)/common) -LinkSourceFile(vblank.c, $(MESADRVSRCDIR)/common) -LinkSourceFile(xmlconfig.c, $(MESADRVSRCDIR)/common) -#endif diff --git a/xc/lib/GL/mesa/src/drv/common/depthtmp.h b/xc/lib/GL/mesa/src/drv/common/depthtmp.h deleted file mode 100644 index f3da61e51..000000000 --- a/xc/lib/GL/mesa/src/drv/common/depthtmp.h +++ /dev/null @@ -1,176 +0,0 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/common/depthtmp.h,v 1.5 2001/03/21 16:14:20 dawes Exp $ */ - -#ifndef DBG -#define DBG 0 -#endif - - -#ifndef HAVE_HW_DEPTH_SPANS -#define HAVE_HW_DEPTH_SPANS 0 -#endif -#ifndef HAVE_HW_DEPTH_PIXELS -#define HAVE_HW_DEPTH_PIXELS 0 -#endif - -#ifndef HW_READ_LOCK -#define HW_READ_LOCK() HW_LOCK() -#endif -#ifndef HW_READ_UNLOCK -#define HW_READ_UNLOCK() HW_UNLOCK() -#endif - -static void TAG(WriteDepthSpan)( GLcontext *ctx, - GLuint n, GLint x, GLint y, - const GLdepth *depth, - const GLubyte mask[] ) -{ - HW_WRITE_LOCK() - { - GLint x1; - GLint n1; - LOCAL_DEPTH_VARS; - - y = Y_FLIP( y ); - -#if HAVE_HW_DEPTH_SPANS - (void) x1; (void) n1; - - if ( DBG ) fprintf( stderr, "WriteDepthSpan 0..%d (x1 %d)\n", - (int)n, (int)x ); - - WRITE_DEPTH_SPAN(); -#else - HW_CLIPLOOP() - { - GLint i = 0; - CLIPSPAN( x, y, n, x1, n1, i ); - - if ( DBG ) fprintf( stderr, "WriteDepthSpan %d..%d (x1 %d)\n", - (int)i, (int)n1, (int)x1 ); - - if ( mask ) { - for ( ; i < n1 ; i++, x1++ ) { - if ( mask[i] ) WRITE_DEPTH( x1, y, depth[i] ); - } - } else { - for ( ; i < n1 ; i++, x1++ ) { - WRITE_DEPTH( x1, y, depth[i] ); - } - } - } - HW_ENDCLIPLOOP(); -#endif - } - HW_WRITE_UNLOCK(); -} - -static void TAG(WriteDepthPixels)( GLcontext *ctx, - GLuint n, - const GLint x[], - const GLint y[], - const GLdepth depth[], - const GLubyte mask[] ) -{ - HW_WRITE_LOCK() - { - GLint i; - LOCAL_DEPTH_VARS; - - if ( DBG ) fprintf( stderr, "WriteDepthPixels\n" ); - -#if HAVE_HW_DEPTH_PIXELS - (void) i; - - WRITE_DEPTH_PIXELS(); -#else - HW_CLIPLOOP() - { - for ( i = 0 ; i < n ; i++ ) { - if ( mask[i] ) { - const int fy = Y_FLIP( y[i] ); - if ( CLIPPIXEL( x[i], fy ) ) - WRITE_DEPTH( x[i], fy, depth[i] ); - } - } - } - HW_ENDCLIPLOOP(); -#endif - } - HW_WRITE_UNLOCK(); -} - - -/* Read depth spans and pixels - */ -static void TAG(ReadDepthSpan)( GLcontext *ctx, - GLuint n, GLint x, GLint y, - GLdepth depth[] ) -{ - HW_READ_LOCK() - { - GLint x1, n1; - LOCAL_DEPTH_VARS; - - y = Y_FLIP( y ); - - if ( DBG ) fprintf( stderr, "ReadDepthSpan\n" ); - -#if HAVE_HW_DEPTH_SPANS - (void) x1; (void) n1; - - READ_DEPTH_SPAN(); -#else - HW_CLIPLOOP() - { - GLint i = 0; - CLIPSPAN( x, y, n, x1, n1, i ); - for ( ; i < n1 ; i++ ) - READ_DEPTH( depth[i], (x1+i), y ); - } - HW_ENDCLIPLOOP(); -#endif - } - HW_READ_UNLOCK(); -} - -static void TAG(ReadDepthPixels)( GLcontext *ctx, GLuint n, - const GLint x[], const GLint y[], - GLdepth depth[] ) -{ - HW_READ_LOCK() - { - GLint i; - LOCAL_DEPTH_VARS; - - if ( DBG ) fprintf( stderr, "ReadDepthPixels\n" ); - -#if HAVE_HW_DEPTH_PIXELS - (void) i; - - READ_DEPTH_PIXELS(); -#else - HW_CLIPLOOP() - { - for ( i = 0 ; i < n ;i++ ) { - int fy = Y_FLIP( y[i] ); - if ( CLIPPIXEL( x[i], fy ) ) - READ_DEPTH( depth[i], x[i], fy ); - } - } - HW_ENDCLIPLOOP(); -#endif - } - HW_READ_UNLOCK(); -} - - -#if HAVE_HW_DEPTH_SPANS -#undef WRITE_DEPTH_SPAN -#undef WRITE_DEPTH_PIXELS -#undef READ_DEPTH_SPAN -#undef READ_DEPTH_PIXELS -#else -#undef WRITE_DEPTH -#undef READ_DEPTH -#endif -#undef TAG diff --git a/xc/lib/GL/mesa/src/drv/common/hwlog.c b/xc/lib/GL/mesa/src/drv/common/hwlog.c deleted file mode 100644 index a38789760..000000000 --- a/xc/lib/GL/mesa/src/drv/common/hwlog.c +++ /dev/null @@ -1,134 +0,0 @@ -/* - * GLX Hardware Device Driver common code - * - * Based on the original MGA G200 driver (c) 1999 Wittawat Yamwong - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * WITTAWAT YAMWONG, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE - * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * - * Wittawat Yamwong - */ -/* $XFree86: xc/lib/GL/mesa/src/drv/common/hwlog.c,v 1.3 2001/08/18 02:51:03 dawes Exp $ */ - -#include "hwlog.h" -hwlog_t hwlog = { 0,0,0, "[???] "}; - - -/* Should be shared, but is this a good place for it? - */ -#include -#include - - -#ifdef HW_LOG_ENABLED -static int usec( void ) -{ - struct timeval tv; - struct timezone tz; - - gettimeofday( &tv, &tz ); - - return (tv.tv_sec & 2047) * 1000000 + tv.tv_usec; -} - -int hwOpenLog(const char *filename, char *prefix) -{ - hwCloseLog(); - hwSetLogLevel(0); - hwlog.prefix=prefix; - if (!filename) - return -1; - if ((hwlog.file = fopen(filename,"w")) == NULL) - return -1; - return 0; -} - -void hwCloseLog() -{ - if (hwlog.file) { - fclose(hwlog.file); - hwlog.file = NULL; - } -} - -int hwIsLogReady() -{ - return (hwlog.file != NULL); -} - -void hwSetLogLevel(int level) -{ - hwlog.level = level; -} - -int hwGetLogLevel() -{ - return hwlog.level; -} - -void hwLog(int level, const char *format, ...) -{ - va_list ap; - va_start(ap,format); - hwLogv(level,format,ap); - va_end(ap); -} - -void hwLogv(int l, const char *format, va_list ap) -{ - if (hwlog.file && (l <= hwlog.level)) { - vfprintf(hwlog.file,format,ap); - fflush(hwlog.file); - } -} - -void hwMsg(int l, const char *format, ...) -{ - va_list ap; - va_start(ap, format); - - if (l <= hwlog.level) { - if (hwIsLogReady()) { - int t = usec(); - - hwLog(l, "%6i:", t - hwlog.timeTemp); - hwlog.timeTemp = t; - hwLogv(l, format, ap); - } else { - fprintf(stderr, hwlog.prefix); - vfprintf(stderr, format, ap); - } - } - - va_end(ap); -} - -#endif - -void hwError(const char *format, ...) -{ - va_list ap; - va_start(ap, format); - - fprintf(stderr, hwlog.prefix); - vfprintf(stderr, format, ap); - hwLogv(0, format, ap); - - va_end(ap); -} diff --git a/xc/lib/GL/mesa/src/drv/common/hwlog.h b/xc/lib/GL/mesa/src/drv/common/hwlog.h deleted file mode 100644 index 6c5a18555..000000000 --- a/xc/lib/GL/mesa/src/drv/common/hwlog.h +++ /dev/null @@ -1,101 +0,0 @@ -/* - * GLX Hardware Device Driver common code - * - * Based on the original MGA G200 driver (c) 1999 Wittawat Yamwong - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * WITTAWAT YAMWONG, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE - * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * - * Wittawat Yamwong - */ -/* $XFree86: xc/lib/GL/mesa/src/drv/common/hwlog.h,v 1.5 2001/10/31 23:22:57 tsi Exp $ */ - -/* Usage: - * - use mgaError for error messages. Always write to X error and log file. - * - use mgaMsg for debugging. Can be disabled by undefining MGA_LOG_ENABLED. - */ - -#ifndef HWLOG_INC -#define HWLOG_INC - - -#include -#include - -#define DBG_LEVEL_BASE 1 -#define DBG_LEVEL_VERBOSE 10 -#define DBG_LEVEL_ENTEREXIT 20 - -typedef struct -{ - FILE *file; - int level; - unsigned int timeTemp; - char *prefix; -} hwlog_t; - -extern hwlog_t hwlog; - - -#ifdef HW_LOG_ENABLED - -/* open and close log file. */ -int hwOpenLog(const char *filename, char *prefix); -void hwCloseLog(void); - -/* return 1 if log file is succesfully opened */ -int hwIsLogReady(void); - -/* set current log level to 'level'. Messages with level less than or equal - the current log level will be written to the log file. */ -void hwSetLogLevel(int level); -int hwGetLogLevel(void); - -/* hwLog and hwLogv write a message to the log file. */ -/* do not call these directly, use hwMsg() instead */ -void hwLog(int level, const char *format, ...); -void hwLogv(int level, const char *format, va_list ap); - -int usec( void ); - -/* hwMsg writes a message to the log file or to the standard X error file. */ -void hwMsg(int level, const char *format, ...); - - -#else - - -static __inline__ int hwOpenLog(const char *f, char *prefix) { hwlog.prefix=prefix; return -1; } -#define hwIsLogReady() (0) -#define hwGetLogLevel() (-1) -#define hwLogLevel(n) (0) -#define hwLog() -#define hwMsg() - -#define hwCloseLog() -#define hwSetLogLevel(x) -#define hwLogv(l,f,a) - - -#endif - -void hwError(const char *format, ...); - - -#endif diff --git a/xc/lib/GL/mesa/src/drv/common/mm.c b/xc/lib/GL/mesa/src/drv/common/mm.c deleted file mode 100644 index 6572ccd99..000000000 --- a/xc/lib/GL/mesa/src/drv/common/mm.c +++ /dev/null @@ -1,196 +0,0 @@ -/* - * GLX Hardware Device Driver common code - * Copyright (C) 1999 Wittawat Yamwong - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * WITTAWAT YAMWONG, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE - * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - */ -/* $XFree86: xc/lib/GL/mesa/src/drv/common/mm.c,v 1.4 2002/10/30 12:51:27 alanh Exp $ */ - -#include -#include - -#include "mm.h" - - -void mmDumpMemInfo( memHeap_t *heap ) -{ - TMemBlock *p; - - fprintf(stderr, "Memory heap %p:\n", (void *)heap); - if (heap == 0) { - fprintf(stderr, " heap == 0\n"); - } else { - p = (TMemBlock *)heap; - while (p) { - fprintf(stderr, " Offset:%08x, Size:%08x, %c%c\n",p->ofs,p->size, - p->free ? '.':'U', - p->reserved ? 'R':'.'); - p = p->next; - } - } - fprintf(stderr, "End of memory blocks\n"); -} - -memHeap_t *mmInit(int ofs, - int size) -{ - PMemBlock blocks; - - if (size <= 0) { - return 0; - } - blocks = (TMemBlock *) calloc(1,sizeof(TMemBlock)); - if (blocks) { - blocks->ofs = ofs; - blocks->size = size; - blocks->free = 1; - return (memHeap_t *)blocks; - } else - return 0; -} - - -static TMemBlock* SliceBlock(TMemBlock *p, - int startofs, int size, - int reserved, int alignment) -{ - TMemBlock *newblock; - - /* break left */ - if (startofs > p->ofs) { - newblock = (TMemBlock*) calloc(1,sizeof(TMemBlock)); - if (!newblock) - return NULL; - newblock->ofs = startofs; - newblock->size = p->size - (startofs - p->ofs); - newblock->free = 1; - newblock->next = p->next; - p->size -= newblock->size; - p->next = newblock; - p = newblock; - } - - /* break right */ - if (size < p->size) { - newblock = (TMemBlock*) calloc(1,sizeof(TMemBlock)); - if (!newblock) - return NULL; - newblock->ofs = startofs + size; - newblock->size = p->size - size; - newblock->free = 1; - newblock->next = p->next; - p->size = size; - p->next = newblock; - } - - /* p = middle block */ - p->align = alignment; - p->free = 0; - p->reserved = reserved; - return p; -} - -PMemBlock mmAllocMem( memHeap_t *heap, int size, int align2, int startSearch) -{ - int mask,startofs,endofs; - TMemBlock *p; - - if (!heap || align2 < 0 || size <= 0) - return NULL; - mask = (1 << align2)-1; - startofs = 0; - p = (TMemBlock *)heap; - while (p) { - if ((p)->free) { - startofs = (p->ofs + mask) & ~mask; - if ( startofs < startSearch ) { - startofs = startSearch; - } - endofs = startofs+size; - if (endofs <= (p->ofs+p->size)) - break; - } - p = p->next; - } - if (!p) - return NULL; - p = SliceBlock(p,startofs,size,0,mask+1); - p->heap = heap; - return p; -} - -static __inline__ int Join2Blocks(TMemBlock *p) -{ - if (p->free && p->next && p->next->free) { - TMemBlock *q = p->next; - p->size += q->size; - p->next = q->next; - free(q); - return 1; - } - return 0; -} - -int mmFreeMem(PMemBlock b) -{ - TMemBlock *p,*prev; - - if (!b) - return 0; - if (!b->heap) { - fprintf(stderr, "no heap\n"); - return -1; - } - p = b->heap; - prev = NULL; - while (p && p != b) { - prev = p; - p = p->next; - } - if (!p || p->free || p->reserved) { - if (!p) - fprintf(stderr, "block not found in heap\n"); - else if (p->free) - fprintf(stderr, "block already free\n"); - else - fprintf(stderr, "block is reserved\n"); - return -1; - } - p->free = 1; - Join2Blocks(p); - if (prev) - Join2Blocks(prev); - return 0; -} - - -void mmDestroy(memHeap_t *heap) -{ - TMemBlock *p,*q; - - if (!heap) - return; - p = (TMemBlock *)heap; - while (p) { - q = p->next; - free(p); - p = q; - } -} diff --git a/xc/lib/GL/mesa/src/drv/common/mm.h b/xc/lib/GL/mesa/src/drv/common/mm.h deleted file mode 100644 index d52871d39..000000000 --- a/xc/lib/GL/mesa/src/drv/common/mm.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * GLX Hardware Device Driver common code - * Copyright (C) 1999 Keith Whitwell - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * KEITH WHITWELL, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE - * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - */ - -#ifndef MM_INC -#define MM_INC - -struct mem_block_t { - struct mem_block_t *next; - struct mem_block_t *heap; - int ofs,size; - int align; - int free:1; - int reserved:1; -}; -typedef struct mem_block_t TMemBlock; -typedef struct mem_block_t *PMemBlock; - -/* a heap is just the first block in a chain */ -typedef struct mem_block_t memHeap_t; - -static __inline__ int mmBlockSize(PMemBlock b) -{ return b->size; } - -static __inline__ int mmOffset(PMemBlock b) -{ return b->ofs; } - -/* - * input: total size in bytes - * return: a heap pointer if OK, NULL if error - */ -memHeap_t *mmInit( int ofs, int size ); - -/* - * Allocate 'size' bytes with 2^align2 bytes alignment, - * restrict the search to free memory after 'startSearch' - * depth and back buffers should be in different 4mb banks - * to get better page hits if possible - * input: size = size of block - * align2 = 2^align2 bytes alignment - * startSearch = linear offset from start of heap to begin search - * return: pointer to the allocated block, 0 if error - */ -PMemBlock mmAllocMem( memHeap_t *heap, int size, int align2, - int startSearch ); - -/* - * Free block starts at offset - * input: pointer to a block - * return: 0 if OK, -1 if error - */ -int mmFreeMem( PMemBlock b ); - -/* - * destroy MM - */ -void mmDestroy( memHeap_t *mmInit ); - -/* For debuging purpose. */ -void mmDumpMemInfo( memHeap_t *mmInit ); - -#endif diff --git a/xc/lib/GL/mesa/src/drv/common/mmx.h b/xc/lib/GL/mesa/src/drv/common/mmx.h deleted file mode 100644 index 49ce7e3e3..000000000 --- a/xc/lib/GL/mesa/src/drv/common/mmx.h +++ /dev/null @@ -1,560 +0,0 @@ -/* mmx.h - - MultiMedia eXtensions GCC interface library for IA32. - - To use this library, simply include this header file - and compile with GCC. You MUST have inlining enabled - in order for mmx_ok() to work; this can be done by - simply using -O on the GCC command line. - - Compiling with -DMMX_TRACE will cause detailed trace - output to be sent to stderr for each mmx operation. - This adds lots of code, and obviously slows execution to - a crawl, but can be very useful for debugging. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY - EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT - LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR ANY PARTICULAR PURPOSE. - - 1997-98 by H. Dietz and R. Fisher - - History: - 97-98* R.Fisher Early versions - 980501 R.Fisher Original Release - 980611* H.Dietz Rewrite, correctly implementing inlines, and - R.Fisher including direct register accesses. - 980616 R.Fisher Release of 980611 as 980616. - 980714 R.Fisher Minor corrections to Makefile, etc. - 980715 R.Fisher mmx_ok() now prevents optimizer from using - clobbered values. - mmx_ok() now checks if cpuid instruction is - available before trying to use it. - 980726* R.Fisher mm_support() searches for AMD 3DNow, Cyrix - Extended MMX, and standard MMX. It returns a - value which is positive if any of these are - supported, and can be masked with constants to - see which. mmx_ok() is now a call to this - 980726* R.Fisher Added i2r support for shift functions - 980919 R.Fisher Fixed AMD extended feature recognition bug. - 980921 R.Fisher Added definition/check for _MMX_H. - Added "float s[2]" to mmx_t for use with - 3DNow and EMMX. So same mmx_t can be used. - 981013 R.Fisher Fixed cpuid function 1 bug (looked at wrong reg) - Fixed psllq_i2r error in mmxtest.c - - * Unreleased (internal or interim) versions - - Notes: - It appears that the latest gas has the pand problem fixed, therefore - I'll undefine BROKEN_PAND by default. - String compares may be quicker than the multiple test/jumps in vendor - test sequence in mmx_ok(), but I'm not concerned with that right now. - - Acknowledgments: - Jussi Laako for pointing out the errors ultimately found to be - connected to the failure to notify the optimizer of clobbered values. - Roger Hardiman for reminding us that CPUID isn't everywhere, and that - someone may actually try to use this on a machine without CPUID. - Also for suggesting code for checking this. - Robert Dale for pointing out the AMD recognition bug. - Jimmy Mayfield and Carl Witty for pointing out the Intel recognition - bug. - Carl Witty for pointing out the psllq_i2r test bug. -*/ - -#ifndef _MMX_H -#define _MMX_H - -//#define MMX_TRACE - -/* Warning: at this writing, the version of GAS packaged - with most Linux distributions does not handle the - parallel AND operation mnemonic correctly. If the - symbol BROKEN_PAND is defined, a slower alternative - coding will be used. If execution of mmxtest results - in an illegal instruction fault, define this symbol. -*/ -#undef BROKEN_PAND - - -/* The type of an value that fits in an MMX register - (note that long long constant values MUST be suffixed - by LL and unsigned long long values by ULL, lest - they be truncated by the compiler) -*/ -typedef union { - long long q; /* Quadword (64-bit) value */ - unsigned long long uq; /* Unsigned Quadword */ - int d[2]; /* 2 Doubleword (32-bit) values */ - unsigned int ud[2]; /* 2 Unsigned Doubleword */ - short w[4]; /* 4 Word (16-bit) values */ - unsigned short uw[4]; /* 4 Unsigned Word */ - char b[8]; /* 8 Byte (8-bit) values */ - unsigned char ub[8]; /* 8 Unsigned Byte */ - float s[2]; /* Single-precision (32-bit) value */ -} mmx_t; - -/* Helper functions for the instruction macros that follow... - (note that memory-to-register, m2r, instructions are nearly - as efficient as register-to-register, r2r, instructions; - however, memory-to-memory instructions are really simulated - as a convenience, and are only 1/3 as efficient) -*/ -#ifdef MMX_TRACE - -/* Include the stuff for printing a trace to stderr... -*/ - -#include - -#define mmx_i2r(op, imm, reg) \ - { \ - mmx_t mmx_trace; \ - mmx_trace = (imm); \ - fprintf(stderr, #op "_i2r(" #imm "=0x%016llx, ", mmx_trace.q); \ - __asm__ __volatile__ ("movq %%" #reg ", %0" \ - : "=X" (mmx_trace) \ - : /* nothing */ ); \ - fprintf(stderr, #reg "=0x%016llx) => ", mmx_trace.q); \ - __asm__ __volatile__ (#op " %0, %%" #reg \ - : /* nothing */ \ - : "X" (imm)); \ - __asm__ __volatile__ ("movq %%" #reg ", %0" \ - : "=X" (mmx_trace) \ - : /* nothing */ ); \ - fprintf(stderr, #reg "=0x%016llx\n", mmx_trace.q); \ - } - -#define mmx_m2r(op, mem, reg) \ - { \ - mmx_t mmx_trace; \ - mmx_trace = (mem); \ - fprintf(stderr, #op "_m2r(" #mem "=0x%016llx, ", mmx_trace.q); \ - __asm__ __volatile__ ("movq %%" #reg ", %0" \ - : "=X" (mmx_trace) \ - : /* nothing */ ); \ - fprintf(stderr, #reg "=0x%016llx) => ", mmx_trace.q); \ - __asm__ __volatile__ (#op " %0, %%" #reg \ - : /* nothing */ \ - : "X" (mem)); \ - __asm__ __volatile__ ("movq %%" #reg ", %0" \ - : "=X" (mmx_trace) \ - : /* nothing */ ); \ - fprintf(stderr, #reg "=0x%016llx\n", mmx_trace.q); \ - } - -#define mmx_r2m(op, reg, mem) \ - { \ - mmx_t mmx_trace; \ - __asm__ __volatile__ ("movq %%" #reg ", %0" \ - : "=X" (mmx_trace) \ - : /* nothing */ ); \ - fprintf(stderr, #op "_r2m(" #reg "=0x%016llx, ", mmx_trace.q); \ - mmx_trace = (mem); \ - fprintf(stderr, #mem "=0x%016llx) => ", mmx_trace.q); \ - __asm__ __volatile__ (#op " %%" #reg ", %0" \ - : "=X" (mem) \ - : /* nothing */ ); \ - mmx_trace = (mem); \ - fprintf(stderr, #mem "=0x%016llx\n", mmx_trace.q); \ - } - -#define mmx_r2r(op, regs, regd) \ - { \ - mmx_t mmx_trace; \ - __asm__ __volatile__ ("movq %%" #regs ", %0" \ - : "=X" (mmx_trace) \ - : /* nothing */ ); \ - fprintf(stderr, #op "_r2r(" #regs "=0x%016llx, ", mmx_trace.q); \ - __asm__ __volatile__ ("movq %%" #regd ", %0" \ - : "=X" (mmx_trace) \ - : /* nothing */ ); \ - fprintf(stderr, #regd "=0x%016llx) => ", mmx_trace.q); \ - __asm__ __volatile__ (#op " %" #regs ", %" #regd); \ - __asm__ __volatile__ ("movq %%" #regd ", %0" \ - : "=X" (mmx_trace) \ - : /* nothing */ ); \ - fprintf(stderr, #regd "=0x%016llx\n", mmx_trace.q); \ - } - -#define mmx_m2m(op, mems, memd) \ - { \ - mmx_t mmx_trace; \ - mmx_trace = (mems); \ - fprintf(stderr, #op "_m2m(" #mems "=0x%016llx, ", mmx_trace.q); \ - mmx_trace = (memd); \ - fprintf(stderr, #memd "=0x%016llx) => ", mmx_trace.q); \ - __asm__ __volatile__ ("movq %0, %%mm0\n\t" \ - #op " %1, %%mm0\n\t" \ - "movq %%mm0, %0" \ - : "=X" (memd) \ - : "X" (mems)); \ - mmx_trace = (memd); \ - fprintf(stderr, #memd "=0x%016llx\n", mmx_trace.q); \ - } - -#else - -/* These macros are a lot simpler without the tracing... -*/ - -#define mmx_i2r(op, imm, reg) \ - __asm__ __volatile__ (#op " $" #imm ", %%" #reg \ - : /* nothing */ \ - : /* nothing */); - -#define mmx_m2r(op, mem, reg) \ - __asm__ __volatile__ (#op " %0, %%" #reg \ - : /* nothing */ \ - : "X" (mem)) - -#define mmx_r2m(op, reg, mem) \ - __asm__ __volatile__ (#op " %%" #reg ", %0" \ - : "=X" (mem) \ - : /* nothing */ ) - -#define mmx_r2r(op, regs, regd) \ - __asm__ __volatile__ (#op " %" #regs ", %" #regd) - -#define mmx_m2m(op, mems, memd) \ - __asm__ __volatile__ ("movq %0, %%mm0\n\t" \ - #op " %1, %%mm0\n\t" \ - "movq %%mm0, %0" \ - : "=X" (memd) \ - : "X" (mems)) - -#endif - - -/* 1x64 MOVe Quadword - (this is both a load and a store... - in fact, it is the only way to store) -*/ -#define movq_m2r(var, reg) mmx_m2r(movq, var, reg) -#define movq_r2m(reg, var) mmx_r2m(movq, reg, var) -#define movq_r2r(regs, regd) mmx_r2r(movq, regs, regd) -#define movq(vars, vard) \ - __asm__ __volatile__ ("movq %1, %%mm0\n\t" \ - "movq %%mm0, %0" \ - : "=X" (vard) \ - : "X" (vars)) - - -/* 1x32 MOVe Doubleword - (like movq, this is both load and store... - but is most useful for moving things between - mmx registers and ordinary registers) -*/ -#define movd_m2r(var, reg) mmx_m2r(movd, var, reg) -#define movd_r2m(reg, var) mmx_r2m(movd, reg, var) -#define movd_r2r(regs, regd) mmx_r2r(movd, regs, regd) -#define movd(vars, vard) \ - __asm__ __volatile__ ("movd %1, %%mm0\n\t" \ - "movd %%mm0, %0" \ - : "=X" (vard) \ - : "X" (vars)) - - -/* 2x32, 4x16, and 8x8 Parallel ADDs -*/ -#define paddd_m2r(var, reg) mmx_m2r(paddd, var, reg) -#define paddd_r2r(regs, regd) mmx_r2r(paddd, regs, regd) -#define paddd(vars, vard) mmx_m2m(paddd, vars, vard) - -#define paddw_m2r(var, reg) mmx_m2r(paddw, var, reg) -#define paddw_r2r(regs, regd) mmx_r2r(paddw, regs, regd) -#define paddw(vars, vard) mmx_m2m(paddw, vars, vard) - -#define paddb_m2r(var, reg) mmx_m2r(paddb, var, reg) -#define paddb_r2r(regs, regd) mmx_r2r(paddb, regs, regd) -#define paddb(vars, vard) mmx_m2m(paddb, vars, vard) - - -/* 4x16 and 8x8 Parallel ADDs using Saturation arithmetic -*/ -#define paddsw_m2r(var, reg) mmx_m2r(paddsw, var, reg) -#define paddsw_r2r(regs, regd) mmx_r2r(paddsw, regs, regd) -#define paddsw(vars, vard) mmx_m2m(paddsw, vars, vard) - -#define paddsb_m2r(var, reg) mmx_m2r(paddsb, var, reg) -#define paddsb_r2r(regs, regd) mmx_r2r(paddsb, regs, regd) -#define paddsb(vars, vard) mmx_m2m(paddsb, vars, vard) - - -/* 4x16 and 8x8 Parallel ADDs using Unsigned Saturation arithmetic -*/ -#define paddusw_m2r(var, reg) mmx_m2r(paddusw, var, reg) -#define paddusw_r2r(regs, regd) mmx_r2r(paddusw, regs, regd) -#define paddusw(vars, vard) mmx_m2m(paddusw, vars, vard) - -#define paddusb_m2r(var, reg) mmx_m2r(paddusb, var, reg) -#define paddusb_r2r(regs, regd) mmx_r2r(paddusb, regs, regd) -#define paddusb(vars, vard) mmx_m2m(paddusb, vars, vard) - - -/* 2x32, 4x16, and 8x8 Parallel SUBs -*/ -#define psubd_m2r(var, reg) mmx_m2r(psubd, var, reg) -#define psubd_r2r(regs, regd) mmx_r2r(psubd, regs, regd) -#define psubd(vars, vard) mmx_m2m(psubd, vars, vard) - -#define psubw_m2r(var, reg) mmx_m2r(psubw, var, reg) -#define psubw_r2r(regs, regd) mmx_r2r(psubw, regs, regd) -#define psubw(vars, vard) mmx_m2m(psubw, vars, vard) - -#define psubb_m2r(var, reg) mmx_m2r(psubb, var, reg) -#define psubb_r2r(regs, regd) mmx_r2r(psubb, regs, regd) -#define psubb(vars, vard) mmx_m2m(psubb, vars, vard) - - -/* 4x16 and 8x8 Parallel SUBs using Saturation arithmetic -*/ -#define psubsw_m2r(var, reg) mmx_m2r(psubsw, var, reg) -#define psubsw_r2r(regs, regd) mmx_r2r(psubsw, regs, regd) -#define psubsw(vars, vard) mmx_m2m(psubsw, vars, vard) - -#define psubsb_m2r(var, reg) mmx_m2r(psubsb, var, reg) -#define psubsb_r2r(regs, regd) mmx_r2r(psubsb, regs, regd) -#define psubsb(vars, vard) mmx_m2m(psubsb, vars, vard) - - -/* 4x16 and 8x8 Parallel SUBs using Unsigned Saturation arithmetic -*/ -#define psubusw_m2r(var, reg) mmx_m2r(psubusw, var, reg) -#define psubusw_r2r(regs, regd) mmx_r2r(psubusw, regs, regd) -#define psubusw(vars, vard) mmx_m2m(psubusw, vars, vard) - -#define psubusb_m2r(var, reg) mmx_m2r(psubusb, var, reg) -#define psubusb_r2r(regs, regd) mmx_r2r(psubusb, regs, regd) -#define psubusb(vars, vard) mmx_m2m(psubusb, vars, vard) - - -/* 4x16 Parallel MULs giving Low 4x16 portions of results -*/ -#define pmullw_m2r(var, reg) mmx_m2r(pmullw, var, reg) -#define pmullw_r2r(regs, regd) mmx_r2r(pmullw, regs, regd) -#define pmullw(vars, vard) mmx_m2m(pmullw, vars, vard) - - -/* 4x16 Parallel MULs giving High 4x16 portions of results -*/ -#define pmulhw_m2r(var, reg) mmx_m2r(pmulhw, var, reg) -#define pmulhw_r2r(regs, regd) mmx_r2r(pmulhw, regs, regd) -#define pmulhw(vars, vard) mmx_m2m(pmulhw, vars, vard) - - -/* 4x16->2x32 Parallel Mul-ADD - (muls like pmullw, then adds adjacent 16-bit fields - in the multiply result to make the final 2x32 result) -*/ -#define pmaddwd_m2r(var, reg) mmx_m2r(pmaddwd, var, reg) -#define pmaddwd_r2r(regs, regd) mmx_r2r(pmaddwd, regs, regd) -#define pmaddwd(vars, vard) mmx_m2m(pmaddwd, vars, vard) - - -/* 1x64 bitwise AND -*/ -#ifdef BROKEN_PAND -#define pand_m2r(var, reg) \ - { \ - mmx_m2r(pandn, (mmx_t) -1LL, reg); \ - mmx_m2r(pandn, var, reg); \ - } -#define pand_r2r(regs, regd) \ - { \ - mmx_m2r(pandn, (mmx_t) -1LL, regd); \ - mmx_r2r(pandn, regs, regd) \ - } -#define pand(vars, vard) \ - { \ - movq_m2r(vard, mm0); \ - mmx_m2r(pandn, (mmx_t) -1LL, mm0); \ - mmx_m2r(pandn, vars, mm0); \ - movq_r2m(mm0, vard); \ - } -#else -#define pand_m2r(var, reg) mmx_m2r(pand, var, reg) -#define pand_r2r(regs, regd) mmx_r2r(pand, regs, regd) -#define pand(vars, vard) mmx_m2m(pand, vars, vard) -#endif - - -/* 1x64 bitwise AND with Not the destination -*/ -#define pandn_m2r(var, reg) mmx_m2r(pandn, var, reg) -#define pandn_r2r(regs, regd) mmx_r2r(pandn, regs, regd) -#define pandn(vars, vard) mmx_m2m(pandn, vars, vard) - - -/* 1x64 bitwise OR -*/ -#define por_m2r(var, reg) mmx_m2r(por, var, reg) -#define por_r2r(regs, regd) mmx_r2r(por, regs, regd) -#define por(vars, vard) mmx_m2m(por, vars, vard) - - -/* 1x64 bitwise eXclusive OR -*/ -#define pxor_m2r(var, reg) mmx_m2r(pxor, var, reg) -#define pxor_r2r(regs, regd) mmx_r2r(pxor, regs, regd) -#define pxor(vars, vard) mmx_m2m(pxor, vars, vard) - - -/* 2x32, 4x16, and 8x8 Parallel CoMPare for EQuality - (resulting fields are either 0 or -1) -*/ -#define pcmpeqd_m2r(var, reg) mmx_m2r(pcmpeqd, var, reg) -#define pcmpeqd_r2r(regs, regd) mmx_r2r(pcmpeqd, regs, regd) -#define pcmpeqd(vars, vard) mmx_m2m(pcmpeqd, vars, vard) - -#define pcmpeqw_m2r(var, reg) mmx_m2r(pcmpeqw, var, reg) -#define pcmpeqw_r2r(regs, regd) mmx_r2r(pcmpeqw, regs, regd) -#define pcmpeqw(vars, vard) mmx_m2m(pcmpeqw, vars, vard) - -#define pcmpeqb_m2r(var, reg) mmx_m2r(pcmpeqb, var, reg) -#define pcmpeqb_r2r(regs, regd) mmx_r2r(pcmpeqb, regs, regd) -#define pcmpeqb(vars, vard) mmx_m2m(pcmpeqb, vars, vard) - - -/* 2x32, 4x16, and 8x8 Parallel CoMPare for Greater Than - (resulting fields are either 0 or -1) -*/ -#define pcmpgtd_m2r(var, reg) mmx_m2r(pcmpgtd, var, reg) -#define pcmpgtd_r2r(regs, regd) mmx_r2r(pcmpgtd, regs, regd) -#define pcmpgtd(vars, vard) mmx_m2m(pcmpgtd, vars, vard) - -#define pcmpgtw_m2r(var, reg) mmx_m2r(pcmpgtw, var, reg) -#define pcmpgtw_r2r(regs, regd) mmx_r2r(pcmpgtw, regs, regd) -#define pcmpgtw(vars, vard) mmx_m2m(pcmpgtw, vars, vard) - -#define pcmpgtb_m2r(var, reg) mmx_m2r(pcmpgtb, var, reg) -#define pcmpgtb_r2r(regs, regd) mmx_r2r(pcmpgtb, regs, regd) -#define pcmpgtb(vars, vard) mmx_m2m(pcmpgtb, vars, vard) - - -/* 1x64, 2x32, and 4x16 Parallel Shift Left Logical -*/ -#define psllq_i2r(imm, reg) mmx_i2r(psllq, imm, reg) -#define psllq_m2r(var, reg) mmx_m2r(psllq, var, reg) -#define psllq_r2r(regs, regd) mmx_r2r(psllq, regs, regd) -#define psllq(vars, vard) mmx_m2m(psllq, vars, vard) - -#define pslld_i2r(imm, reg) mmx_i2r(pslld, imm, reg) -#define pslld_m2r(var, reg) mmx_m2r(pslld, var, reg) -#define pslld_r2r(regs, regd) mmx_r2r(pslld, regs, regd) -#define pslld(vars, vard) mmx_m2m(pslld, vars, vard) - -#define psllw_i2r(imm, reg) mmx_i2r(psllw, imm, reg) -#define psllw_m2r(var, reg) mmx_m2r(psllw, var, reg) -#define psllw_r2r(regs, regd) mmx_r2r(psllw, regs, regd) -#define psllw(vars, vard) mmx_m2m(psllw, vars, vard) - - -/* 1x64, 2x32, and 4x16 Parallel Shift Right Logical -*/ -#define psrlq_i2r(imm, reg) mmx_i2r(psrlq, imm, reg) -#define psrlq_m2r(var, reg) mmx_m2r(psrlq, var, reg) -#define psrlq_r2r(regs, regd) mmx_r2r(psrlq, regs, regd) -#define psrlq(vars, vard) mmx_m2m(psrlq, vars, vard) - -#define psrld_i2r(imm, reg) mmx_i2r(psrld, imm, reg) -#define psrld_m2r(var, reg) mmx_m2r(psrld, var, reg) -#define psrld_r2r(regs, regd) mmx_r2r(psrld, regs, regd) -#define psrld(vars, vard) mmx_m2m(psrld, vars, vard) - -#define psrlw_i2r(imm, reg) mmx_i2r(psrlw, imm, reg) -#define psrlw_m2r(var, reg) mmx_m2r(psrlw, var, reg) -#define psrlw_r2r(regs, regd) mmx_r2r(psrlw, regs, regd) -#define psrlw(vars, vard) mmx_m2m(psrlw, vars, vard) - - -/* 2x32 and 4x16 Parallel Shift Right Arithmetic -*/ -#define psrad_i2r(imm, reg) mmx_i2r(psrad, imm, reg) -#define psrad_m2r(var, reg) mmx_m2r(psrad, var, reg) -#define psrad_r2r(regs, regd) mmx_r2r(psrad, regs, regd) -#define psrad(vars, vard) mmx_m2m(psrad, vars, vard) - -#define psraw_i2r(imm, reg) mmx_i2r(psraw, imm, reg) -#define psraw_m2r(var, reg) mmx_m2r(psraw, var, reg) -#define psraw_r2r(regs, regd) mmx_r2r(psraw, regs, regd) -#define psraw(vars, vard) mmx_m2m(psraw, vars, vard) - - -/* 2x32->4x16 and 4x16->8x8 PACK and Signed Saturate - (packs source and dest fields into dest in that order) -*/ -#define packssdw_m2r(var, reg) mmx_m2r(packssdw, var, reg) -#define packssdw_r2r(regs, regd) mmx_r2r(packssdw, regs, regd) -#define packssdw(vars, vard) mmx_m2m(packssdw, vars, vard) - -#define packsswb_m2r(var, reg) mmx_m2r(packsswb, var, reg) -#define packsswb_r2r(regs, regd) mmx_r2r(packsswb, regs, regd) -#define packsswb(vars, vard) mmx_m2m(packsswb, vars, vard) - - -/* 4x16->8x8 PACK and Unsigned Saturate - (packs source and dest fields into dest in that order) -*/ -#define packuswb_m2r(var, reg) mmx_m2r(packuswb, var, reg) -#define packuswb_r2r(regs, regd) mmx_r2r(packuswb, regs, regd) -#define packuswb(vars, vard) mmx_m2m(packuswb, vars, vard) - - -/* 2x32->1x64, 4x16->2x32, and 8x8->4x16 UNPaCK Low - (interleaves low half of dest with low half of source - as padding in each result field) -*/ -#define punpckldq_m2r(var, reg) mmx_m2r(punpckldq, var, reg) -#define punpckldq_r2r(regs, regd) mmx_r2r(punpckldq, regs, regd) -#define punpckldq(vars, vard) mmx_m2m(punpckldq, vars, vard) - -#define punpcklwd_m2r(var, reg) mmx_m2r(punpcklwd, var, reg) -#define punpcklwd_r2r(regs, regd) mmx_r2r(punpcklwd, regs, regd) -#define punpcklwd(vars, vard) mmx_m2m(punpcklwd, vars, vard) - -#define punpcklbw_m2r(var, reg) mmx_m2r(punpcklbw, var, reg) -#define punpcklbw_r2r(regs, regd) mmx_r2r(punpcklbw, regs, regd) -#define punpcklbw(vars, vard) mmx_m2m(punpcklbw, vars, vard) - - -/* 2x32->1x64, 4x16->2x32, and 8x8->4x16 UNPaCK High - (interleaves high half of dest with high half of source - as padding in each result field) -*/ -#define punpckhdq_m2r(var, reg) mmx_m2r(punpckhdq, var, reg) -#define punpckhdq_r2r(regs, regd) mmx_r2r(punpckhdq, regs, regd) -#define punpckhdq(vars, vard) mmx_m2m(punpckhdq, vars, vard) - -#define punpckhwd_m2r(var, reg) mmx_m2r(punpckhwd, var, reg) -#define punpckhwd_r2r(regs, regd) mmx_r2r(punpckhwd, regs, regd) -#define punpckhwd(vars, vard) mmx_m2m(punpckhwd, vars, vard) - -#define punpckhbw_m2r(var, reg) mmx_m2r(punpckhbw, var, reg) -#define punpckhbw_r2r(regs, regd) mmx_r2r(punpckhbw, regs, regd) -#define punpckhbw(vars, vard) mmx_m2m(punpckhbw, vars, vard) - - -/* Empty MMx State - (used to clean-up when going from mmx to float use - of the registers that are shared by both; note that - there is no float-to-mmx operation needed, because - only the float tag word info is corruptible) -*/ -#ifdef MMX_TRACE - -#define emms() \ - { \ - fprintf(stderr, "emms()\n"); \ - __asm__ __volatile__ ("emms"); \ - } - -#else - -#define emms() __asm__ __volatile__ ("emms") - -#endif - -#endif - diff --git a/xc/lib/GL/mesa/src/drv/common/spantmp.h b/xc/lib/GL/mesa/src/drv/common/spantmp.h deleted file mode 100644 index 888be0465..000000000 --- a/xc/lib/GL/mesa/src/drv/common/spantmp.h +++ /dev/null @@ -1,259 +0,0 @@ -#ifndef DBG -#define DBG 0 -#endif - -#ifndef HW_WRITE_LOCK -#define HW_WRITE_LOCK() HW_LOCK() -#endif - -#ifndef HW_WRITE_UNLOCK -#define HW_WRITE_UNLOCK() HW_UNLOCK() -#endif - -#ifndef HW_READ_LOCK -#define HW_READ_LOCK() HW_LOCK() -#endif - -#ifndef HW_READ_UNLOCK -#define HW_READ_UNLOCK() HW_UNLOCK() -#endif - -#ifndef HW_READ_CLIPLOOP -#define HW_READ_CLIPLOOP() HW_CLIPLOOP() -#endif - -#ifndef HW_WRITE_CLIPLOOP -#define HW_WRITE_CLIPLOOP() HW_CLIPLOOP() -#endif - - -static void TAG(WriteRGBASpan)( const GLcontext *ctx, - GLuint n, GLint x, GLint y, - const GLubyte rgba[][4], - const GLubyte mask[] ) -{ - HW_WRITE_LOCK() - { - GLint x1; - GLint n1; - LOCAL_VARS; - - y = Y_FLIP(y); - - HW_WRITE_CLIPLOOP() - { - GLint i = 0; - CLIPSPAN(x,y,n,x1,n1,i); - - if (DBG) fprintf(stderr, "WriteRGBASpan %d..%d (x1 %d)\n", - (int)i, (int)n1, (int)x1); - - if (mask) - { - for (;n1>0;i++,x1++,n1--) - if (mask[i]) - WRITE_RGBA( x1, y, - rgba[i][0], rgba[i][1], - rgba[i][2], rgba[i][3] ); - } - else - { - for (;n1>0;i++,x1++,n1--) - WRITE_RGBA( x1, y, - rgba[i][0], rgba[i][1], - rgba[i][2], rgba[i][3] ); - } - } - HW_ENDCLIPLOOP(); - } - HW_WRITE_UNLOCK(); -} - -static void TAG(WriteRGBSpan)( const GLcontext *ctx, - GLuint n, GLint x, GLint y, - const GLubyte rgb[][3], - const GLubyte mask[] ) -{ - HW_WRITE_LOCK() - { - GLint x1; - GLint n1; - LOCAL_VARS; - - y = Y_FLIP(y); - - HW_WRITE_CLIPLOOP() - { - GLint i = 0; - CLIPSPAN(x,y,n,x1,n1,i); - - if (DBG) fprintf(stderr, "WriteRGBSpan %d..%d (x1 %d)\n", - (int)i, (int)n1, (int)x1); - - if (mask) - { - for (;n1>0;i++,x1++,n1--) - if (mask[i]) - WRITE_RGBA( x1, y, rgb[i][0], rgb[i][1], rgb[i][2], 255 ); - } - else - { - for (;n1>0;i++,x1++,n1--) - WRITE_RGBA( x1, y, rgb[i][0], rgb[i][1], rgb[i][2], 255 ); - } - } - HW_ENDCLIPLOOP(); - } - HW_WRITE_UNLOCK(); -} - -static void TAG(WriteRGBAPixels)( const GLcontext *ctx, - GLuint n, - const GLint x[], - const GLint y[], - const GLubyte rgba[][4], - const GLubyte mask[] ) -{ - HW_WRITE_LOCK() - { - GLint i; - LOCAL_VARS; - - if (DBG) fprintf(stderr, "WriteRGBAPixels\n"); - - HW_WRITE_CLIPLOOP() - { - for (i=0;i0;i++,x1++,n1--) - if (mask[i]) - WRITE_PIXEL( x1, y, p ); - } - HW_ENDCLIPLOOP(); - } - HW_WRITE_UNLOCK(); -} - - -static void TAG(WriteMonoRGBAPixels)( const GLcontext *ctx, - GLuint n, - const GLint x[], const GLint y[], - const GLchan color[], - const GLubyte mask[] ) -{ - HW_WRITE_LOCK() - { - GLint i; - LOCAL_VARS; - INIT_MONO_PIXEL(p, color); - - if (DBG) fprintf(stderr, "WriteMonoRGBAPixels\n"); - - HW_WRITE_CLIPLOOP() - { - for (i=0;i0;i++,x1++,n1--) - READ_RGBA( rgba[i], x1, y ); - } - HW_ENDCLIPLOOP(); - } - HW_READ_UNLOCK(); -} - - -static void TAG(ReadRGBAPixels)( const GLcontext *ctx, - GLuint n, const GLint x[], const GLint y[], - GLubyte rgba[][4], const GLubyte mask[] ) -{ - HW_READ_LOCK() - { - GLint i; - LOCAL_VARS; - - if (DBG) fprintf(stderr, "ReadRGBAPixels\n"); - - HW_READ_CLIPLOOP() - { - for (i=0;i - * Keith Whitwell - * Kevin E. Martin - * Gareth Hughes - */ -/* $XFree86:$ */ - -/** \file texmem.c - * Implements all of the device-independent texture memory management. - * - * Currently, only a simple LRU texture memory management policy is - * implemented. In the (hopefully very near) future, better policies will be - * implemented. The idea is that the DRI should be able to run in one of two - * modes. In the default mode the DRI will dynamically attempt to discover - * the best texture management policy for the running application. In the - * other mode, the user (via some sort of as yet TBD mechanism) will select - * a texture management policy that is known to work well with the - * application. - */ - -#include "texmem.h" -#include "simple_list.h" -#include "imports.h" -#include "macros.h" - -#include - - - -static unsigned dummy_swap_counter; - - -/** - * Calculate \f$\log_2\f$ of a value. This is a particularly poor - * implementation of this function. However, since system performance is in - * no way dependent on this function, the slowness of the implementation is - * irrelevent. - * - * \param n Value whose \f$\log_2\f$ is to be calculated - */ - -static unsigned -driLog2( unsigned n ) -{ - unsigned log2; - - - for ( log2 = 1 ; n > 1 ; log2++ ) { - n >>= 1; - } - - return log2; -} - - - - -/** - * Determine if a texture is resident in textureable memory. Depending on - * the driver, this may or may not be on-card memory. It could be AGP memory - * or anyother type of memory from which the hardware can directly read - * texels. - * - * This function is intended to be used as the \c IsTextureResident function - * in the device's \c dd_function_table. - * - * \param ctx GL context pointer (currently unused) - * \param texObj Texture object to be tested - */ - -GLboolean -driIsTextureResident( GLcontext * ctx, - struct gl_texture_object * texObj ) -{ - driTextureObject * t; - - - t = (driTextureObject *) texObj->DriverData; - return( (t != NULL) && (t->memBlock != NULL) ); -} - - - - -/** - * (Re)initialize the global circular LRU list. The last element - * in the array (\a heap->nrRegions) is the sentinal. Keeping it - * at the end of the array allows the other elements of the array - * to be addressed rationally when looking up objects at a particular - * location in texture memory. - * - * \param heap Texture heap to be reset - */ - -static void resetGlobalLRU( driTexHeap * heap ) -{ - drmTextureRegionPtr list = heap->global_regions; - unsigned sz = 1U << heap->logGranularity; - unsigned i; - - for (i = 0 ; (i+1) * sz <= heap->size ; i++) { - list[i].prev = i-1; - list[i].next = i+1; - list[i].age = 0; - } - - i--; - list[0].prev = heap->nrRegions; - list[i].prev = i-1; - list[i].next = heap->nrRegions; - list[heap->nrRegions].prev = i; - list[heap->nrRegions].next = 0; - heap->global_age[0] = 0; -} - -/** - * Print out debugging information about the local texture LRU. - * - * \param heap Texture heap to be printed - * \param callername Name of calling function - */ -static void printLocalLRU( driTexHeap * heap, const char *callername ) -{ - driTextureObject *t; - unsigned sz = 1U << heap->logGranularity; - - fprintf( stderr, "%s in %s:\nLocal LRU, heap %d:\n", - __FUNCTION__, callername, heap->heapId ); - - foreach ( t, &heap->texture_objects ) { - if (!t->memBlock) - continue; - if (!t->tObj) { - fprintf( stderr, "Placeholder (%p) %d at 0x%x sz 0x%x\n", - (void *)t, - t->memBlock->ofs / sz, - t->memBlock->ofs, - t->memBlock->size ); - } else { - fprintf( stderr, "Texture (%p) at 0x%x sz 0x%x\n", - (void *)t, - t->memBlock->ofs, - t->memBlock->size ); - } - } - foreach ( t, heap->swapped_objects ) { - if (!t->tObj) { - fprintf( stderr, "Swapped Placeholder (%p)\n", (void *)t ); - } else { - fprintf( stderr, "Swapped Texture (%p)\n", (void *)t ); - } - } - - fprintf( stderr, "\n" ); -} - -/** - * Print out debugging information about the global texture LRU. - * - * \param heap Texture heap to be printed - * \param callername Name of calling function - */ -static void printGlobalLRU( driTexHeap * heap, const char *callername ) -{ - drmTextureRegionPtr list = heap->global_regions; - int i, j; - - fprintf( stderr, "%s in %s:\nGlobal LRU, heap %d list %p:\n", - __FUNCTION__, callername, heap->heapId, (void *)list ); - - for ( i = 0, j = heap->nrRegions ; i < heap->nrRegions ; i++ ) { - fprintf( stderr, "list[%d] age %d next %d prev %d in_use %d\n", - j, list[j].age, list[j].next, list[j].prev, list[j].in_use ); - j = list[j].next; - if ( j == heap->nrRegions ) break; - } - - if ( j != heap->nrRegions ) { - fprintf( stderr, "Loop detected in global LRU\n" ); - for ( i = 0 ; i < heap->nrRegions ; i++ ) { - fprintf( stderr, "list[%d] age %d next %d prev %d in_use %d\n", - i, list[i].age, list[i].next, list[i].prev, list[i].in_use ); - } - } - - fprintf( stderr, "\n" ); -} - - -/** - * Called by the client whenever it touches a local texture. - * - * \param t Texture object that the client has accessed - */ - -void driUpdateTextureLRU( driTextureObject * t ) -{ - driTexHeap * heap; - drmTextureRegionPtr list; - unsigned shift; - unsigned start; - unsigned end; - unsigned i; - - - heap = t->heap; - if ( heap != NULL ) { - shift = heap->logGranularity; - start = t->memBlock->ofs >> shift; - end = (t->memBlock->ofs + t->memBlock->size - 1) >> shift; - - - heap->local_age = ++heap->global_age[0]; - list = heap->global_regions; - - - /* Update the context's local LRU - */ - - move_to_head( & heap->texture_objects, t ); - - - for (i = start ; i <= end ; i++) { - list[i].in_use = 1; - list[i].age = heap->local_age; - - /* remove_from_list(i) - */ - list[(unsigned)list[i].next].prev = list[i].prev; - list[(unsigned)list[i].prev].next = list[i].next; - - /* insert_at_head(list, i) - */ - list[i].prev = heap->nrRegions; - list[i].next = list[heap->nrRegions].next; - list[(unsigned)list[heap->nrRegions].next].prev = i; - list[heap->nrRegions].next = i; - } - - if ( 0 ) { - printGlobalLRU( heap, __FUNCTION__ ); - printLocalLRU( heap, __FUNCTION__ ); - } - } -} - - - - -/** - * Keep track of swapped out texture objects. - * - * \param t Texture object to be "swapped" out of its texture heap - */ - -void driSwapOutTextureObject( driTextureObject * t ) -{ - unsigned face; - - - if ( t->memBlock != NULL ) { - assert( t->heap != NULL ); - mmFreeMem( t->memBlock ); - t->memBlock = NULL; - - if (t->timestamp > t->heap->timestamp) - t->heap->timestamp = t->timestamp; - - t->heap->texture_swaps[0]++; - move_to_tail( t->heap->swapped_objects, t ); - t->heap = NULL; - } - else { - assert( t->heap == NULL ); - } - - - for ( face = 0 ; face < 6 ; face++ ) { - t->dirty_images[face] = ~0; - } -} - - - - -/** - * Destroy hardware state associated with texture \a t. Calls the - * \a destroy_texture_object method associated with the heap from which - * \a t was allocated. - * - * \param t Texture object to be destroyed - */ - -void driDestroyTextureObject( driTextureObject * t ) -{ - driTexHeap * heap; - - - if ( 0 ) { - fprintf( stderr, "[%s:%d] freeing %p (tObj = %p, DriverData = %p)\n", - __FILE__, __LINE__, - (void *)t, - (void *)((t != NULL) ? t->tObj : NULL), - (void *)((t != NULL && t->tObj != NULL) ? t->tObj->DriverData : NULL )); - } - - if ( t != NULL ) { - if ( t->memBlock ) { - heap = t->heap; - assert( heap != NULL ); - - heap->texture_swaps[0]++; - - mmFreeMem( t->memBlock ); - t->memBlock = NULL; - - if (t->timestamp > t->heap->timestamp) - t->heap->timestamp = t->timestamp; - - heap->destroy_texture_object( heap->driverContext, t ); - t->heap = NULL; - } - - if ( t->tObj != NULL ) { - assert( t->tObj->DriverData == t ); - t->tObj->DriverData = NULL; - } - - remove_from_list( t ); - FREE( t ); - } - - if ( 0 ) { - fprintf( stderr, "[%s:%d] done freeing %p\n", __FILE__, __LINE__, (void *)t ); - } -} - - - - -/** - * Update the local heap's representation of texture memory based on - * data in the SAREA. This is done each time it is detected that some other - * direct rendering client has held the lock. This pertains to both our local - * textures and the textures belonging to other clients. Keep track of other - * client's textures by pushing a placeholder texture onto the LRU list -- - * these are denoted by \a tObj being \a NULL. - * - * \param heap Heap whose state is to be updated - * \param offset Byte offset in the heap that has been stolen - * \param size Size, in bytes, of the stolen block - * \param in_use Non-zero if the block is in-use by another context - */ - -static void driTexturesGone( driTexHeap * heap, int offset, int size, - int in_use ) -{ - driTextureObject * t; - driTextureObject * tmp; - - - foreach_s ( t, tmp, & heap->texture_objects ) { - if ( (t->memBlock->ofs < (offset + size)) - && ((t->memBlock->ofs + t->memBlock->size) > offset) ) { - /* It overlaps - kick it out. If the texture object is just a - * place holder, then destroy it all together. Otherwise, mark - * it as being swapped out. - */ - - if ( t->tObj != NULL ) { - driSwapOutTextureObject( t ); - } - else { - if ( in_use && - offset == t->memBlock->ofs && size == t->memBlock->size ) { - /* Matching placeholder already exists */ - return; - } else { - driDestroyTextureObject( t ); - } - } - } - } - - - if ( in_use ) { - t = (driTextureObject *) CALLOC( heap->texture_object_size ); - if ( t == NULL ) return; - - t->memBlock = mmAllocMem( heap->memory_heap, size, 0, offset ); - if ( t->memBlock == NULL ) { - fprintf( stderr, "Couldn't alloc placeholder: heap %u sz %x ofs %x\n", heap->heapId, - (int)size, (int)offset ); - mmDumpMemInfo( heap->memory_heap ); - return; - } - t->heap = heap; - insert_at_head( & heap->texture_objects, t ); - } -} - - - - -/** - * Called by the client on lock contention to determine whether textures have - * been stolen. If another client has modified a region in which we have - * textures, then we need to figure out which of our textures have been - * removed and update our global LRU. - * - * \param heap Texture heap to be updated - */ - -void driAgeTextures( driTexHeap * heap ) -{ - drmTextureRegionPtr list = heap->global_regions; - unsigned sz = 1U << (heap->logGranularity); - unsigned i, nr = 0; - - - /* Have to go right round from the back to ensure stuff ends up - * LRU in the local list... Fix with a cursor pointer. - */ - - for (i = list[heap->nrRegions].prev ; - i != heap->nrRegions && nr < heap->nrRegions ; - i = list[i].prev, nr++) { - /* If switching texturing schemes, then the SAREA might not have been - * properly cleared, so we need to reset the global texture LRU. - */ - - if ( (i * sz) > heap->size ) { - nr = heap->nrRegions; - break; - } - - if (list[i].age > heap->local_age) - driTexturesGone( heap, i * sz, sz, list[i].in_use); - } - - /* Loop or uninitialized heap detected. Reset. - */ - - if (nr == heap->nrRegions) { - driTexturesGone( heap, 0, heap->size, 0); - resetGlobalLRU( heap ); - } - - if ( 0 ) { - printGlobalLRU( heap, __FUNCTION__ ); - printLocalLRU( heap, __FUNCTION__ ); - } - - heap->local_age = heap->global_age[0]; -} - - - - -/** - * Allocate memory from a texture heap to hold a texture object. This - * routine will attempt to allocate memory for the texture from the heaps - * specified by \c heap_array in order. That is, first it will try to - * allocate from \c heap_array[0], then \c heap_array[1], and so on. - * - * \param heap_array Array of pointers to texture heaps to use - * \param nr_heaps Number of heap pointer in \a heap_array - * \param t Texture object for which space is needed - * \return The ID of the heap from which memory was allocated, or -1 if - * memory could not be allocated. - * - * \bug The replacement policy implemented by this function is horrible. - */ - - -int -driAllocateTexture( driTexHeap * const * heap_array, unsigned nr_heaps, - driTextureObject * t ) -{ - driTexHeap * heap; - driTextureObject * temp; - driTextureObject * cursor; - unsigned id; - - - /* In case it already has texture space, initialize heap. This also - * prevents GCC from issuing a warning that heap might be used - * uninitialized. - */ - - heap = t->heap; - - - /* Run through each of the existing heaps and try to allocate a buffer - * to hold the texture. - */ - - for ( id = 0 ; (t->memBlock == NULL) && (id < nr_heaps) ; id++ ) { - heap = heap_array[ id ]; - if ( heap != NULL ) { - t->memBlock = mmAllocMem( heap->memory_heap, t->totalSize, - heap->alignmentShift, 0 ); - } - } - - - /* Kick textures out until the requested texture fits. - */ - - if ( t->memBlock == NULL ) { - for ( id = 0 ; (t->memBlock == NULL) && (id < nr_heaps) ; id++ ) { - heap = heap_array[ id ]; - if ( t->totalSize <= heap->size ) { - - for ( cursor = heap->texture_objects.prev, temp = cursor->prev; - cursor != &heap->texture_objects ; - cursor = temp, temp = cursor->prev ) { - - /* The the LRU element. If the texture is bound to one of - * the texture units, then we cannot kick it out. - */ - if ( cursor->bound /* || cursor->reserved */ ) { - continue; - } - - /* If this is a placeholder, there's no need to keep it */ - if (cursor->tObj) - driSwapOutTextureObject( cursor ); - else - driDestroyTextureObject( cursor ); - - t->memBlock = mmAllocMem( heap->memory_heap, t->totalSize, - heap->alignmentShift, 0 ); - - if (t->memBlock) - break; - } - } /* if ( t->totalSize <= heap->size ) ... */ - } - } - - - if ( t->memBlock != NULL ) { - /* id and heap->heapId may or may not be the same value here. - */ - - assert( heap != NULL ); - assert( (t->heap == NULL) || (t->heap == heap) ); - - t->heap = heap; - return heap->heapId; - } - else { - assert( t->heap == NULL ); - - fprintf( stderr, "[%s:%d] unable to allocate texture\n", - __FUNCTION__, __LINE__ ); - return -1; - } -} - - - - - - -/** - * Set the location where the texture-swap counter is stored. - */ - -void -driSetTextureSwapCounterLocation( driTexHeap * heap, unsigned * counter ) -{ - heap->texture_swaps = (counter == NULL) ? & dummy_swap_counter : counter; -} - - - - -/** - * Create a new heap for texture data. - * - * \param heap_id Device-dependent heap identifier. This value - * will returned by driAllocateTexture when memory - * is allocated from this heap. - * \param context Device-dependent driver context. This is - * supplied as the first parameter to the - * \c destroy_tex_obj function. - * \param size Size, in bytes, of the texture region - * \param alignmentShift Alignment requirement for textures. If textures - * must be allocated on a 4096 byte boundry, this - * would be 12. - * \param nr_regions Number of regions into which this texture space - * should be partitioned - * \param global_regions Array of \c drmTextureRegion structures in the SAREA - * \param global_age Pointer to the global texture age in the SAREA - * \param swapped_objects Pointer to the list of texture objects that are - * not in texture memory (i.e., have been swapped - * out). - * \param texture_object_size Size, in bytes, of a device-dependent texture - * object - * \param destroy_tex_obj Function used to destroy a device-dependent - * texture object - * - * \sa driDestroyTextureHeap - */ - -driTexHeap * -driCreateTextureHeap( unsigned heap_id, void * context, unsigned size, - unsigned alignmentShift, unsigned nr_regions, - drmTextureRegionPtr global_regions, unsigned * global_age, - driTextureObject * swapped_objects, - unsigned texture_object_size, - destroy_texture_object_t * destroy_tex_obj - ) -{ - driTexHeap * heap; - unsigned l; - - - if ( 0 ) - fprintf( stderr, "%s( %u, %p, %u, %u, %u )\n", - __FUNCTION__, - heap_id, (void *)context, size, alignmentShift, nr_regions ); - - heap = (driTexHeap *) CALLOC( sizeof( driTexHeap ) ); - if ( heap != NULL ) { - l = driLog2( (size - 1) / nr_regions ); - if ( l < alignmentShift ) - { - l = alignmentShift; - } - - heap->logGranularity = l; - heap->size = size & ~((1L << l) - 1); - - heap->memory_heap = mmInit( 0, heap->size ); - if ( heap->memory_heap != NULL ) { - heap->heapId = heap_id; - heap->driverContext = context; - - heap->alignmentShift = alignmentShift; - heap->nrRegions = nr_regions; - heap->global_regions = global_regions; - heap->global_age = global_age; - heap->swapped_objects = swapped_objects; - heap->texture_object_size = texture_object_size; - heap->destroy_texture_object = destroy_tex_obj; - - /* Force global heap init */ - if (heap->global_age == 0) - heap->local_age = ~0; - else - heap->local_age = 0; - - make_empty_list( & heap->texture_objects ); - driSetTextureSwapCounterLocation( heap, NULL ); - } - else { - FREE( heap ); - heap = NULL; - } - } - - - if ( 0 ) - fprintf( stderr, "%s returning %p\n", __FUNCTION__, (void *)heap ); - - return heap; -} - - - - -/** Destroys a texture heap - * - * \param heap Texture heap to be destroyed - */ - -void -driDestroyTextureHeap( driTexHeap * heap ) -{ - driTextureObject * t; - driTextureObject * temp; - - - if ( heap != NULL ) { - foreach_s( t, temp, & heap->texture_objects ) { - driDestroyTextureObject( t ); - } - foreach_s( t, temp, heap->swapped_objects ) { - driDestroyTextureObject( t ); - } - - mmDestroy( heap->memory_heap ); - FREE( heap ); - } -} - - - - -/****************************************************************************/ -/** - * Determine how many texels (including all mipmap levels) would be required - * for a texture map of size \f$2^^\c base_size_log2\f$ would require. - * - * \param base_size_log2 \f$log_2\f$ of the size of a side of the texture - * \param dimensions Number of dimensions of the texture. Either 2 or 3. - * \param faces Number of faces of the texture. Either 1 or 6 (for cube maps). - * \return Number of texels - */ - -static unsigned -texels_this_map_size( int base_size_log2, unsigned dimensions, unsigned faces ) -{ - unsigned texels; - - - assert( (faces == 1) || (faces == 6) ); - assert( (dimensions == 2) || (dimensions == 3) ); - - texels = 0; - if ( base_size_log2 >= 0 ) { - texels = (1U << (dimensions * base_size_log2)); - - /* See http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg03636.html - * for the complete explaination of why this formulation is used. - * Basically, the smaller mipmap levels sum to 0.333 the size of the - * level 0 map. The total size is therefore the size of the map - * multipled by 1.333. The +2 is there to round up. - */ - - texels = (texels * 4 * faces + 2) / 3; - } - - return texels; -} - - - - -struct maps_per_heap { - unsigned c[32]; -}; - -static void -fill_in_maximums( driTexHeap * const * heaps, unsigned nr_heaps, - unsigned max_bytes_per_texel, unsigned max_size, - unsigned mipmaps_at_once, unsigned dimensions, - unsigned faces, struct maps_per_heap * max_textures ) -{ - unsigned heap; - unsigned log2_size; - unsigned mask; - - - /* Determine how many textures of each size can be stored in each - * texture heap. - */ - - for ( heap = 0 ; heap < nr_heaps ; heap++ ) { - if ( heaps[ heap ] == NULL ) { - (void) memset( max_textures[ heap ].c, 0, - sizeof( max_textures[ heap ].c ) ); - continue; - } - - mask = (1U << heaps[ heap ]->logGranularity) - 1; - - if ( 0 ) { - fprintf( stderr, "[%s:%d] heap[%u] = %u bytes, mask = 0x%08x\n", - __FILE__, __LINE__, - heap, heaps[ heap ]->size, mask ); - } - - for ( log2_size = max_size ; log2_size > 0 ; log2_size-- ) { - unsigned total; - - - /* Determine the total number of bytes required by a texture of - * size log2_size. - */ - - total = texels_this_map_size( log2_size, dimensions, faces ) - - texels_this_map_size( log2_size - mipmaps_at_once, - dimensions, faces ); - total *= max_bytes_per_texel; - total = (total + mask) & ~mask; - - /* The number of textures of a given size that will fit in a heap - * is equal to the size of the heap divided by the size of the - * texture. - */ - - max_textures[ heap ].c[ log2_size ] = heaps[ heap ]->size / total; - - if ( 0 ) { - fprintf( stderr, "[%s:%d] max_textures[%u].c[%02u] " - "= 0x%08x / 0x%08x " - "= %u (%u)\n", - __FILE__, __LINE__, - heap, log2_size, - heaps[ heap ]->size, total, - heaps[ heap ]->size / total, - max_textures[ heap ].c[ log2_size ] ); - } - } - } -} - - -static unsigned -get_max_size( unsigned nr_heaps, - unsigned texture_units, - unsigned max_size, - int all_textures_one_heap, - struct maps_per_heap * max_textures ) -{ - unsigned heap; - unsigned log2_size; - - - /* Determine the largest texture size such that a texture of that size - * can be bound to each texture unit at the same time. Some hardware - * may require that all textures be in the same texture heap for - * multitexturing. - */ - - for ( log2_size = max_size ; log2_size > 0 ; log2_size-- ) { - unsigned total = 0; - - for ( heap = 0 ; heap < nr_heaps ; heap++ ) - { - total += max_textures[ heap ].c[ log2_size ]; - - if ( 0 ) { - fprintf( stderr, "[%s:%d] max_textures[%u].c[%02u] = %u, " - "total = %u\n", __FILE__, __LINE__, heap, log2_size, - max_textures[ heap ].c[ log2_size ], total ); - } - - if ( (max_textures[ heap ].c[ log2_size ] >= texture_units) - || (!all_textures_one_heap && (total >= texture_units)) ) { - /* The number of mipmap levels is the log-base-2 of the - * maximum texture size plus 1. If the maximum texture size - * is 1x1, the log-base-2 is 0 and 1 mipmap level (the base - * level) is available. - */ - - return log2_size + 1; - } - } - } - - /* This should NEVER happen. It should always be possible to have at - * *least* a 1x1 texture in memory! - */ - assert( log2_size != 0 ); - return 0; -} - -#define SET_MAX(f,v) \ - do { if ( max_sizes[v] != 0 ) { limits-> f = max_sizes[v]; } } while( 0 ) - -#define SET_MAX_RECT(f,v) \ - do { if ( max_sizes[v] != 0 ) { limits-> f = 1 << max_sizes[v]; } } while( 0 ) - - -/** - * Given the amount of texture memory, the number of texture units, and the - * maximum size of a texel, calculate the maximum texture size the driver can - * advertise. - * - * \param heaps Texture heaps for this card - * \param nr_heap Number of texture heaps - * \param limits OpenGL contants. MaxTextureUnits must be set. - * \param max_bytes_per_texel Maximum size of a single texel, in bytes - * \param max_2D_size \f$\log_2\f$ of the maximum 2D texture size (i.e., - * 1024x1024 textures, this would be 10) - * \param max_3D_size \f$\log_2\f$ of the maximum 3D texture size (i.e., - * 1024x1024x1024 textures, this would be 10) - * \param max_cube_size \f$\log_2\f$ of the maximum cube texture size (i.e., - * 1024x1024 textures, this would be 10) - * \param max_rect_size \f$\log_2\f$ of the maximum texture rectangle size - * (i.e., 1024x1024 textures, this would be 10). This is a power-of-2 - * even though texture rectangles need not be a power-of-2. - * \param mipmaps_at_once Total number of mipmaps that can be used - * at one time. For most hardware this will be \f$\c max_size + 1\f$. - * For hardware that does not support mipmapping, this will be 1. - * \param all_textures_one_heap True if the hardware requires that all - * textures be in a single texture heap for multitexturing. - */ - -void -driCalculateMaxTextureLevels( driTexHeap * const * heaps, - unsigned nr_heaps, - struct gl_constants * limits, - unsigned max_bytes_per_texel, - unsigned max_2D_size, - unsigned max_3D_size, - unsigned max_cube_size, - unsigned max_rect_size, - unsigned mipmaps_at_once, - int all_textures_one_heap ) -{ - struct maps_per_heap max_textures[8]; - unsigned i; - const unsigned dimensions[4] = { 2, 3, 2, 2 }; - const unsigned faces[4] = { 1, 1, 6, 1 }; - unsigned max_sizes[4]; - unsigned mipmaps[4]; - - - max_sizes[0] = max_2D_size; - max_sizes[1] = max_3D_size; - max_sizes[2] = max_cube_size; - max_sizes[3] = max_rect_size; - - mipmaps[0] = mipmaps_at_once; - mipmaps[1] = mipmaps_at_once; - mipmaps[2] = 1; - mipmaps[3] = mipmaps_at_once; - - - /* Calculate the maximum number of texture levels in two passes. The - * first pass determines how many textures of each power-of-two size - * (including all mipmap levels for that size) can fit in each texture - * heap. The second pass finds the largest texture size that allows - * a texture of that size to be bound to every texture unit. - */ - - for ( i = 0 ; i < 4 ; i++ ) { - if ( max_sizes[ i ] != 0 ) { - fill_in_maximums( heaps, nr_heaps, max_bytes_per_texel, - max_sizes[ i ], mipmaps[ i ], - dimensions[ i ], faces[ i ], - max_textures ); - - max_sizes[ i ] = get_max_size( nr_heaps, - limits->MaxTextureUnits, - max_sizes[ i ], - all_textures_one_heap, - max_textures ); - } - } - - SET_MAX( MaxTextureLevels, 0 ); - SET_MAX( Max3DTextureLevels, 1 ); - SET_MAX( MaxCubeTextureLevels, 2 ); - SET_MAX_RECT( MaxTextureRectSize, 3 ); -} - - - - -/** - * Perform initial binding of default textures objects on a per unit, per - * texture target basis. - * - * \param ctx Current OpenGL context - * \param swapped List of swapped-out textures - * \param targets Bit-mask of value texture targets - */ - -void driInitTextureObjects( GLcontext *ctx, driTextureObject * swapped, - GLuint targets ) -{ - struct gl_texture_object *texObj; - GLuint tmp = ctx->Texture.CurrentUnit; - unsigned i; - - - for ( i = 0 ; i < ctx->Const.MaxTextureUnits ; i++ ) { - ctx->Texture.CurrentUnit = i; - - if ( (targets & DRI_TEXMGR_DO_TEXTURE_1D) != 0 ) { - texObj = ctx->Texture.Unit[i].Current1D; - ctx->Driver.BindTexture( ctx, GL_TEXTURE_1D, texObj ); - move_to_tail( swapped, (driTextureObject *) texObj->DriverData ); - } - - if ( (targets & DRI_TEXMGR_DO_TEXTURE_2D) != 0 ) { - texObj = ctx->Texture.Unit[i].Current2D; - ctx->Driver.BindTexture( ctx, GL_TEXTURE_2D, texObj ); - move_to_tail( swapped, (driTextureObject *) texObj->DriverData ); - } - - if ( (targets & DRI_TEXMGR_DO_TEXTURE_3D) != 0 ) { - texObj = ctx->Texture.Unit[i].Current3D; - ctx->Driver.BindTexture( ctx, GL_TEXTURE_3D, texObj ); - move_to_tail( swapped, (driTextureObject *) texObj->DriverData ); - } - - if ( (targets & DRI_TEXMGR_DO_TEXTURE_CUBE) != 0 ) { - texObj = ctx->Texture.Unit[i].CurrentCubeMap; - ctx->Driver.BindTexture( ctx, GL_TEXTURE_CUBE_MAP_ARB, texObj ); - move_to_tail( swapped, (driTextureObject *) texObj->DriverData ); - } - - if ( (targets & DRI_TEXMGR_DO_TEXTURE_RECT) != 0 ) { - texObj = ctx->Texture.Unit[i].CurrentRect; - ctx->Driver.BindTexture( ctx, GL_TEXTURE_RECTANGLE_NV, texObj ); - move_to_tail( swapped, (driTextureObject *) texObj->DriverData ); - } - } - - ctx->Texture.CurrentUnit = tmp; -} - - - - -/** - * Verify that the specified texture is in the specificed heap. - * - * \param tex Texture to be tested. - * \param heap Texture memory heap to be tested. - * \return True if the texture is in the heap, false otherwise. - */ - -static GLboolean -check_in_heap( const driTextureObject * tex, const driTexHeap * heap ) -{ -#if 1 - return tex->heap == heap; -#else - driTextureObject * curr; - - foreach( curr, & heap->texture_objects ) { - if ( curr == tex ) { - break; - } - } - - return curr == tex; -#endif -} - - - -/****************************************************************************/ -/** - * Validate the consistency of a set of texture heaps. - * Original version by Keith Whitwell in r200/r200_sanity.c. - */ - -GLboolean -driValidateTextureHeaps( driTexHeap * const * texture_heaps, - unsigned nr_heaps, const driTextureObject * swapped ) -{ - driTextureObject *t; - unsigned i; - - for ( i = 0 ; i < nr_heaps ; i++ ) { - int last_end = 0; - unsigned textures_in_heap = 0; - unsigned blocks_in_mempool = 0; - const driTexHeap * heap = texture_heaps[i]; - const memHeap_t * p = heap->memory_heap; - - /* Check each texture object has a MemBlock, and is linked into - * the correct heap. - * - * Check the texobj base address corresponds to the MemBlock - * range. Check the texobj size (recalculate???) fits within - * the MemBlock. - * - * Count the number of texobj's using this heap. - */ - - foreach ( t, &heap->texture_objects ) { - if ( !check_in_heap( t, heap ) ) { - fprintf( stderr, "%s memory block for texture object @ %p not " - "found in heap #%d\n", - __FUNCTION__, (void *)t, i ); - return GL_FALSE; - } - - - if ( t->totalSize > t->memBlock->size ) { - fprintf( stderr, "%s: Memory block for texture object @ %p is " - "only %u bytes, but %u are required\n", - __FUNCTION__, (void *)t, t->totalSize, t->memBlock->size ); - return GL_FALSE; - } - - textures_in_heap++; - } - - /* Validate the contents of the heap: - * - Ordering - * - Overlaps - * - Bounds - */ - - while ( p != NULL ) { - if (p->reserved) { - fprintf( stderr, "%s: Block (%08x,%x), is reserved?!\n", - __FUNCTION__, p->ofs, p->size ); - return GL_FALSE; - } - - if (p->ofs != last_end) { - fprintf( stderr, "%s: blocks_in_mempool = %d, last_end = %d, p->ofs = %d\n", - __FUNCTION__, blocks_in_mempool, last_end, p->ofs ); - return GL_FALSE; - } - - if (!p->reserved && !p->free) { - blocks_in_mempool++; - } - - last_end = p->ofs + p->size; - p = p->next; - } - - if (textures_in_heap != blocks_in_mempool) { - fprintf( stderr, "%s: Different number of textures objects (%u) and " - "inuse memory blocks (%u)\n", - __FUNCTION__, textures_in_heap, blocks_in_mempool ); - return GL_FALSE; - } - -#if 0 - fprintf( stderr, "%s: textures_in_heap = %u\n", - __FUNCTION__, textures_in_heap ); -#endif - } - - - /* Check swapped texobj's have zero memblocks - */ - i = 0; - foreach ( t, swapped ) { - if ( t->memBlock != NULL ) { - fprintf( stderr, "%s: Swapped texobj %p has non-NULL memblock %p\n", - __FUNCTION__, (void *)t, (void *)t->memBlock ); - return GL_FALSE; - } - i++; - } - -#if 0 - fprintf( stderr, "%s: swapped texture count = %u\n", __FUNCTION__, i ); -#endif - - return GL_TRUE; -} - - - - -/****************************************************************************/ -/** - * Compute which mipmap levels that really need to be sent to the hardware. - * This depends on the base image size, GL_TEXTURE_MIN_LOD, - * GL_TEXTURE_MAX_LOD, GL_TEXTURE_BASE_LEVEL, and GL_TEXTURE_MAX_LEVEL. - */ - -void -driCalculateTextureFirstLastLevel( driTextureObject * t ) -{ - struct gl_texture_object * const tObj = t->tObj; - const struct gl_texture_image * const baseImage = - tObj->Image[tObj->BaseLevel]; - - /* These must be signed values. MinLod and MaxLod can be negative numbers, - * and having firstLevel and lastLevel as signed prevents the need for - * extra sign checks. - */ - int firstLevel; - int lastLevel; - - /* Yes, this looks overly complicated, but it's all needed. - */ - - switch (tObj->Target) { - case GL_TEXTURE_1D: - case GL_TEXTURE_2D: - case GL_TEXTURE_3D: - case GL_TEXTURE_CUBE_MAP: - if (tObj->MinFilter == GL_NEAREST || tObj->MinFilter == GL_LINEAR) { - /* GL_NEAREST and GL_LINEAR only care about GL_TEXTURE_BASE_LEVEL. - */ - - firstLevel = lastLevel = tObj->BaseLevel; - } - else { - firstLevel = tObj->BaseLevel + (GLint)(tObj->MinLod + 0.5); - firstLevel = MAX2(firstLevel, tObj->BaseLevel); - lastLevel = tObj->BaseLevel + (GLint)(tObj->MaxLod + 0.5); - lastLevel = MAX2(lastLevel, t->tObj->BaseLevel); - lastLevel = MIN2(lastLevel, t->tObj->BaseLevel + baseImage->MaxLog2); - lastLevel = MIN2(lastLevel, t->tObj->MaxLevel); - lastLevel = MAX2(firstLevel, lastLevel); /* need at least one level */ - } - break; - case GL_TEXTURE_RECTANGLE_NV: - case GL_TEXTURE_4D_SGIS: - firstLevel = lastLevel = 0; - break; - default: - return; - } - - /* save these values */ - t->firstLevel = firstLevel; - t->lastLevel = lastLevel; -} diff --git a/xc/lib/GL/mesa/src/drv/common/texmem.h b/xc/lib/GL/mesa/src/drv/common/texmem.h deleted file mode 100644 index 9afbb0c86..000000000 --- a/xc/lib/GL/mesa/src/drv/common/texmem.h +++ /dev/null @@ -1,295 +0,0 @@ -/* - * Copyright 2000-2001 VA Linux Systems, Inc. - * (c) Copyright IBM Corporation 2002 - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * on the rights to use, copy, modify, merge, publish, distribute, sub - * license, and/or sell copies of the Software, and to permit persons to whom - * the Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL - * VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE - * USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Authors: - * Ian Romanick - * Keith Whitwell - * Kevin E. Martin - * Gareth Hughes - */ -/* $XFree86:$ */ - -/** \file texmem.h - * Public interface to the DRI texture memory management routines. - * - * \sa texmem.c - */ - -#ifndef DRI_TEXMEM_H -#define DRI_TEXMEM_H - -#include "mtypes.h" -#include "mm.h" -#include "xf86drm.h" - -struct dri_tex_heap; -typedef struct dri_tex_heap driTexHeap; - -struct dri_texture_object; -typedef struct dri_texture_object driTextureObject; - - -/** - * Base texture object type. Each driver will extend this type with its own - * private data members. - */ - -struct dri_texture_object { - struct dri_texture_object * next; - struct dri_texture_object * prev; - - driTexHeap * heap; /**< Texture heap currently stored in */ - struct gl_texture_object * tObj;/**< Pointer to Mesa texture object - * If NULL, this texture object is a - * "placeholder" object representing - * texture memory in use by another context. - * A placeholder should have a heap and a memBlock. - */ - PMemBlock memBlock; /**< Memory block containing texture */ - unsigned bound; /**< Texture unit currently bound to */ - - unsigned totalSize; /**< Total size of the texture, - * including all mipmap levels - */ - - unsigned dirty_images[6]; /**< Flags for whether or not images - * need to be uploaded to local or - * AGP texture space. One flag set - * for each cube face for cubic - * textures. Bit zero corresponds to - * the base-level, which may or may - * not be the level zero mipmap. - */ - - unsigned timestamp; /**< Timestamp used to - * synchronize with 3d engine - * in hardware where textures - * are uploaded directly to - * the framebuffer. - */ - - unsigned firstLevel; /**< Image in \c tObj->Image that - * corresponds to the base-level of - * this texture object. - */ - - unsigned lastLevel; /**< Last image in \c tObj->Image used - * by the current LOD settings of this - * texture object. This value must be - * greater than or equal to - * \c firstLevel. - */ -}; - - -typedef void (destroy_texture_object_t)( void * driverContext, - driTextureObject * t ); - -/** - * Client-private representation of texture memory state. - * - * Clients will place one or more of these structs in their driver - * context struct to manage one or more global texture heaps. - */ - -struct dri_tex_heap { - - /** Client-supplied heap identifier - */ - unsigned heapId; - - /** Pointer to the client's private context - */ - void *driverContext; - - /** Total size of the heap, in bytes - */ - unsigned size; - - /** \brief \f$log_2\f$ of size of single heap region - * - * Each context takes memory from the global texture heap in - * \f$2^{logGranularity}\f$ byte blocks. The value of - * \a logGranularity is based on the amount of memory represented - * by the heap and the maximum number of regions in the SAREA. Given - * \a b bytes of texture memory an \a n regions in the SAREA, - * \a logGranularity will be \f$\lfloor\log_2( b / n )\rfloor\f$. - */ - unsigned logGranularity; - - /** \brief Required alignment of allocations in this heap - * - * The alignment shift is supplied to \a mmAllocMem when memory is - * allocated from this heap. The value of \a alignmentShift will - * typically reflect some require of the hardware. This value has - * \b no \b relation to \a logGranularity. \a alignmentShift is a - * per-context value. - * - * \sa mmAllocMem - */ - unsigned alignmentShift; - - /** Number of elements in global list (the SAREA). - */ - unsigned nrRegions; - - /** Pointer to SAREA \a driTexRegion array - */ - drmTextureRegionPtr global_regions; - - /** Pointer to the texture state age (generation number) in the SAREA - */ - unsigned * global_age; - - /** Local age (generation number) of texture state - */ - unsigned local_age; - - /** Memory heap used to manage texture memory represented by - * this texture heap. - */ - memHeap_t * memory_heap; - - /** List of objects that we currently believe to be in texture - * memory. - */ - driTextureObject texture_objects; - - /** Pointer to the list of texture objects that are not in - * texture memory. - */ - driTextureObject * swapped_objects; - - /** Size of the driver-speicific texture object. - */ - unsigned texture_object_size; - - - /** - * \brief Function to destroy driver-specific texture object data. - * - * This function is supplied by the driver so that the texture manager - * can release all resources associated with a texture object. This - * function should only release driver-specific data. That is, - * \a driDestroyTextureObject will release the texture memory - * associated with the texture object, it will release the memory - * for the texture object itself, and it will unlink the texture - * object from the texture object lists. - * - * \param driverContext Pointer to the driver supplied context - * \param t Texture object that is to be destroyed - * \sa driDestroyTextureObject - */ - - destroy_texture_object_t * destroy_texture_object; - - - /** - */ - unsigned * texture_swaps; - - /** - * Timestamp used to synchronize with 3d engine in hardware - * where textures are uploaded directly to the - * framebuffer. - */ - unsigned timestamp; -}; - - - - -/** - * Called by the client on lock contention to determine whether textures have - * been stolen. If another client has modified a region in which we have - * textures, then we need to figure out which of our textures have been - * removed and update our global LRU. - * - * \param heap Texture heap to be updated - * \hideinitializer - */ - -#define DRI_AGE_TEXTURES( heap ) \ - do { \ - if ( ((heap) != NULL) \ - && ((heap)->local_age != (heap)->global_age[0]) ) \ - driAgeTextures( heap ); \ - } while( 0 ) - - - - -/* This should be called whenever there has been contention on the hardware - * lock. driAgeTextures should not be called directly. Instead, clients - * should use DRI_AGE_TEXTURES, above. - */ - -void driAgeTextures( driTexHeap * heap ); - -void driUpdateTextureLRU( driTextureObject * t ); -void driSwapOutTextureObject( driTextureObject * t ); -void driDestroyTextureObject( driTextureObject * t ); -int driAllocateTexture( driTexHeap * const * heap_array, unsigned nr_heaps, - driTextureObject * t ); - -GLboolean driIsTextureResident( GLcontext * ctx, - struct gl_texture_object * texObj ); - -driTexHeap * driCreateTextureHeap( unsigned heap_id, void * context, - unsigned size, unsigned alignmentShift, unsigned nr_regions, - drmTextureRegionPtr global_regions, unsigned * global_age, - driTextureObject * swapped_objects, unsigned texture_object_size, - destroy_texture_object_t * destroy_tex_obj ); -void driDestroyTextureHeap( driTexHeap * heap ); - -void -driCalculateMaxTextureLevels( driTexHeap * const * heaps, - unsigned nr_heaps, - struct gl_constants * limits, - unsigned max_bytes_per_texel, - unsigned max_2D_size, - unsigned max_3D_size, - unsigned max_cube_size, - unsigned max_rect_size, - unsigned mipmaps_at_once, - int all_textures_one_heap ); - -void -driSetTextureSwapCounterLocation( driTexHeap * heap, unsigned * counter ); - -#define DRI_TEXMGR_DO_TEXTURE_1D 0x0001 -#define DRI_TEXMGR_DO_TEXTURE_2D 0x0002 -#define DRI_TEXMGR_DO_TEXTURE_3D 0x0004 -#define DRI_TEXMGR_DO_TEXTURE_CUBE 0x0008 -#define DRI_TEXMGR_DO_TEXTURE_RECT 0x0010 - -void driInitTextureObjects( GLcontext *ctx, driTextureObject * swapped, - GLuint targets ); - -GLboolean driValidateTextureHeaps( driTexHeap * const * texture_heaps, - unsigned nr_heaps, const driTextureObject * swapped ); - -extern void driCalculateTextureFirstLastLevel( driTextureObject * t ); - -#endif /* DRI_TEXMEM_H */ diff --git a/xc/lib/GL/mesa/src/drv/common/utils.c b/xc/lib/GL/mesa/src/drv/common/utils.c deleted file mode 100644 index 904f16eb4..000000000 --- a/xc/lib/GL/mesa/src/drv/common/utils.c +++ /dev/null @@ -1,183 +0,0 @@ -/* - * (c) Copyright IBM Corporation 2002 - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * on the rights to use, copy, modify, merge, publish, distribute, sub - * license, and/or sell copies of the Software, and to permit persons to whom - * the Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL - * VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE - * USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Authors: - * Ian Romanick - */ -/* $XFree86:$ */ - -#include -#include -#include "mtypes.h" -#include "extensions.h" -#include "utils.h" - -#if defined(USE_X86_ASM) -#include "X86/common_x86_asm.h" -#endif - -unsigned -driParseDebugString( const char * debug, - const struct dri_debug_control * control ) -{ - unsigned flag; - - - flag = 0; - if ( debug != NULL ) { - while( control->string != NULL ) { - if ( !strcmp( debug, "all" ) || - strstr( debug, control->string ) != NULL ) { - flag |= control->flag; - } - - control++; - } - } - - return flag; -} - - - - -unsigned -driGetRendererString( char * buffer, const char * hardware_name, - const char * driver_date, GLuint agp_mode ) -{ -#ifdef USE_X86_ASM - char * x86_str = ""; - char * mmx_str = ""; - char * tdnow_str = ""; - char * sse_str = ""; -#endif - unsigned offset; - - - offset = sprintf( buffer, "Mesa DRI %s %s", hardware_name, driver_date ); - - /* Append any AGP-specific information. - */ - switch ( agp_mode ) { - case 1: - case 2: - case 4: - case 8: - offset += sprintf( & buffer[ offset ], " AGP %ux", agp_mode ); - break; - - default: - break; - } - - /* Append any CPU-specific information. - */ -#ifdef USE_X86_ASM - if ( _mesa_x86_cpu_features ) { - x86_str = " x86"; - } -# ifdef USE_MMX_ASM - if ( cpu_has_mmx ) { - mmx_str = (cpu_has_mmxext) ? "/MMX+" : "/MMX"; - } -# endif -# ifdef USE_3DNOW_ASM - if ( cpu_has_3dnow ) { - tdnow_str = (cpu_has_3dnowext) ? "/3DNow!+" : "/3DNow!"; - } -# endif -# ifdef USE_SSE_ASM - if ( cpu_has_xmm ) { - sse_str = (cpu_has_xmm2) ? "/SSE2" : "/SSE"; - } -# endif - - offset += sprintf( & buffer[ offset ], "%s%s%s%s", - x86_str, mmx_str, tdnow_str, sse_str ); - -#elif defined(USE_SPARC_ASM) - - offset += sprintf( & buffer[ offset ], " Sparc" ); - -#endif - - return offset; -} - - - - -void driInitExtensions( GLcontext * ctx, - const char * const extensions_to_enable[], - GLboolean enable_imaging ) -{ - unsigned i; - - if ( enable_imaging ) { - _mesa_enable_imaging_extensions( ctx ); - } - - for ( i = 0 ; extensions_to_enable[i] != NULL ; i++ ) { - _mesa_enable_extension( ctx, extensions_to_enable[i] ); - } -} - - - - -GLboolean -driCheckDriDdxDrmVersions(__DRIscreenPrivate *sPriv, - const char * driver_name, - int dri_major, int dri_minor, - int ddx_major, int ddx_minor, - int drm_major, int drm_minor) -{ - static const char format[] = "%s DRI driver expected %s version %d.%d.x " - "but got version %d.%d.%d"; - int major, minor, patch; - - /* Check the DRI version */ - if (XF86DRIQueryVersion(sPriv->display, &major, &minor, &patch)) { - if (major != dri_major || minor < dri_minor) { - __driUtilMessage(format, "DRI", driver_name, dri_major, dri_minor, - major, minor, patch); - return GL_FALSE; - } - } - - /* Check that the DDX driver version is compatible */ - if (sPriv->ddxMajor != ddx_major || sPriv->ddxMinor < ddx_minor) { - __driUtilMessage(format, "DDX", driver_name, ddx_major, ddx_minor, - sPriv->ddxMajor, sPriv->ddxMinor, sPriv->ddxPatch); - return GL_FALSE; - } - - /* Check that the DRM driver version is compatible */ - if (sPriv->drmMajor != drm_major || sPriv->drmMinor < drm_minor) { - __driUtilMessage(format, "DRM", driver_name, drm_major, drm_minor, - sPriv->drmMajor, sPriv->drmMinor, sPriv->drmPatch); - return GL_FALSE; - } - - return GL_TRUE; -} diff --git a/xc/lib/GL/mesa/src/drv/common/utils.h b/xc/lib/GL/mesa/src/drv/common/utils.h deleted file mode 100644 index d6506c5b8..000000000 --- a/xc/lib/GL/mesa/src/drv/common/utils.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * (c) Copyright IBM Corporation 2002 - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * on the rights to use, copy, modify, merge, publish, distribute, sub - * license, and/or sell copies of the Software, and to permit persons to whom - * the Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL - * VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE - * USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Authors: - * Ian Romanick - */ -/* $XFree86:$ */ - -#ifndef DRI_DEBUG_H -#define DRI_DEBUG_H - -#include "context.h" -#include "dri_util.h" - -struct dri_debug_control -{ - const char * string; - unsigned flag; -}; - -extern unsigned driParseDebugString( const char * debug, - const struct dri_debug_control * control ); - -extern unsigned driGetRendererString( char * buffer, - const char * hardware_name, const char * driver_date, GLuint agp_mode ); - -extern void driInitExtensions( GLcontext * ctx, - const char * const card_extensions[], GLboolean enable_imaging ); - -extern GLboolean driCheckDriDdxDrmVersions( __DRIscreenPrivate *sPriv, - const char * driver_name, int dri_major, int dri_minor, - int ddx_major, int ddx_minor, int drm_major, int drm_minor ); - -#endif /* DRI_DEBUG_H */ diff --git a/xc/lib/GL/mesa/src/drv/common/vblank.c b/xc/lib/GL/mesa/src/drv/common/vblank.c deleted file mode 100644 index 7438dcc53..000000000 --- a/xc/lib/GL/mesa/src/drv/common/vblank.c +++ /dev/null @@ -1,350 +0,0 @@ -/* -*- mode: c; c-basic-offset: 3 -*- */ -/* - * (c) Copyright IBM Corporation 2002 - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * on the rights to use, copy, modify, merge, publish, distribute, sub - * license, and/or sell copies of the Software, and to permit persons to whom - * the Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL - * VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE - * USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Authors: - * Ian Romanick - */ -/* $XFree86:$ */ - -#include "glheader.h" -#include "xf86drm.h" -#include "mtypes.h" -#include "macros.h" -#include "dd.h" -#include "vblank.h" -#include "xmlpool.h" - - -/****************************************************************************/ -/** - * Get the current MSC refresh counter. - * - * Stores the 64-bit count of vertical refreshes since some (arbitrary) - * point in time in \c count. Unless the value wraps around, which it - * may, it will never decrease. - * - * \warning This function is called from \c glXGetVideoSyncSGI, which expects - * a \c count of type \c unsigned (32-bit), and \c glXGetSyncValuesOML, which - * expects a \c count of type \c int64_t (signed 64-bit). The kernel ioctl - * currently always returns a \c sequence of type \c unsigned. - * - * \param priv Pointer to the DRI screen private struct. - * \param count Storage to hold MSC counter. - * \return Zero is returned on success. A negative errno value - * is returned on failure. - */ -int driGetMSC32( __DRIscreenPrivate * priv, int64_t * count ) -{ - drmVBlank vbl; - int ret; - - /* Don't wait for anything. Just get the current refresh count. */ - - vbl.request.type = DRM_VBLANK_RELATIVE; - vbl.request.sequence = 0; - - ret = drmWaitVBlank( priv->fd, &vbl ); - *count = (int64_t)vbl.reply.sequence; - - return ret; -} - - -/****************************************************************************/ -/** - * Wait for a specified refresh count. This implements most of the - * functionality of \c glXWaitForMscOML from the GLX_OML_sync_control spec. - * Waits for the \c target_msc refresh. If that has already passed, it - * waits until \f$(MSC \bmod divisor)\f$ is equal to \c remainder. If - * \c target_msc is 0, use the behavior of glXWaitVideoSyncSGI(), which - * omits the initial check against a target MSC value. - * - * This function is actually something of a hack. The problem is that, at - * the time of this writing, none of the existing DRM modules support an - * ioctl that returns a 64-bit count (at least not on 32-bit platforms). - * However, this function exists to support a GLX function that requires - * the use of 64-bit counts. As such, there is a little bit of ugly - * hackery at the end of this function to make the 32-bit count act like - * a 64-bit count. There are still some cases where this will break, but - * I believe it catches the most common cases. - * - * The real solution is to provide an ioctl that uses a 64-bit count. - * - * \param dpy Pointer to the \c Display. - * \param priv Pointer to the DRI drawable private. - * \param target_msc Desired refresh count to wait for. A value of 0 - * means to use the glXWaitVideoSyncSGI() behavior. - * \param divisor MSC divisor if \c target_msc is already reached. - * \param remainder Desired MSC remainder if \c target_msc is already - * reached. - * \param msc Buffer to hold MSC when done waiting. - * - * \return Zero on success or \c GLX_BAD_CONTEXT on failure. - */ - -int driWaitForMSC32( __DRIdrawablePrivate *priv, - int64_t target_msc, int64_t divisor, int64_t remainder, - int64_t * msc ) -{ - drmVBlank vbl; - - - if ( divisor != 0 ) { - unsigned int target = (unsigned int)target_msc; - unsigned int next = target; - unsigned int r; - int dont_wait = (target_msc == 0); - - do { - /* dont_wait means we're using the glXWaitVideoSyncSGI() behavior. - * The first time around, just get the current count and proceed - * to the test for (MSC % divisor) == remainder. - */ - vbl.request.type = dont_wait ? DRM_VBLANK_RELATIVE : - DRM_VBLANK_ABSOLUTE; - vbl.request.sequence = next; - - if ( drmWaitVBlank( priv->driScreenPriv->fd, &vbl ) != 0 ) { - /* FIXME: This doesn't seem like the right thing to return here. - */ - return GLX_BAD_CONTEXT; - } - - dont_wait = 0; - if (target_msc != 0 && vbl.reply.sequence == target) - break; - - /* Assuming the wait-done test fails, the next refresh to wait for - * will be one that satisfies (MSC % divisor) == remainder. The - * value (MSC - (MSC % divisor) + remainder) is the refresh value - * closest to the current value that would satisfy the equation. - * If this refresh has already happened, we add divisor to obtain - * the next refresh after the current one that will satisfy it. - */ - r = (vbl.reply.sequence % (unsigned int)divisor); - next = (vbl.reply.sequence - r + (unsigned int)remainder); - if (next <= vbl.reply.sequence) next += (unsigned int)divisor; - - } while ( r != (unsigned int)remainder ); - } - else { - /* If the \c divisor is zero, just wait until the MSC is greater - * than or equal to \c target_msc. - */ - - vbl.request.type = DRM_VBLANK_ABSOLUTE; - vbl.request.sequence = target_msc; - - if ( drmWaitVBlank( priv->driScreenPriv->fd, &vbl ) != 0 ) { - /* FIXME: This doesn't seem like the right thing to return here. - */ - return GLX_BAD_CONTEXT; - } - } - - *msc = (target_msc & 0xffffffff00000000LL); - *msc |= vbl.reply.sequence; - if ( *msc < target_msc ) { - *msc += 0x0000000100000000LL; - } - - return 0; -} - - -/****************************************************************************/ -/** - * Gets a set of default vertical-blank-wait flags based on the internal GLX - * API version and several configuration options. - */ - -GLuint driGetDefaultVBlankFlags( const driOptionCache *optionCache ) -{ - GLuint flags = 0; - int vblank_mode; - - flags |= (driCompareGLXAPIVersion( 20030317 ) >= 0) - ? VBLANK_FLAG_INTERVAL : 0; - - if ( driCheckOption( optionCache, "vblank_mode", DRI_ENUM ) ) - vblank_mode = driQueryOptioni( optionCache, "vblank_mode" ); - else - vblank_mode = DRI_CONF_VBLANK_DEF_INTERVAL_1; - - switch (vblank_mode) { - case DRI_CONF_VBLANK_NEVER: - flags = 0; - break; - case DRI_CONF_VBLANK_DEF_INTERVAL_0: - break; - case DRI_CONF_VBLANK_DEF_INTERVAL_1: - flags |= VBLANK_FLAG_THROTTLE; - break; - case DRI_CONF_VBLANK_ALWAYS_SYNC: - flags |= VBLANK_FLAG_SYNC; - break; - } - - return flags; -} - - -/****************************************************************************/ -/** - * Sets the default swap interval when the drawable is first bound to a - * direct rendering context. - */ - -void driDrawableInitVBlank( __DRIdrawablePrivate *priv, GLuint flags ) -{ - if ( priv->pdraw->swap_interval == (unsigned)-1 ) { - priv->pdraw->swap_interval = (flags & VBLANK_FLAG_THROTTLE) != 0 ? 1 : 0; - } - -} - - -/****************************************************************************/ -/** - * Wrapper to call \c drmWaitVBlank. The main purpose of this function is to - * wrap the error message logging. The error message should only be logged - * the first time the \c drmWaitVBlank fails. If \c drmWaitVBlank is - * successful, \c vbl_seq will be set the sequence value in the reply. - * - * \param vbl Pointer to drmVBlank packet desribing how to wait. - * \param vbl_seq Location to store the current refresh counter. - * \param fd File descriptor use to call into the DRM. - * \return Zero on success or -1 on failure. - */ - -static int do_wait( drmVBlank * vbl, GLuint * vbl_seq, int fd ) -{ - int ret; - - - ret = drmWaitVBlank( fd, vbl ); - if ( ret != 0 ) { - static GLboolean first_time = GL_TRUE; - - if ( first_time ) { - fprintf(stderr, - "%s: drmWaitVBlank returned %d, IRQs don't seem to be" - " working correctly.\nTry running with LIBGL_THROTTLE_REFRESH" - " and LIBL_SYNC_REFRESH unset.\n", __FUNCTION__, ret); - first_time = GL_FALSE; - } - - return -1; - } - - *vbl_seq = vbl->reply.sequence; - return 0; -} - - -/****************************************************************************/ -/** - * Waits for the vertical blank for use with glXSwapBuffers. - * - * \param vbl_seq Vertical blank sequence number (MSC) after the last buffer - * swap. Updated after this wait. - * \param flags \c VBLANK_FLAG bits that control how long to wait. - * \param missed_deadline Set to \c GL_TRUE if the MSC after waiting is later - * than the "target" based on \c flags. The idea is that if - * \c missed_deadline is set, then the application is not - * achieving its desired framerate. - * \return Zero on success, -1 on error. - */ - -int -driWaitForVBlank( const __DRIdrawablePrivate *priv, GLuint * vbl_seq, - GLuint flags, GLboolean * missed_deadline ) -{ - drmVBlank vbl; - unsigned original_seq; - unsigned deadline; - unsigned interval; - - - *missed_deadline = GL_FALSE; - if ( (flags & (VBLANK_FLAG_INTERVAL | - VBLANK_FLAG_THROTTLE | - VBLANK_FLAG_SYNC)) == 0 || - (flags & VBLANK_FLAG_NO_IRQ) != 0 ) { - return 0; - } - - - /* VBLANK_FLAG_SYNC means to wait for at least one vertical blank. If - * that flag is not set, do a fake wait for zero vertical blanking - * periods so that we can get the current MSC. - * - * VBLANK_FLAG_INTERVAL and VBLANK_FLAG_THROTTLE mean to wait for at - * least one vertical blank since the last wait. Since do_wait modifies - * vbl_seq, we have to save the original value of vbl_seq for the - * VBLANK_FLAG_INTERVAL / VBLANK_FLAG_THROTTLE calculation later. - */ - - original_seq = *vbl_seq; - - vbl.request.sequence = ((flags & VBLANK_FLAG_SYNC) != 0) ? 1 : 0; - vbl.request.type = DRM_VBLANK_RELATIVE; - - if ( do_wait( & vbl, vbl_seq, priv->driScreenPriv->fd ) != 0 ) { - return -1; - } - - - vbl.request.type = DRM_VBLANK_ABSOLUTE; - - if ( (flags & VBLANK_FLAG_INTERVAL) != 0 ) { - interval = priv->pdraw->swap_interval; - /* this must have been initialized when the drawable was first bound - * to a direct rendering context. */ - assert ( interval != (unsigned)-1 ); - } - else if ( (flags & VBLANK_FLAG_THROTTLE) != 0 ) { - interval = 1; - } - else { - interval = 0; - } - - - /* Wait until the next vertical blank. If the interval is zero, then - * the deadline is one vertical blank after the previous wait. - */ - - vbl.request.sequence = original_seq + interval; - if ( *vbl_seq < vbl.request.sequence ) { - if ( do_wait( & vbl, vbl_seq, priv->driScreenPriv->fd ) != 0 ) { - return -1; - } - } - - deadline = original_seq + ((interval == 0) ? 1 : interval); - *missed_deadline = ( *vbl_seq > deadline ); - - return 0; -} diff --git a/xc/lib/GL/mesa/src/drv/common/vblank.h b/xc/lib/GL/mesa/src/drv/common/vblank.h deleted file mode 100644 index d460d7a84..000000000 --- a/xc/lib/GL/mesa/src/drv/common/vblank.h +++ /dev/null @@ -1,64 +0,0 @@ -/* -*- mode: c; c-basic-offset: 3 -*- */ -/* - * (c) Copyright IBM Corporation 2002 - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * on the rights to use, copy, modify, merge, publish, distribute, sub - * license, and/or sell copies of the Software, and to permit persons to whom - * the Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL - * VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE - * USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Authors: - * Ian Romanick - */ -/* $XFree86:$ */ - -#ifndef DRI_VBLANK_H -#define DRI_VBLANK_H - -#include "context.h" -#include "dri_util.h" -#include "xmlconfig.h" - -#define VBLANK_FLAG_INTERVAL (1U << 0) /* Respect the swap_interval setting - */ -#define VBLANK_FLAG_THROTTLE (1U << 1) /* Wait 1 refresh since last call. - */ -#define VBLANK_FLAG_SYNC (1U << 2) /* Sync to the next refresh. - */ -#define VBLANK_FLAG_NO_IRQ (1U << 7) /* DRM has no IRQ to wait on. - */ - -extern int driGetMSC32( __DRIscreenPrivate * priv, int64_t * count ); -extern int driWaitForMSC32( __DRIdrawablePrivate *priv, - int64_t target_msc, int64_t divisor, int64_t remainder, int64_t * msc ); -extern GLuint driGetDefaultVBlankFlags( const driOptionCache *optionCache ); -extern void driDrawableInitVBlank ( __DRIdrawablePrivate *priv, GLuint flags ); -extern int driWaitForVBlank( const __DRIdrawablePrivate *priv, - GLuint * vbl_seq, GLuint flags, GLboolean * missed_deadline ); - -#undef usleep -#include /* for usleep() */ - -#define DO_USLEEP(nr) \ - do { \ - if (0) fprintf(stderr, "%s: usleep for %u\n", __FUNCTION__, nr ); \ - if (1) usleep( nr ); \ - sched_yield(); \ - } while( 0 ) - -#endif /* DRI_VBLANK_H */ diff --git a/xc/lib/GL/mesa/src/drv/common/xmlconfig.c b/xc/lib/GL/mesa/src/drv/common/xmlconfig.c deleted file mode 100644 index f7758d368..000000000 --- a/xc/lib/GL/mesa/src/drv/common/xmlconfig.c +++ /dev/null @@ -1,858 +0,0 @@ -/* - * XML DRI client-side driver configuration - * Copyright (C) 2003 Felix Kuehling - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * FELIX KUEHLING, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE - * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - */ -/** - * \file xmlconfig.c - * \brief Driver-independent client-side part of the XML configuration - * \author Felix Kuehling - */ - -#include "glheader.h" - -#include -#include -#include -#include -#include -#include -#include "imports.h" -#include "dri_util.h" -#include "xmlconfig.h" - -/* - * OS dependent ways of getting the name of the running program - */ -#if (defined(__unix__) || defined(unix)) && !defined(USG) -#include -#endif - -#undef GET_PROGRAM_NAME - -#if defined(__GNU_LIBRARY__) || defined(__GLIBC__) -# define GET_PROGRAM_NAME() program_invocation_short_name -#elif defined(__FreeBSD__) && (__FreeBSD__ >= 2) -# include -# if (__FreeBSD_version >= 440000) -# include -# define GET_PROGRAM_NAME() getprogname() -# endif -#elif defined(__NetBSD__) && defined(__NetBSD_Version) && (__NetBSD_Version >= 106000100) -# include -# define GET_PROGRAM_NAME() getprogname() -#endif - -#if !defined(GET_PROGRAM_NAME) -# if defined(OpenBSD) || defined(NetBSD) -/* This is a hack. It's said to work on OpenBSD, NetBSD and GNU. It's - * used as a last resort, if there is no documented facility available. */ -static const char *__getProgramName () { - extern const char *__progname; - return progname; -} -# define GET_PROGRAM_NAME() __getProgramName() -# else -# define GET_PROGRAM_NAME() "" -# warning "Per application configuration won't with your OS version work." -# endif -#endif - -/** \brief Find an option in an option cache with the name as key */ -static GLuint findOption (const driOptionCache *cache, const char *name) { - GLuint len = strlen (name); - GLuint size = 1 << cache->tableSize, mask = size - 1; - GLuint hash = 0; - GLuint i, shift; - - /* compute a hash from the variable length name */ - for (i = 0, shift = 0; i < len; ++i, shift = (shift+8) & 31) - hash += (GLuint)name[i] << shift; - hash *= hash; - hash = (hash >> (16-cache->tableSize/2)) & mask; - - /* this is just the starting point of the linear search for the option */ - for (i = 0; i < size; ++i, hash = (hash+1) & mask) { - /* if we hit an empty entry then the option is not defined (yet) */ - if (cache->info[hash].name == 0) - break; - else if (!strcmp (name, cache->info[hash].name)) - break; - } - /* this assertion fails if the hash table is full */ - assert (i < size); - - return hash; -} - -/** \brief Count the real number of options in an option cache */ -static GLuint countOptions (const driOptionCache *cache) { - GLuint size = 1 << cache->tableSize; - GLuint i, count = 0; - for (i = 0; i < size; ++i) - if (cache->info[i].name) - count++; - return count; -} - -/** \brief Like strdup but using MALLOC and with error checking. */ -#define XSTRDUP(dest,source) do { \ - GLuint len = strlen (source); \ - if (!(dest = MALLOC (len+1))) { \ - fprintf (stderr, "%s: %d: out of memory.\n", __FILE__, __LINE__); \ - abort(); \ - } \ - memcpy (dest, source, len+1); \ -} while (0) - -static int compare (const void *a, const void *b) { - return strcmp (*(char *const*)a, *(char *const*)b); -} -/** \brief Binary search in a string array. */ -static GLuint bsearchStr (const XML_Char *name, - const XML_Char *elems[], GLuint count) { - const XML_Char **found; - found = bsearch (&name, elems, count, sizeof (XML_Char *), compare); - if (found) - return found - elems; - else - return count; -} - -/** \brief Parse a value of a given type. */ -static GLboolean parseValue (driOptionValue *v, driOptionType type, - const XML_Char *string) { - const XML_Char *tail; - /* skip leading white-space */ - string += strspn (string, " \f\n\r\t\v"); - switch (type) { - case DRI_BOOL: - if (!strcmp (string, "false")) { - v->_bool = GL_FALSE; - tail = string + 5; - } else if (!strcmp (string, "true")) { - v->_bool = GL_TRUE; - tail = string + 4; - } - else - return GL_FALSE; - break; - case DRI_ENUM: /* enum is just a special integer */ - case DRI_INT: - v->_int = strtol (string, (char **)&tail, 0); - break; - case DRI_FLOAT: - v->_float = strtod (string, (char **)&tail); - break; - } - - if (tail == string) - return GL_FALSE; /* empty string (or containing only white-space) */ - /* skip trailing white space */ - if (*tail) - tail += strspn (tail, " \f\n\r\t\v"); - if (*tail) - return GL_FALSE; /* something left over that is not part of value */ - - return GL_TRUE; -} - -/** \brief Parse a list of ranges of type info->type. */ -static GLboolean parseRanges (driOptionInfo *info, const XML_Char *string) { - XML_Char *cp, *range; - GLuint nRanges, i; - driOptionRange *ranges; - - XSTRDUP (cp, string); - /* pass 1: determine the number of ranges (number of commas + 1) */ - range = cp; - for (nRanges = 1; *range; ++range) - if (*range == ',') - ++nRanges; - - if ((ranges = MALLOC (nRanges*sizeof(driOptionRange))) == NULL) { - fprintf (stderr, "%s: %d: out of memory.\n", __FILE__, __LINE__); - abort(); - } - - /* pass 2: parse all ranges into preallocated array */ - range = cp; - for (i = 0; i < nRanges; ++i) { - XML_Char *end, *sep; - assert (range); - end = strchr (range, ','); - if (end) - *end = '\0'; - sep = strchr (range, ':'); - if (sep) { /* non-empty interval */ - *sep = '\0'; - if (!parseValue (&ranges[i].start, info->type, range) || - !parseValue (&ranges[i].end, info->type, sep+1)) - break; - if (info->type == DRI_INT && - ranges[i].start._int > ranges[i].end._int) - break; - if (info->type == DRI_FLOAT && - ranges[i].start._float > ranges[i].end._float) - break; - } else { /* empty interval */ - if (!parseValue (&ranges[i].start, info->type, range)) - break; - ranges[i].end = ranges[i].start; - } - if (end) - range = end+1; - else - range = NULL; - } - FREE (cp); - if (i < nRanges) { - FREE (ranges); - return GL_FALSE; - } else - assert (range == NULL); - - info->nRanges = nRanges; - info->ranges = ranges; - return GL_TRUE; -} - -/** \brief Check if a value is in one of info->ranges. */ -static GLboolean checkValue (const driOptionValue *v, const driOptionInfo *info) { - GLuint i; - assert (info->type != DRI_BOOL); /* should be caught by the parser */ - if (info->nRanges == 0) - return GL_TRUE; - switch (info->type) { - case DRI_ENUM: /* enum is just a special integer */ - case DRI_INT: - for (i = 0; i < info->nRanges; ++i) - if (v->_int >= info->ranges[i].start._int && - v->_int <= info->ranges[i].end._int) - return GL_TRUE; - break; - case DRI_FLOAT: - for (i = 0; i < info->nRanges; ++i) - if (v->_float >= info->ranges[i].start._float && - v->_float <= info->ranges[i].end._float) - return GL_TRUE; - break; - default: - assert (0); /* should never happen */ - } - return GL_FALSE; -} - -/** \brief Output a warning message. */ -#define XML_WARNING1(msg) do {\ - __driUtilMessage ("Warning in %s line %d, column %d: "msg, data->name, \ - XML_GetCurrentLineNumber(data->parser), \ - XML_GetCurrentColumnNumber(data->parser)); \ -} while (0) -#define XML_WARNING(msg,args...) do { \ - __driUtilMessage ("Warning in %s line %d, column %d: "msg, data->name, \ - XML_GetCurrentLineNumber(data->parser), \ - XML_GetCurrentColumnNumber(data->parser), \ - args); \ -} while (0) -/** \brief Output an error message. */ -#define XML_ERROR1(msg) do { \ - __driUtilMessage ("Error in %s line %d, column %d: "msg, data->name, \ - XML_GetCurrentLineNumber(data->parser), \ - XML_GetCurrentColumnNumber(data->parser)); \ -} while (0) -#define XML_ERROR(msg,args...) do { \ - __driUtilMessage ("Error in %s line %d, column %d: "msg, data->name, \ - XML_GetCurrentLineNumber(data->parser), \ - XML_GetCurrentColumnNumber(data->parser), \ - args); \ -} while (0) -/** \brief Output a fatal error message and abort. */ -#define XML_FATAL1(msg) do { \ - fprintf (stderr, "Fatal error in %s line %d, column %d: "msg"\n", \ - data->name, \ - XML_GetCurrentLineNumber(data->parser), \ - XML_GetCurrentColumnNumber(data->parser)); \ - abort();\ -} while (0) -#define XML_FATAL(msg,args...) do { \ - fprintf (stderr, "Fatal error in %s line %d, column %d: "msg"\n", \ - data->name, \ - XML_GetCurrentLineNumber(data->parser), \ - XML_GetCurrentColumnNumber(data->parser), \ - args); \ - abort();\ -} while (0) - -/** \brief Parser context for __driConfigOptions. */ -struct OptInfoData { - const char *name; - XML_Parser parser; - driOptionCache *cache; - GLboolean inDriInfo; - GLboolean inSection; - GLboolean inDesc; - GLboolean inOption; - GLboolean inEnum; - int curOption; -}; - -/** \brief Elements in __driConfigOptions. */ -enum OptInfoElem { - OI_DESCRIPTION = 0, OI_DRIINFO, OI_ENUM, OI_OPTION, OI_SECTION, OI_COUNT -}; -static const XML_Char *OptInfoElems[] = { - "description", "driinfo", "enum", "option", "section" -}; - -/** \brief Parse attributes of an enum element. - * - * We're not actually interested in the data. Just make sure this is ok - * for external configuration tools. - */ -static void parseEnumAttr (struct OptInfoData *data, const XML_Char **attr) { - GLuint i; - const XML_Char *value = NULL, *text = NULL; - driOptionValue v; - GLuint opt = data->curOption; - for (i = 0; attr[i]; i += 2) { - if (!strcmp (attr[i], "value")) value = attr[i+1]; - else if (!strcmp (attr[i], "text")) text = attr[i+1]; - else XML_FATAL("illegal enum attribute: %s.", attr[i]); - } - if (!value) XML_FATAL1 ("value attribute missing in enum."); - if (!text) XML_FATAL1 ("text attribute missing in enum."); - if (!parseValue (&v, data->cache->info[opt].type, value)) - XML_FATAL ("illegal enum value: %s.", value); - if (!checkValue (&v, &data->cache->info[opt])) - XML_FATAL ("enum value out of valid range: %s.", value); -} - -/** \brief Parse attributes of a description element. - * - * We're not actually interested in the data. Just make sure this is ok - * for external configuration tools. - */ -static void parseDescAttr (struct OptInfoData *data, const XML_Char **attr) { - GLuint i; - const XML_Char *lang = NULL, *text = NULL; - for (i = 0; attr[i]; i += 2) { - if (!strcmp (attr[i], "lang")) lang = attr[i+1]; - else if (!strcmp (attr[i], "text")) text = attr[i+1]; - else XML_FATAL("illegal description attribute: %s.", attr[i]); - } - if (!lang) XML_FATAL1 ("lang attribute missing in description."); - if (!text) XML_FATAL1 ("text attribute missing in description."); -} - -/** \brief Parse attributes of an option element. */ -static void parseOptInfoAttr (struct OptInfoData *data, const XML_Char **attr) { - enum OptAttr {OA_DEFAULT = 0, OA_NAME, OA_TYPE, OA_VALID, OA_COUNT}; - static const XML_Char *optAttr[] = {"default", "name", "type", "valid"}; - const XML_Char *attrVal[OA_COUNT] = {NULL, NULL, NULL, NULL}; - const char *defaultVal; - driOptionCache *cache = data->cache; - GLuint opt, i; - for (i = 0; attr[i]; i += 2) { - GLuint attrName = bsearchStr (attr[i], optAttr, OA_COUNT); - if (attrName >= OA_COUNT) - XML_FATAL ("illegal option attribute: %s", attr[i]); - attrVal[attrName] = attr[i+1]; - } - if (!attrVal[OA_NAME]) XML_FATAL1 ("name attribute missing in option."); - if (!attrVal[OA_TYPE]) XML_FATAL1 ("type attribute missing in option."); - if (!attrVal[OA_DEFAULT]) XML_FATAL1 ("default attribute missing in option."); - - opt = findOption (cache, attrVal[OA_NAME]); - if (cache->info[opt].name) - XML_FATAL ("option %s redefined.", attrVal[OA_NAME]); - data->curOption = opt; - - XSTRDUP (cache->info[opt].name, attrVal[OA_NAME]); - - if (!strcmp (attrVal[OA_TYPE], "bool")) - cache->info[opt].type = DRI_BOOL; - else if (!strcmp (attrVal[OA_TYPE], "enum")) - cache->info[opt].type = DRI_ENUM; - else if (!strcmp (attrVal[OA_TYPE], "int")) - cache->info[opt].type = DRI_INT; - else if (!strcmp (attrVal[OA_TYPE], "float")) - cache->info[opt].type = DRI_FLOAT; - else - XML_FATAL ("illegal type in option: %s.", attrVal[OA_TYPE]); - - defaultVal = getenv (cache->info[opt].name); - if (defaultVal != NULL) { - /* don't use XML_WARNING, we want the user to see this! */ - fprintf (stderr, - "ATTENTION: default value of option %s overridden by environment.\n", - cache->info[opt].name); - } else - defaultVal = attrVal[OA_DEFAULT]; - if (!parseValue (&cache->values[opt], cache->info[opt].type, defaultVal)) - XML_FATAL ("illegal default value: %s.", defaultVal); - - if (attrVal[OA_VALID]) { - if (cache->info[opt].type == DRI_BOOL) - XML_FATAL1 ("boolean option with valid attribute."); - if (!parseRanges (&cache->info[opt], attrVal[OA_VALID])) - XML_FATAL ("illegal valid attribute: %s.", attrVal[OA_VALID]); - if (!checkValue (&cache->values[opt], &cache->info[opt])) - XML_FATAL ("default value out of valid range '%s': %s.", - attrVal[OA_VALID], defaultVal); - } else if (cache->info[opt].type == DRI_ENUM) { - XML_FATAL1 ("valid attribute missing in option (mandatory for enums)."); - } else { - cache->info[opt].nRanges = 0; - cache->info[opt].ranges = NULL; - } -} - -/** \brief Handler for start element events. */ -static void optInfoStartElem (void *userData, const XML_Char *name, - const XML_Char **attr) { - struct OptInfoData *data = (struct OptInfoData *)userData; - enum OptInfoElem elem = bsearchStr (name, OptInfoElems, OI_COUNT); - switch (elem) { - case OI_DRIINFO: - if (data->inDriInfo) - XML_FATAL1 ("nested elements."); - if (attr[0]) - XML_FATAL1 ("attributes specified on element."); - data->inDriInfo = GL_TRUE; - break; - case OI_SECTION: - if (!data->inDriInfo) - XML_FATAL1 ("
must be inside ."); - if (data->inSection) - XML_FATAL1 ("nested
elements."); - if (attr[0]) - XML_FATAL1 ("attributes specified on
element."); - data->inSection = GL_TRUE; - break; - case OI_DESCRIPTION: - if (!data->inSection && !data->inOption) - XML_FATAL1 (" must be inside or inDesc) - XML_FATAL1 ("nested elements."); - data->inDesc = GL_TRUE; - parseDescAttr (data, attr); - break; - case OI_OPTION: - if (!data->inSection) - XML_FATAL1 ("