head 1.38; access; symbols trunk-20040613:1.38 mach64-last-merge:1.37 driinterface-0-0-3-20040303-merge:1.37 driinterface-0-0-3-20040303-premerge:1.37 driinterface-0-0-3-20040303:1.37 driinterface-0-0-3-branch:1.37.0.6 mach64-0-0-7-branch:1.37.0.4 driinterface-0-0-2-branch:1.37.0.2 newmesa-0-0-1-20031209-merge:1.37 trunk-20031209:1.36 newmesa-0-0-1-20031209:1.36.10.1 newmesa-0-0-1-branch:1.36.0.10 driinterface-0-0-1-branch:1.36.0.8 savage-2-0-0-branch:1.36.0.6 savage-2-0-0-fork:1.36 dynamic-0-0-1-branch:1.36.0.4 config-0-0-1-20031005-freeze:1.35 savage-1_0_0-20031002-trunk-premerge:1.35 cle266-0-0-1-branch:1.36.0.2 i865-agp-0-1-20030929:1.35 trunk-20030916:1.36 XFree86-4_3_99_12-merge:1.35 trunk-20030912:1.35 i865-agp-0-1-20030905:1.35 i865-agp-0-1-20030728:1.35 i865-agp-0-1-20030707:1.35 savage-1_0_0-branch:1.35.0.10 newdrm-0-0-1-branch:1.35.0.8 i865-agp-0-1-branch:1.35.0.6 config-0-0-1-branch:1.35.0.4 texmem-0-0-1-20030429-merge:1.35 texmem-0-0-1-20030429-premerge:1.35 texmem-0-0-1-20030407:1.34.24.1 trident-0-0-2-branch:1.35.0.2 mach64-0-0-6-20030330:1.34.42.2 mach64-0-0-6-20030329-freeze:1.34.42.1 texmem-0-0-1-20030328-freeze:1.34 X_4_3_0-20030324-merge:1.1.1.15 X_4_3_0-20020324-preimport:1.34 drm-filp-0-1-branch:1.34.0.44 mesa-4-0-4-20030222:1.34.38.1 bsd-4-0-0-20030221-merge:1.34 bsd-4-0-0-20030220:1.34 bsd-4-0-0-20030220-freeze:1.34 mesa-4-0-4-20030216:1.34.38.1 mach64-0-0-6-branch:1.34.0.42 mesa-4-0-4-20030208:1.34.38.1 texmem-0-0-1-20030204-trunk-merge:1.34 texmem-0-0-1-20030204-trunk-premerge:1.34 mesa-4-0-4-20030203:1.34.38.1 mesa-4-0-4-20030129:1.34.38.1 texmem-0-0-1-20030125-trunk-merge:1.34 texmem-0-0-1-20030123-trunk-premerge:1.34 mesa-4-0-4-20030114:1.34.38.1 agpgart_2_0_branch:1.34.0.40 mesa-4-0-4-20021220:1.34.38.1 mesa-4-0-4-20021216:1.34.38.1 mesa-4-0-4-20021215:1.34.38.1 mesa-4-0-4-20021214:1.34 mesa-4-0-4-branch:1.34.0.38 dmx-1-0-20021129-final:1.34 texmem-0-0-1-20021127-mesa-4-1-merge:1.34 trunk-20021125:1.34 dmx-1-0-20021115-beta:1.34 bsd-4-0-0-branch:1.34.0.36 nv-0-0-1-branch:1.34.0.34 savage-0-0-1-branch:1.34.0.32 stable-1-0-branch:1.34.0.30 r200-stable-1-0-20021028:1.34 dmx-1-0-20021025-alpha:1.34 X_4_2_99_2-20021023-merge:1.34 X_4_2_99_2:1.1.1.14 trunk-20021022:1.34 r200-stable-1-0-branch:1.34.0.28 mesa-4-1-branch:1.34.0.26 texmem-0-0-1:1.34.0.24 trunk-20021002:1.34 dmx-1-0-20020926-final:1.34 dmx-1-0-20020830-beta:1.34 r200-0-2-branch:1.34.0.22 r200-0-1-20020822-merge:1.34 r200-0-1-20020822:1.34 r200-0-1-20020826-freeze:1.34 xv845g-0-1-branch:1.34.0.20 xv845g-0-1-bp:1.34 GEODE-BASE-DRIVER:1.34 geode-0-0-1-branch:1.34.0.18 tdlabs-0-0-1-branch:1.34.0.16 reinit-0-0-1-branch:1.34.0.12 dmx-1-0-20020719-alpha:1.34 r200-0-1-20020715:1.34 r200-0-1-20020714-freeze:1.34 bsd-3-0-0-20020705-merge:1.34 bsd-3-0-0-freeze:1.34 trunk-20020705:1.34 bsd-3-0-0-20020705:1.34 trunk-20020703:1.34 mach64-0-0-5-branch:1.33.0.12 trunk-20020626:1.34 trunk-20020617:1.34 tcl-0-0-20020612-merge:1.34 tcl-0-0-20020612:1.33.2.1 tcl-0-0-20020612-freeze:1.33 r200-0-1-branch:1.34.0.14 dmx-1-0-20020604-phase1:1.34 dmx-1-0-20020603-base:1.34 dmx-1-0-branch:1.34.0.10 dmx-0-1-20020531-final:1.32 mach64-0-0-4-dma-branch:1.33.0.10 dmx-0-1-20020419-beta:1.32 mach64-0-0-4-branch:1.33.0.8 drmcommand-0-0-1-20020409-merge:1.34 drmcommand-0-0-1-20020409:1.34 drmcommand-0-0-1-20020409-freeze:1.34 trunk-20020328:1.34 s3virge-0-0-1-branch:1.34.0.8 drmcommand-0-0-1-branch:1.34.0.6 trident-0-0-1-branch:1.34.0.4 mach64-0-0-3-dma-branch:1.33.0.6 bsd-3-0-0-branch:1.34.0.2 dmx-0-1-20020228-alpha:1.32 mach64-0-0-3-branch:1.33.0.4 trunk-20020221:1.33 tcl-0-0-branch:1.33.0.2 mesa-4-0-20020214-merge:1.33 mesa-4-0-20020214:1.32.6.2 mesa-4-0-20020213:1.32.6.2 mesa-4-0-20020211-freeze:1.32.6.2 X_4_2_0-20020128-merge:1.32 X_4_2_0:1.1.1.13 X_4_2_0-20020127-preimport:1.32 X_4_2_0-20020123-preimport:1.32 dmx-0-1-20020112:1.32 dmx-0-1-20011128-snapshot:1.32 dmx-0-1-20011115:1.32 dmx-0-1-branch:1.32.0.10 mach64-0-0-2-branch:1.32.0.8 mesa-4-0-branch:1.32.0.6 X_4_1_99_1-20010822-merge:1.32 X_4_1_99_1:1.1.1.13 X_4_1_99_1-20010822-preimport:1.32 multihead-1-0-0-20010730:1.32 multihead-1-0-0-20010730-merge:1.32 multihead-1-0-0-20010727-freeze:1.32 X_4_1_0-20010615-merge:1.32 mesa-3-5-20010621-freeze:1.30.2.7 X_4_1_0:1.1.1.13 X_4_1_0-20010614-preimport:1.32 multihead-1-0-0-branch:1.32.0.4 X_4_0_99_3-20010502-merge:1.32 X_4_0_99_3:1.1.1.13 X_4_0_99_3-20010501-preimport:1.32 bsd-2-0-0-branch:1.32.0.2 X_4_0_99_2-20010410-merge:1.32 X_4_0_99_2:1.1.1.13 X_4_0_99_2-20010409-preimport:1.31 ati-pcigart-1-0-0-20010405-merge:1.31 ati-pcigart-1-0-0-20010405:1.31 ati-pcigart-1-0-0-20010405-freeze:1.31 ati-pcigart-1-0-0-branch:1.31.0.2 mesa-3-5-20010323-freeze:1.30.2.1 X_4_0_99_1-20010321-merge:1.31 X_4_0_99_1:1.1.1.12 X_4_0_99_1-20010319-preimport:1.30 full-1-0-0-20010315-head:1.30 sarea-1-0-0-20010314-merge:1.30 sarea-1-0-0-20010314:1.30 full-1-0-0-branch:1.30 sarea-1-0-0-20010307:1.30 sarea-1-0-0-20010307-freeze:1.30 tdfx-3-1-0-20010306-merge:1.30 tdfx-3-1-0-20010306-freeze:1.30 tdfx-3-1-0-20010306:1.30 tdfx-3-1-0-20010305-merge:1.30 tdfx-3-1-0-20010305-freeze2:1.30 tdfx-3-1-0-20010305-freeze:1.30 tdfx-3-1-0-20010301-freeze:1.30 ati-pcigart-0-0-1-branch-02282001-freeze:1.30 ati-5-0-1-20010220-head:1.30 ati-5-0-1-branch:1.30.0.10 sarea-1-0-0-branch:1.30.0.8 mga-1-0-0-20010215-merge:1.30 mga-1-0-0-20010215-freeze:1.28.4.2 tdfx-3-1-0-branch:1.30.0.6 tdfx-3-0-1-branch:1.30 ati-pcigart-0-0-1-branch:1.30.0.4 mesa-3-5-branch:1.30.0.2 tdfx-3-0-0-20010109-merge:1.30 tdfx-3-0-0-20010108:1.25.2.4 ati-5-0-0-20010105-merge:1.30 ati-5-0-0-20010105:1.27.2.2 ati-5-0-0-20000104-freeze:1.27.2.2 tdfx-3-0-0-20010104-freeze:1.25.2.3 ati-5-0-0-20001223-merge:1.27.2.2 ati-5-0-0-20001223-freeze:1.27.2.1 X_4_0_2-20001221-merge:1.29 X_4_0_2:1.1.1.11 mga-1-0-0-branch:1.28.0.4 X_4_0_1h-20001207-merge:1.28 X_4_0_1h-20001205-merge:1.28 X_4_0_1h:1.1.1.10 ati-4-1-1-20001202-merge-trunk:1.28 sse-1-0-1-branch:1.28.0.2 ati-4-1-1-20001202-merge:1.22.2.5 tdfx-3-0-0-20001201:1.25.2.3 ati-4-1-1-20001201-freeze:1.22.2.4 tdfx-3-0-0-20001201-freeze:1.25.2.2 X_4_0_1g-20001130-merge:1.28 X_4_0_1g:1.1.1.10 X_4_0_1f-20001130-merge:1.28 X_4_0_1f:1.1.1.10 ati-4-1-1-20001125-freeze:1.22.2.2 mach64-0-0-1-branch:1.27.0.4 ati-5-0-0-branch:1.27.0.2 X_4_0_1e-20001107-merge:1.26 X_4_0_1e:1.1.1.9 X_4_0_1d-20001107-merge:1.26 X_4_0_1d:1.1.1.9 ppc-1-0-1-branch:1.25.0.10 radeon-1-0-0-20001017:1.24.2.1 full-0-0-2-branch:1.25.0.8 full-0-0-1-branch:1.25.0.6 ati-4-1-1-20001009-freeze:1.22 mga-readpix-0-0-1-branch:1.25.0.4 tdfx-3-0-0-branch:1.25.0.2 X_4_0_1d-pre:1.1.1.8 ati-4-1-1-20000919-stable:1.22 radeon-1-0-0-branch:1.24.0.2 ppc-1-0-0-20000912:1.20.2.1 mga-lock-debug-0-2-0-branch:1.23.0.8 sse-1-0-0-branch:1.23.0.6 mga-lock-debug-0-0-1-branch:1.23.0.4 gamma-2-0-0-branch:1.23.0.2 tdfx-2-1-20000907-merge:1.23 tdfx-2-1-20000906:1.18.2.4 tdfx-2-1-20000905-freeze:1.18.2.3 ppc-1-0-0-2000-09-01-freeze:1.20 m3-0-0-1-branch:1.22.0.6 mach64-0-0-0-branch:1.22.0.4 ati-4-1-1-branch:1.22.0.2 X_4_0_1b-20000816-merge:1.21 X_4_0_1b:1.1.1.6 ati-4-0-2-branch:1.20.0.4 ppc-1-0-0-branch:1.20.0.2 tdfx-2-1-20000711:1.18.2.1 tdfx-2-1-20000711-freeze:1.18.2.1 X_4_0_1:1.1.1.5 tdfx-2-1-branch:1.18.0.2 pre401-20000613-freeze:1.18 bsd-1-0-1-20000613-merge:1.18 bsd-1-0-1-20000613:1.14.2.1 bsd-1-0-1-20000612-freeze:1.14 tdfx-2-0-20000612-merge:1.15 ati-4-1-0-20000613-merge:1.15 ati-4-1-0-20000613:1.15 tdfx-2-0-20000608-merge:1.10.6.2 tdfx-2-0-20000608-freeze:1.10.6.1 ati-4-1-0-branch:1.15.0.2 glxmisc-3-0-0-20000608-merge:1.15 glxmisc-3-0-0-20000607:1.13.2.4 glxmisc-3-0-0-20000606-freeze:1.13.2.3 bsd-1-0-1-branch:1.14.0.2 bsd-1-0-0-20000531-merge:1.14 bsd-1-0-0-20000530-merge:1.10.10.1 bsd-1-0-0-20000530-freeze:1.10 tdfx-2-0-20000222-merge:1.10 tdfx-2-0-20000222-freeze:1.10 ati-4-0-1-20000518-merge:1.14 ati-4-0-1-20000518:1.9.2.4 video-1-0-0-branch:1.9.2.3.0.2 gamma-1-0-0-branch:1.13.0.4 mgadh-0-0-3-branch:1.10.0.12 glxmisc-3-0-0-branch:1.13.0.2 glxmisc-2-0-0-20000503-merge:1.10 bsd-1-0-0-branch:1.10.0.10 glxmisc-2-0-0-20000503:1.10 glxmisc-2-0-0-branch:1.10.0.8 tdfx-2-0-branch:1.10.0.6 tdfx-2-0-trunk:1.10 glxmisc-1-0-0-20000420-merge:1.10 glxmisc-1-0-0-20000420:1.10 ati-4-0-1-beta:1.9.2.1 glxmisc-1-0-0-branch:1.10.0.4 mga-0-0-3-branch:1.10.0.2 mga-0-0-2-20000404-merge:1.10 ati-4-0-1-alpha:1.9.2.1 ati-4-0-1-20000319-base:1.9 ati-4-0-1-branch:1.9.0.2 ati-4-0-0-20000319:1.3.8.1 X_4_0-20000315-merge:1.9 X_4_0:1.1.1.4 freeze-20000226:1.7 dispatch-0-0-3-20000225-merge:1.7 dispatch-0-0-3-20000225:1.6 mga-0-0-1-20000225-merge:1.3.2.1 mga-0-0-2-branch:1.7.0.4 smt-0-0-2-branch:1.7.0.2 smt-0-0-1-20000222-freeze:1.4 X_3_9_18-20000222-merge:1.7 X_3_9_18:1.1.1.3 smt-0-0-1-stage2c:1.4 smt-0-0-1-stage2b:1.4.0.4 dispatch-0-0-3-branch:1.6.0.2 i810-20000214-beta2:1.3.2.1 dispatch-0-0-2-20000212:1.5.2.1 dispatch-0-0-2-branch:1.5.0.2 i810-20000201-beta1:1.3.2.1 dispatch-0-0-1-20000129-merge:1.5 dispatch-0-0-1-20000128:1.3.10.1 smt-0-0-1-20000112-base:1.4 smt-0-0-1-branch:1.4.0.2 dispatch-0-0-1-branch:1.3.0.10 tdfx-1-1:1.3.0.4 X_3_9_17:1.1.1.2 ati-4-0-0-branch:1.3.0.8 mga-0-0-1-branch:1.3.0.2 X_3_9_16:1.1.1.1 XFree:1.1.1; locks; strict; comment @# @; 1.38 date 2004.05.28.18.41.41; author idr; state Exp; branches; next 1.37; 1.37 date 2003.12.09.15.33.35; author alanh; state Exp; branches; next 1.36; 1.36 date 2003.09.16.20.36.33; author anholt; state Exp; branches 1.36.10.1; next 1.35; 1.35 date 2003.03.25.12.54.54; author alanh; state Exp; branches; next 1.34; 1.34 date 2002.02.28.18.22.13; author dawes; state Exp; branches 1.34.24.1 1.34.38.1 1.34.42.1; next 1.33; 1.33 date 2002.02.14.01.59.46; author dawes; state Exp; branches 1.33.2.1 1.33.12.1; next 1.32; 1.32 date 2001.04.09.21.55.47; author dawes; state Exp; branches 1.32.6.1; next 1.31; 1.31 date 2001.03.19.21.38.53; author dawes; state Exp; branches; next 1.30; 1.30 date 2001.01.05.22.57.51; author kem; state Exp; branches 1.30.2.1; next 1.29; 1.29 date 2000.12.21.19.50.55; author dawes; state Exp; branches; next 1.28; 1.28 date 2000.11.30.18.49.46; author dawes; state Exp; branches 1.28.4.1; next 1.27; 1.27 date 2000.11.09.02.55.27; author kem; state Exp; branches 1.27.2.1 1.27.4.1; next 1.26; 1.26 date 2000.11.08.00.06.31; author dawes; state Exp; branches; next 1.25; 1.25 date 2000.09.24.09.33.55; author alanh; state Exp; branches 1.25.2.1; next 1.24; 1.24 date 2000.09.18.08.32.28; author faith; state Exp; branches 1.24.2.1; next 1.23; 1.23 date 2000.09.07.12.40.24; author alanh; state Exp; branches 1.23.2.1; next 1.22; 1.22 date 2000.08.17.23.13.38; author keithw; state Exp; branches 1.22.2.1; next 1.21; 1.21 date 2000.08.16.18.29.05; author dawes; state Exp; branches; next 1.20; 1.20 date 2000.07.12.22.25.05; author alanh; state Exp; branches 1.20.2.1; next 1.19; 1.19 date 2000.07.12.21.36.19; author alanh; state Exp; branches; next 1.18; 1.18 date 2000.06.13.15.30.51; author brianp; state Exp; branches 1.18.2.1; next 1.17; 1.17 date 2000.06.13.14.19.50; author brianp; state Exp; branches; next 1.16; 1.16 date 2000.06.12.21.12.46; author brianp; state Exp; branches; next 1.15; 1.15 date 2000.06.08.14.38.17; author brianp; state Exp; branches; next 1.14; 1.14 date 2000.05.18.06.14.23; author kem; state Exp; branches 1.14.2.1; next 1.13; 1.13 date 2000.05.06.23.52.10; author brianp; state Exp; branches 1.13.2.1; next 1.12; 1.12 date 2000.05.06.17.24.02; author brianp; state Exp; branches; next 1.11; 1.11 date 2000.05.05.14.51.13; author brianp; state Exp; branches; next 1.10; 1.10 date 2000.04.04.22.08.12; author jhartmann; state Exp; branches 1.10.2.1 1.10.6.1 1.10.10.1 1.10.12.1; next 1.9; 1.9 date 2000.03.16.03.37.29; author jhartmann; state Exp; branches 1.9.2.1; next 1.8; 1.8 date 2000.02.28.21.26.00; author brianp; state Exp; branches; next 1.7; 1.7 date 2000.02.22.22.10.27; author kem; state Exp; branches 1.7.4.1; next 1.6; 1.6 date 2000.02.12.23.09.23; author brianp; state Exp; branches; next 1.5; 1.5 date 2000.01.30.00.27.03; author brianp; state Exp; branches 1.5.2.1; next 1.4; 1.4 date 2000.01.07.06.54.54; author faith; state Exp; branches; next 1.3; 1.3 date 99.12.14.02.39.39; author daryll; state Exp; branches 1.3.2.1 1.3.4.1 1.3.8.1 1.3.10.1; next 1.2; 1.2 date 99.12.05.23.10.28; author daryll; state Exp; branches; next 1.1; 1.1 date 99.12.05.01.04.17; author daryll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.12.05.01.04.17; author daryll; state Exp; branches; next 1.1.1.2; 1.1.1.2 date 2000.01.06.12.44.45; author faith; state Exp; branches; next 1.1.1.3; 1.1.1.3 date 2000.02.22.15.39.22; author kem; state Exp; branches; next 1.1.1.4; 1.1.1.4 date 2000.03.15.21.34.22; author jhartmann; state Exp; branches; next 1.1.1.5; 1.1.1.5 date 2000.07.10.20.50.32; author alanh; state Exp; branches; next 1.1.1.6; 1.1.1.6 date 2000.08.16.17.22.19; author dawes; state Exp; branches; next 1.1.1.7; 1.1.1.7 date 2000.09.22.17.15.55; author alanh; state Exp; branches; next 1.1.1.8; 1.1.1.8 date 2000.09.23.20.49.06; author alanh; state Exp; branches; next 1.1.1.9; 1.1.1.9 date 2000.11.07.22.09.54; author dawes; state Exp; branches; next 1.1.1.10; 1.1.1.10 date 2000.11.30.17.30.30; author dawes; state Exp; branches; next 1.1.1.11; 1.1.1.11 date 2000.12.21.19.23.37; author dawes; state Exp; branches; next 1.1.1.12; 1.1.1.12 date 2001.03.19.17.45.19; author dawes; state Exp; branches; next 1.1.1.13; 1.1.1.13 date 2001.04.09.16.27.08; author dawes; state Exp; branches; next 1.1.1.14; 1.1.1.14 date 2002.10.22.12.59.31; author alanh; state Exp; branches; next 1.1.1.15; 1.1.1.15 date 2003.03.25.00.05.46; author alanh; state Exp; branches; next ; 1.3.2.1 date 2000.01.30.20.18.35; author keithw; state Exp; branches; next ; 1.3.4.1 date 2000.01.21.02.02.14; author daryll; state Exp; branches; next ; 1.3.8.1 date 2000.02.09.18.05.07; author kem; state Exp; branches; next ; 1.3.10.1 date 2000.01.28.17.46.28; author brianp; state Exp; branches; next ; 1.5.2.1 date 2000.02.11.20.38.28; author brianp; state Exp; branches; next ; 1.7.4.1 date 2000.02.25.06.18.21; author keithw; state Exp; branches; next 1.7.4.2; 1.7.4.2 date 2000.03.01.20.58.47; author keithw; state Exp; branches; next 1.7.4.3; 1.7.4.3 date 2000.03.22.00.10.36; author jhartmann; state Exp; branches; next ; 1.9.2.1 date 2000.03.21.03.15.03; author kem; state Exp; branches; next 1.9.2.2; 1.9.2.2 date 2000.04.19.04.29.17; author kem; state Exp; branches; next 1.9.2.3; 1.9.2.3 date 2000.05.11.15.08.39; author kem; state Exp; branches; next 1.9.2.4; 1.9.2.4 date 2000.05.18.04.16.26; author kem; state Exp; branches; next ; 1.10.2.1 date 2000.05.19.21.26.27; author jhartmann; state Exp; branches; next ; 1.10.6.1 date 2000.06.08.06.43.07; author daryll; state Exp; branches; next 1.10.6.2; 1.10.6.2 date 2000.06.09.02.29.36; author daryll; state Exp; branches; next ; 1.10.10.1 date 2000.05.30.14.47.44; author dfr; state Exp; branches; next ; 1.10.12.1 date 2000.05.30.07.44.02; author jhartmann; state Exp; branches; next ; 1.13.2.1 date 2000.05.18.21.01.10; author brianp; state Exp; branches; next 1.13.2.2; 1.13.2.2 date 2000.06.06.17.48.14; author brianp; state Exp; branches; next 1.13.2.3; 1.13.2.3 date 2000.06.06.19.10.33; author brianp; state Exp; branches; next 1.13.2.4; 1.13.2.4 date 2000.06.07.16.06.39; author brianp; state Exp; branches; next ; 1.14.2.1 date 2000.06.13.15.33.09; author dfr; state Exp; branches; next ; 1.18.2.1 date 2000.06.27.18.12.03; author daryll; state Exp; branches; next 1.18.2.2; 1.18.2.2 date 2000.08.13.11.40.34; author alanh; state Exp; branches; next 1.18.2.3; 1.18.2.3 date 2000.08.22.14.20.56; author alanh; state Exp; branches; next 1.18.2.4; 1.18.2.4 date 2000.09.06.12.11.21; author alanh; state Exp; branches; next ; 1.20.2.1 date 2000.09.12.19.17.27; author mdaenzer; state Exp; branches; next 1.20.2.2; 1.20.2.2 date 2000.10.02.14.49.30; author mdaenzer; state Exp; branches; next ; 1.22.2.1 date 2000.10.10.04.22.15; author gareth; state Exp; branches; next 1.22.2.2; 1.22.2.2 date 2000.10.27.03.23.47; author gareth; state Exp; branches; next 1.22.2.3; 1.22.2.3 date 2000.11.26.16.19.21; author gareth; state Exp; branches; next 1.22.2.4; 1.22.2.4 date 2000.11.27.04.08.22; author gareth; state Exp; branches; next 1.22.2.5; 1.22.2.5 date 2000.12.01.20.37.55; author gareth; state Exp; branches; next ; 1.23.2.1 date 2001.02.15.16.58.31; author alanh; state Exp; branches; next ; 1.24.2.1 date 2000.10.18.13.02.21; author alanh; state Exp; branches; next ; 1.25.2.1 date 2000.10.30.02.56.02; author gareth; state Exp; branches; next 1.25.2.2; 1.25.2.2 date 2000.11.09.20.27.31; author alanh; state Exp; branches; next 1.25.2.3; 1.25.2.3 date 2000.12.01.14.21.59; author alanh; state Exp; branches; next 1.25.2.4; 1.25.2.4 date 2001.01.08.15.31.01; author nathanh; state Exp; branches; next ; 1.27.2.1 date 2000.12.20.00.25.49; author kem; state Exp; branches; next 1.27.2.2; 1.27.2.2 date 2000.12.23.06.47.13; author gareth; state Exp; branches; next ; 1.27.4.1 date 2000.12.04.06.26.35; author gareth; state Exp; branches; next ; 1.28.4.1 date 2000.12.22.01.43.11; author gareth; state Exp; branches; next 1.28.4.2; 1.28.4.2 date 2001.02.15.04.14.21; author gareth; state Exp; branches; next ; 1.30.2.1 date 2001.01.11.21.03.56; author keithw; state Exp; branches; next 1.30.2.2; 1.30.2.2 date 2001.03.27.20.01.41; author gareth; state Exp; branches; next 1.30.2.3; 1.30.2.3 date 2001.03.28.21.11.42; author gareth; state Exp; branches; next 1.30.2.4; 1.30.2.4 date 2001.03.29.10.24.13; author gareth; state Exp; branches; next 1.30.2.5; 1.30.2.5 date 2001.04.30.21.43.46; author brianp; state Exp; branches; next 1.30.2.6; 1.30.2.6 date 2001.05.01.20.27.47; author brianp; state Exp; branches; next 1.30.2.7; 1.30.2.7 date 2001.05.29.23.04.24; author brianp; state Exp; branches; next ; 1.32.6.1 date 2001.10.29.18.19.28; author keithw; state Exp; branches; next 1.32.6.2; 1.32.6.2 date 2001.10.30.23.24.21; author dawes; state Exp; branches; next ; 1.33.2.1 date 2002.06.12.11.34.21; author keithw; state Exp; branches; next ; 1.33.12.1 date 2002.06.27.22.04.03; author ldelgass; state Exp; branches; next 1.33.12.2; 1.33.12.2 date 2002.07.12.19.03.23; author ldelgass; state Exp; branches; next ; 1.34.24.1 date 2003.04.02.04.28.53; author idr; state Exp; branches; next ; 1.34.38.1 date 2002.12.16.18.29.44; author dawes; state Exp; branches; next ; 1.34.42.1 date 2003.02.11.22.07.05; author ldelgass; state Exp; branches; next 1.34.42.2; 1.34.42.2 date 2003.03.30.04.51.04; author ldelgass; state Exp; branches; next ; 1.36.10.1 date 2003.12.04.11.25.14; author alanh; state Exp; branches; next ; desc @@ 1.38 log @Move the X protocol related DRI files from lib/GL/dri to lib/GL/glx. Soon the files in lib/GL/dri/drm will be removed (and libdrm.a will be built from the "pristine" DRM source in the drm module of DRI CVS) and the while lib/GL/dri tree will be gone. @ text @XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.43 2003/06/30 01:45:10 torrey Exp $ XCOMM XCOMM Imake tokens which are significant to building libGL: XCOMM XCOMM BuildGLXLibrary - if defined, build libs in xc/lib/GL and xc/lib/GLw XCOMM XCOMM BuildXF86DRI - if defined, build libGL with DRI capability XCOMM XCOMM Only zero or one of the following can be defined at once: XCOMM GlxBuiltInGamma - if defined, build gamma_dri.so driver into libGL XCOMM GlxBuiltInTdfx - if defined, build tdfx_dri.so driver into libGL XCOMM GlxBuiltInMga - if defined, build mga_dri.so driver into libGL XCOMM GlxBuiltInI810 - if defined, build i810_dri.so driver into libGL XCOMM GlxBuiltInR128 - if defined, build r128_dri.so driver into libGL XCOMM GlxBuiltInRadeon - if defined, build radeon_dri.so driver into libGL XCOMM GlxBuiltInR200 - if defined, build r200_dri.so driver into libGL XCOMM GlxBuiltInFfb - if defined, build ffb_dri.so driver into libGL XCOMM GlxBuiltInSIS - if defined, build sis_dri.so driver into libGL XCOMM XCOMM GlxUseBuiltInDRIDriver - automatically defined if any of the XCOMM GlxBuiltIn[Gamma,Tdfx,Mga,I810,R128,Radeon,R200,Ffb,SIS] tokens is XCOMM defined XCOMM XCOMM GlxBuiltInXMesa - if defined, build XMesa (Xlib Mesa driver) into libGL XCOMM to enable rendering to displays that lack the GLX extension. XCOMM XCOMM GlxDriverUsesMesa - will be defined if building a DRI driver into XCOMM libGL and it uses Mesa. XCOMM XCOMM GlxUseSGISI - if defined, use the SGI OpenGL Sample Implementation XCOMM to build the GLX server extension (not fully implemented yet). XCOMM XCOMM NormalLibGlx - if defined, build static libGL.a library XCOMM XCOMM SharedLibGlx - if defined, build dynamic libGL.so library XCOMM XCOMM DebugLibGlx - if defined, build libGL with debug info XCOMM XCOMM ProfileLibGlx - if defined, build libGL with profiling info XCOMM XCOMM SharedGlxRev - dynamic library version, currently defined to be "1.2" XCOMM XCOMM GlxSoProf - if defined, build dynamic libGL for profiling with soprof XCOMM XCOMM GlxStubLib - purpose??? XCOMM XCOMM XCOMM Server-side tokens: XCOMM BuildGlxExt XCOMM GlxUseSGISI #include #define IHaveSubdirs #define PassCDebugFlags LIBGLBUILDDIR = GL GLXDIRS = glx /* * Need to build the Mesa + XMesa source in the following cases: * BuildXF86DRI && defined(DriDrivers) * GlxDriverUsesMesa * GlxBuiltInXMesa * BuildOSMesaLib */ #if BuildOSMesaLib || \ (BuildXF86DRI && \ (defined(DriDrivers) || GlxDriverUsesMesa || GlxBuiltInXMesa)) MESADIRS = mesa #endif /* * Only need the OSmesa code in the following case: * BuildOSMesaLib */ #if BuildOSMesaLib OSMESADIRS = mesa/drivers/osmesa #endif /* * Need to build the DRI code in the following cases: * BuildXF86DRI */ #if BuildXF86DRI DRIDIRS = dri/drm #endif /* * Need to build the DRI drivers in the following cases: * BuildXF86DRI && defined(DriDrivers) */ #if BuildXF86DRI && defined(DriDrivers) DRIVERDIRS = mesa/drivers/dri #endif /* * The build order depends on whether the drivers are loaded into libGL or * built-in to libGL. In the former case, libGL needs to be built before * the drivers, and in the latter case, it needs to be built after the driver. */ #if BuildXF86DRI && GlxUseBuiltInDRIDriver SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) #else SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS) #endif MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) @ 1.37 log @merge newmesa branch to the trunk @ text @d90 1 a90 1 DRIDIRS = dri @ 1.36 log @Apple DRI change Obtained from: sourceforge.net CVS @ text @d74 1 a74 1 MESADIRS = mesa/src d82 1 a82 1 OSMESADIRS = mesa/src/OSmesa d98 1 a98 5 DRIVERDIRS = mesa/src/drv #endif #if defined(DarwinArchitecture) && BuildAppleDRI DRIDIRS = apple @ 1.36.10.1 log @First crack at new Imakefiles (moving onto Xserver/GL now to get the build completely working). This branch doesn't build yet!!! @ text @d74 1 a74 1 MESADIRS = mesa d82 1 a82 1 OSMESADIRS = mesa/drivers/osmesa d98 5 a102 1 DRIVERDIRS = mesa/drivers/dri @ 1.35 log @update Imakefiles @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.41 2002/11/22 22:55:57 tsi Exp $ d101 4 @ 1.34 log @GL/mesa build cleanups/fixes. @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.40 2002/02/27 00:51:14 dawes Exp $ d17 1 d22 2 a23 1 XCOMM GlxBuiltIn[Gamma,Tdfx,Mga,I810,R128,Radeon,Ffb,SIS] tokens is defined d71 3 a73 2 #if (BuildXF86DRI && defined(DriDrivers)) || \ GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib d106 1 a106 1 #if GlxUseBuiltInDRIDriver @ 1.34.24.1 log @First part of trunk-to-branch merge. More to follow. @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.41 2002/11/22 22:55:57 tsi Exp $ a16 1 XCOMM GlxBuiltInR200 - if defined, build r200_dri.so driver into libGL d21 1 a21 2 XCOMM GlxBuiltIn[Gamma,Tdfx,Mga,I810,R128,Radeon,R200,Ffb,SIS] tokens is XCOMM defined d69 2 a70 3 #if BuildOSMesaLib || \ (BuildXF86DRI && \ (defined(DriDrivers) || GlxDriverUsesMesa || GlxBuiltInXMesa)) d103 1 a103 1 #if BuildXF86DRI && GlxUseBuiltInDRIDriver @ 1.34.42.1 log @Initial merge from mach64-0-0-5-branch @ text @a14 1 XCOMM GlxBuiltInMach64 - if defined, build mach64_dri.so driver into libGL d21 1 a21 1 XCOMM GlxBuiltIn[Gamma,Tdfx,Mga,I810,Mach64,R128,Radeon,Ffb,SIS] tokens is defined @ 1.34.42.2 log @Merge trunk - 4.3.0, filp @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.41 2002/11/22 22:55:57 tsi Exp $ a17 1 XCOMM GlxBuiltInR200 - if defined, build r200_dri.so driver into libGL d22 1 a22 2 XCOMM GlxBuiltIn[Gamma,Tdfx,Mga,I810,Mach64,R128,Radeon,R200,Ffb,SIS] tokens XCOMM is defined d70 2 a71 3 #if BuildOSMesaLib || \ (BuildXF86DRI && \ (defined(DriDrivers) || GlxDriverUsesMesa || GlxBuiltInXMesa)) d104 1 a104 1 #if BuildXF86DRI && GlxUseBuiltInDRIDriver @ 1.34.38.1 log @Resync with XFree86 trunk. @ text @a16 1 XCOMM GlxBuiltInR200 - if defined, build r200_dri.so driver into libGL d21 1 a21 2 XCOMM GlxBuiltIn[Gamma,Tdfx,Mga,I810,R128,Radeon,R200,Ffb,SIS] tokens is XCOMM defined d69 2 a70 3 #if BuildOSMesaLib || \ (BuildXF86DRI && \ (defined(DriDrivers) || GlxDriverUsesMesa || GlxBuiltInXMesa)) d103 1 a103 1 #if BuildXF86DRI && GlxUseBuiltInDRIDriver @ 1.33 log @First pass of mesa-4-0 branch merge into trunk. @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.37 2001/03/23 20:56:28 dawes Exp $ d62 17 a78 3 #if BuildXF86DRI && !GlxUseSGISI && \ (!GlxBuiltInMesa || !defined(GlxDriverUsesMesa)) MESADIRS = mesa/src mesa/src/X d82 4 d88 7 d98 5 @ 1.33.12.1 log @Merged in DRI trunk from 2002-06-26 (incl. Mesa 4.0.3 and drmCommand). Mach64 driver is converted to the drmCommand interface and the branch now compiles and runs. @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.40 2002/02/27 00:51:14 dawes Exp $ d62 3 a64 17 /* * Need to build the Mesa + XMesa source in the following cases: * BuildXF86DRI && defined(DriDrivers) * GlxDriverUsesMesa * GlxBuiltInXMesa * BuildOSMesaLib */ #if (BuildXF86DRI && defined(DriDrivers)) || \ GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib MESADIRS = mesa/src #endif /* * Only need the OSmesa code in the following case: * BuildOSMesaLib */ #if BuildOSMesaLib a67 4 /* * Need to build the DRI code in the following cases: * BuildXF86DRI */ a69 7 #endif /* * Need to build the DRI drivers in the following cases: * BuildXF86DRI && defined(DriDrivers) */ #if BuildXF86DRI && defined(DriDrivers) a72 5 /* * The build order depends on whether the drivers are loaded into libGL or * built-in to libGL. In the former case, libGL needs to be built before * the drivers, and in the latter case, it needs to be built after the driver. */ @ 1.33.12.2 log @- Subpixel offsets for viewport coordinates -- fixes almost all glean tests. - Add primitive type defines for use in drm (currently mirrors GL prims) - Shared header cleanup - PolygonStipple fallback - Enable point/line size by not changing Mesa default size range. FIXME: Points need to be implemented as quads instead of triangles (for large un-aliased points) - Add GlxBuiltInMach64 build option (still needs fixing) - Quiet compiler warning in primitive functions @ text @a14 1 XCOMM GlxBuiltInMach64 - if defined, build mach64_dri.so driver into libGL d21 1 a21 1 XCOMM GlxBuiltIn[Gamma,Tdfx,Mga,I810,Mach64,R128,Radeon,Ffb,SIS] tokens is defined @ 1.33.2.1 log @merge checkpoint @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.40 2002/02/27 00:51:14 dawes Exp $ d62 3 a64 17 /* * Need to build the Mesa + XMesa source in the following cases: * BuildXF86DRI && defined(DriDrivers) * GlxDriverUsesMesa * GlxBuiltInXMesa * BuildOSMesaLib */ #if (BuildXF86DRI && defined(DriDrivers)) || \ GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib MESADIRS = mesa/src #endif /* * Only need the OSmesa code in the following case: * BuildOSMesaLib */ #if BuildOSMesaLib a67 4 /* * Need to build the DRI code in the following cases: * BuildXF86DRI */ a69 7 #endif /* * Need to build the DRI drivers in the following cases: * BuildXF86DRI && defined(DriDrivers) */ #if BuildXF86DRI && defined(DriDrivers) a72 5 /* * The build order depends on whether the drivers are loaded into libGL or * built-in to libGL. In the former case, libGL needs to be built before * the drivers, and in the latter case, it needs to be built after the driver. */ @ 1.32 log @First pass of XFree86 4.0.99.2 merge. @ text @d3 50 d64 1 a64 1 MESADIRS = mesa/src d69 1 a69 2 DRIDIRS = dri mesa/dri MESADIRS = mesa/src @ 1.32.6.1 log @more makefile fixes @ text @a2 50 XCOMM XCOMM Imake tokens which are significant to building libGL: XCOMM XCOMM BuildGLXLibrary - if defined, build libs in xc/lib/GL and xc/lib/GLw XCOMM XCOMM BuildXF86DRI - if defined, build libGL with DRI capability XCOMM XCOMM Only zero or one of the following can be defined at once: XCOMM GlxBuiltInGamma - if defined, build gamma_dri.so driver into libGL XCOMM GlxBuiltInTdfx - if defined, build tdfx_dri.so driver into libGL XCOMM GlxBuiltInMga - if defined, build mga_dri.so driver into libGL XCOMM GlxBuiltInI810 - if defined, build i810_dri.so driver into libGL XCOMM GlxBuiltInR128 - if defined, build r128_dri.so driver into libGL XCOMM GlxBuiltInRadeon - if defined, build radeon_dri.so driver into libGL XCOMM GlxBuiltInFfb - if defined, build ffb_dri.so driver into libGL XCOMM GlxBuiltInSIS - if defined, build sis_dri.so driver into libGL XCOMM XCOMM GlxUseBuiltInDRIDriver - automatically defined if any of the XCOMM GlxBuiltIn[Gamma,Tdfx,Mga,I810,R128,Radeon,Ffb,SIS] tokens is defined XCOMM XCOMM GlxBuiltInXMesa - if defined, build XMesa (Xlib Mesa driver) into libGL XCOMM to enable rendering to displays that lack the GLX extension. XCOMM XCOMM GlxDriverUsesMesa - will be defined if building a DRI driver into XCOMM libGL and it uses Mesa. XCOMM XCOMM GlxUseSGISI - if defined, use the SGI OpenGL Sample Implementation XCOMM to build the GLX server extension (not fully implemented yet). XCOMM XCOMM NormalLibGlx - if defined, build static libGL.a library XCOMM XCOMM SharedLibGlx - if defined, build dynamic libGL.so library XCOMM XCOMM DebugLibGlx - if defined, build libGL with debug info XCOMM XCOMM ProfileLibGlx - if defined, build libGL with profiling info XCOMM XCOMM SharedGlxRev - dynamic library version, currently defined to be "1.2" XCOMM XCOMM GlxSoProf - if defined, build dynamic libGL for profiling with soprof XCOMM XCOMM GlxStubLib - purpose??? XCOMM XCOMM XCOMM Server-side tokens: XCOMM BuildGlxExt XCOMM GlxUseSGISI d14 1 a14 1 MESADIRS = mesa/include/GL mesa/src mesa/src/X d19 2 a20 1 DRIDIRS = dri @ 1.32.6.2 log @Missing part of the removal of mesa/include/GL. @ text @d64 1 a64 1 MESADIRS = mesa/src mesa/src/X @ 1.31 log @Initial XFree86 4.0.99.1 merge. @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.35 2001/01/08 01:07:16 martin Exp $ d9 2 a10 5 #define DoNormalLib NormalLibGlx #define DoSharedLib SharedLibGlx #define DoExtraLib SharedLibGlx #define DoDebugLib DebugLibGlx #define DoProfileLib ProfileLibGlx d12 4 a15 16 LIBNAME = GL SOREV = $(SOGLREV) #ifdef SharedGLReqs REQUIREDLIBS = SharedGLReqs #endif XCOMM XCOMM Not related to ProfileLibGlx - I dont know how that works. KW. XCOMM #ifdef GlxSoProf PROFSRC = lowpc.c highpc.c PROFOBJ = lowpc.o highpc.o SubdirLibraryRule($(PROFOBJ)) NormalLintTarget($(PROFSRC)) a17 10 #if BuildXF86DRI && defined(i386Architecture) GLAPI_OBJ = glx/glapi_x86.o #endif GLXOBJS = glx/?*.o GLXUOBJS = glx/unshared/?*.o $(GLAPI_OBJ) GLXDOBJS = glx/debugger/?*.o $(GLAPI_OBJ) GLXPOBJS = glx/profiled/?*.o $(GLAPI_OBJ) GLXDONES = glx/DONE d19 3 a21 228 DRIOBJS = dri/XF86dri.o dri/dri_glx.o DRIUOBJS = dri/unshared/XF86dri.o dri/unshared/dri_glx.o DRIDOBJS = dri/debugger/XF86dri.o dri/debugger/dri_glx.o DRIPOBJS = dri/profiled/XF86dri.o dri/profiled/dri_glx.o DRIDONES = dri/DONE DRMOBJS = dri/drm/?*.o DRMUOBJS = dri/drm/unshared/?*.o DRMDOBJS = dri/drm/debugger/?*.o DRMPOBJS = dri/drm/profiled/?*.o DRMDONES = dri/drm/DONE MESAOBJS = mesa/src/?*.o #ifdef i386Architecture ASM_BASE_OBJS = mesa/src/X86/common_x86_asm.o \ mesa/src/X86/x86_cliptest.o \ mesa/src/X86/x86_vertex.o \ mesa/src/X86/x86_xform_masked2.o \ mesa/src/X86/x86_xform_masked3.o \ mesa/src/X86/x86_xform_masked4.o \ mesa/src/X86/x86_xform_raw2.o \ mesa/src/X86/x86_xform_raw3.o \ mesa/src/X86/x86_xform_raw4.o #if MesaUseMMX MMX_OBJS = mesa/src/X86/mmx_blend.o #endif #if MesaUse3DNow 3DNOW_OBJS = mesa/src/X86/3dnow_norm_raw.o \ mesa/src/X86/3dnow_vertex.o \ mesa/src/X86/3dnow_xform_masked1.o \ mesa/src/X86/3dnow_xform_masked2.o \ mesa/src/X86/3dnow_xform_masked3.o \ mesa/src/X86/3dnow_xform_masked4.o \ mesa/src/X86/3dnow_xform_raw1.o \ mesa/src/X86/3dnow_xform_raw2.o \ mesa/src/X86/3dnow_xform_raw3.o \ mesa/src/X86/3dnow_xform_raw4.o #endif #if MesaUseKatmai KATMAI_OBJS = mesa/src/X86/katmai_norm_raw.o \ mesa/src/X86/katmai_vertex.o \ mesa/src/X86/katmai_xform_masked1.o \ mesa/src/X86/katmai_xform_masked2.o \ mesa/src/X86/katmai_xform_masked3.o \ mesa/src/X86/katmai_xform_masked4.o \ mesa/src/X86/katmai_xform_raw1.o \ mesa/src/X86/katmai_xform_raw2.o \ mesa/src/X86/katmai_xform_raw3.o \ mesa/src/X86/katmai_xform_raw4.o #endif ASM_OBJS = $(ASM_BASE_OBJS) $(MMX_OBJS) $(3DNOW_OBJS) $(KATMAI_OBJS) MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o #endif MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o $(ASM_OBJS) MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o $(ASM_OBJS) MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o $(ASM_OBJS) MESADONES = mesa/src/DONE mesa/src/X86/DONE DRIMESAOBJS = mesa/dri/?*.o DRIMESAUOBJS = mesa/dri/unshared/?*.o DRIMESADOBJS = mesa/dri/debugger/?*.o DRIMESAPOBJS = mesa/dri/profiled/?*.o DRIMESADONES = mesa/dri/DONE COMMONOBJS = mesa/src/drv/common/?*.o COMMONUOBJS = mesa/src/drv/common/unshared/?*.o COMMONDOBJS = mesa/src/drv/common/debugger/?*.o COMMONPOBJS = mesa/src/drv/common/profiled/?*.o COMMONDONES = mesa/src/drv/common/DONE #if GlxUseSGISI XCOMM nothing #elif GlxBuiltInGamma GAMMAOBJS = mesa/src/drv/gamma/?*.o GAMMAUOBJS = mesa/src/drv/gamma/unshared/?*.o GAMMADOBJS = mesa/src/drv/gamma/debugger/?*.o GAMMAPOBJS = mesa/src/drv/gamma/profiled/?*.o GAMMADONES = mesa/src/drv/gamma/DONE DRVOBJS = $(GAMMAOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(GAMMAUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(GAMMADOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(GAMMAPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(GAMMADONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) DRVSUBDIRS = mesa/src/drv/gamma GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) #elif GlxBuiltInTdfx TDFXOBJS = mesa/src/drv/tdfx/?*.o TDFXUOBJS = mesa/src/drv/tdfx/unshared/?*.o TDFXDOBJS = mesa/src/drv/tdfx/debugger/?*.o TDFXPOBJS = mesa/src/drv/tdfx/profiled/?*.o TDFXDONES = mesa/src/drv/tdfx/DONE DRVOBJS = $(TDFXOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(TDFXUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(TDFXDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(TDFXPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(TDFXDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) REQUIREDLIBS += -lglide3 -ldl DRVSUBDIRS = mesa/src/drv/tdfx GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) #elif GlxBuiltInI810 I810OBJS = mesa/src/drv/i810/?*.o I810UOBJS = mesa/src/drv/i810/unshared/?*.o I810DOBJS = mesa/src/drv/i810/debugger/?*.o I810POBJS = mesa/src/drv/i810/profiled/?*.o I810DONES = mesa/src/drv/i810/DONE DRVOBJS = $(I810OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(I810UOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(I810DOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(I810POBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(I810DONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) DRVSUBDIRS = mesa/src/drv/i810 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) #elif GlxBuiltInMga MGAOBJS = mesa/src/drv/mga/?*.o MGAUOBJS = mesa/src/drv/mga/unshared/?*.o MGADOBJS = mesa/src/drv/mga/debugger/?*.o MGAPOBJS = mesa/src/drv/mga/profiled/?*.o MGADONES = mesa/src/drv/mga/DONE DRVOBJS = $(MGAOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(MGAUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(MGADOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(MGAPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(MGADONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) DRVSUBDIRS = mesa/src/drv/mga GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) #elif GlxBuiltInR128 R128OBJS = mesa/src/drv/r128/?*.o R128UOBJS = mesa/src/drv/r128/unshared/?*.o R128DOBJS = mesa/src/drv/r128/debugger/?*.o R128POBJS = mesa/src/drv/r128/profiled/?*.o R128DONES = mesa/src/drv/r128/DONE DRVOBJS = $(R128OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(R128UOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(R128DOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(R128POBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(R128DONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) DRVSUBDIRS = mesa/src/drv/common mesa/src/drv/r128 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) #elif GlxBuiltInRadeon RADEONOBJS = mesa/src/drv/radeon/?*.o RADEONUOBJS = mesa/src/drv/radeon/unshared/?*.o RADEONDOBJS = mesa/src/drv/radeon/debugger/?*.o RADEONPOBJS = mesa/src/drv/radeon/profiled/?*.o RADEONDONES = mesa/src/drv/radeon/DONE DRVOBJS = $(RADEONOBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(RADEONUOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(RADEONDOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(RADEONPOBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(RADEONDONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) DRVSUBDIRS = mesa/src/drv/common mesa/src/drv/radeon GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) #elif GlxBuiltInFfb FFBOBJS = mesa/src/drv/ffb/?*.o FFBUOBJS = mesa/src/drv/ffb/unshared/?*.o FFBDOBJS = mesa/src/drv/ffb/debugger/?*.o FFBPOBJS = mesa/src/drv/ffb/profiled/?*.o FFBDONES = mesa/src/drv/ffb/DONE DRVOBJS = $(FFBOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(FFBUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(FFBDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(FFBPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(FFBDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) DRVSUBDIRS = mesa/src/drv/ffb GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) #elif GlxBuiltInSIS SISOBJS = mesa/src/drv/sis/?*.o SISUOBJS = mesa/src/drv/sis/unshared/?*.o SISDOBJS = mesa/src/drv/sis/debugger/?*.o SISPOBJS = mesa/src/drv/sis/profiled/?*.o SISDONES = mesa/src/drv/sis/DONE DRVOBJS = $(SISOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(SISUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(SISDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(SISPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(SISDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) DRVSUBDIRS = mesa/src/drv/sis GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) #elif GlxBuiltInMesa #ifndef GlxDriverUsesMesa DRVOBJS = mesa/src/?*.o DRVUOBJS = mesa/src/unshared/?*.o DRVDOBJS = mesa/src/debugger/?*.o DRVPOBJS = mesa/src/profiled/?*.o DRVDONES = mesa/src/DONE GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d24 2 d27 1 a27 4 XCOMM No built-in drivers. This is the usual case. GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d30 1 a30 4 #else XCOMM BuildXF86DRI was not defined. Just build an indirect-only libGL. GLXSUBDIRS = glx d32 1 a32 27 #endif #if !GlxUseSGISI && (!GlxBuiltInMesa || !defined(GlxDriverUsesMesa)) MakeSubdirs($(GLXSUBDIRS)) #endif #ifdef OS2Architecture OBJS = $(LIBNAME).a #else OBJS = $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) #endif #if HasSharedLibraries UOBJS = $(GLXUOBJS) $(DRIUOBJS) $(DRVUOBJS) #else UOBJS = $(OBJS) #endif DOBJS = $(GLXDOBJS) $(DRIDOBJS) $(DRVDOBJS) POBJS = $(GLXPOBJS) $(DRIPOBJS) $(DRVPOBJS) DONES = $(GLXDONES) $(DRIDONES) $(DRVDONES) #if LocalThreads THREADOBJS = $(THREADS_LIBS) #endif a33 70 #if HasParallelMake MakeMutex($(GLXSUBDIRS) $(DONES)) #endif #if HasGnuMake || HasBsdMake $(DONES): $(GLXSUBDIRS) #endif #include #undef _LinkBuildLibrary #define _LinkBuildLibrary(lib) LinkBuildLibrary(lib) #if NormalLibGlx NormalDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(UOBJS)) InstallLibrary($(LIBNAME),$(USRLIBDIR)) #endif #if SharedLibGlx SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(GLXSUBDIRS) $(DONES),$(OBJS) $(THREADOBJS),.,.) InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR)) #if LinkGLToUsrLib && AlternateUsrLibDir install:: MakeDir($(DESTDIR)$(SYSTEMUSRLIBDIR)) $(RM) $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so $(LN) $(SHLIBDIR)/lib$(LIBNAME).so $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so || true $(RM) $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 $(LN) $(SHLIBDIR)/lib$(LIBNAME).so.1 $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 || true #endif #endif #if DebugLibGlx DebuggedDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(DOBJS)) InstallLibrary($(LIBNAME)_d,$(USRLIBDIR)) #endif #if ProfileLibGlx ProfiledDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(POBJS)) InstallLibrary($(LIBNAME)_p,$(USRLIBDIR)) #endif XCOMM libOSmesa needs libGL, so build it now #if BuildXF86DRI && !GlxUseSGISI && (!GlxBuiltInMesa || !defined(GlxDriverUsesMesa)) OSMESASUBDIRS = mesa/src/OSmesa MakeSubdirs($(OSMESASUBDIRS)) #endif XCOMM libGL has now been made, continue with building the drivers. #if BuildXF86DRI && \ !GlxUseSGISI && \ !GlxBuiltInGamma && \ !GlxBuiltInTdfx && \ !GlxBuiltInI810 && \ !GlxBuiltInMga && \ !GlxBuiltInR128 && \ !GlxBuiltInRadeon && \ !GlxBuiltInFfb && \ !GlxBuiltInSIS && \ !GlxBuiltInMesa DRIVERSUBDIRS = mesa/src/drv MakeSubdirs($(DRIVERSUBDIRS)) #endif SUBDIRS = $(GLXSUBDIRS) $(OSMESASUBDIRS) $(DRIVERSUBDIRS) DependSubdirs($(SUBDIRS)) @ 1.30 log @Merged ati-5-0-0 @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.34 2000/12/12 23:24:26 dawes Exp $ @ 1.30.2.1 log @Checkpoint commit of mesa-3.5 port. Do not use. @ text @d56 1 a56 7 MESAOBJS = mesa/src/?*.o \ mesa/src/tnl/?*.o \ mesa/src/swrast/?*.o \ mesa/src/swrast_setup/?*.o \ mesa/src/array_cache/?*.o \ mesa/src/math/?*.o @ 1.30.2.2 log @Initial merge of trunk onto branch. @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.35 2001/01/08 01:07:16 martin Exp $ @ 1.30.2.3 log @Last time I checked, there was no concept of a 1D vertex coordinate in OpenGL... @ text @d61 1 a61 1 mesa/src/math/?*.o d81 1 d85 1 d93 1 d97 1 d303 1 a303 1 OBJS = $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) @ 1.30.2.4 log @Support latest Mesa asm code changes. @ text @d67 6 a72 3 mesa/src/X86/x86_xform2.o \ mesa/src/X86/x86_xform3.o \ mesa/src/X86/x86_xform4.o d79 1 a79 1 3DNOW_OBJS = mesa/src/X86/3dnow_normal.o \ d81 6 a86 4 mesa/src/X86/3dnow_xform1.o \ mesa/src/X86/3dnow_xform2.o \ mesa/src/X86/3dnow_xform3.o \ mesa/src/X86/3dnow_xform4.o d88 9 a96 8 #if MesaUseSSE SSE_OBJS = mesa/src/X86/sse_normal.o \ mesa/src/X86/sse_vertex.o \ mesa/src/X86/sse_xform1.o \ mesa/src/X86/sse_xform2.o \ mesa/src/X86/sse_xform3.o \ mesa/src/X86/sse_xform4.o d99 1 a99 1 ASM_OBJS = $(ASM_BASE_OBJS) $(MMX_OBJS) $(3DNOW_OBJS) $(SSE_OBJS) @ 1.30.2.5 log @new Makefile system from trunk @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.37 2001/03/23 20:56:28 dawes Exp $ d9 5 a13 2 LIBGLBUILDDIR = GL GLXDIRS = glx d15 16 a30 4 #if BuildXF86DRI && !GlxUseSGISI && \ (!GlxBuiltInMesa || !defined(GlxDriverUsesMesa)) MESADIRS = mesa/src OSMESADIRS = mesa/src/OSmesa d33 10 d44 231 a274 3 DRIDIRS = dri mesa/dri MESADIRS = mesa/src DRIVERDIRS = mesa/src/drv a276 2 #if GlxUseBuiltInDRIDriver SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) d278 61 a338 1 SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS) d340 18 d359 19 a377 1 MakeSubdirs($(SUBDIRS)) a379 1 @ 1.30.2.6 log @Removed mesa/dri/dri_mesa.[ch], replaced by dri/dri_util.[ch]. Last traces of Mesa dependencies and names in dri_util.[ch] removed. @ text @d19 1 a19 1 DRIDIRS = dri @ 1.30.2.7 log @If GlxBuiltInXMesa is defined, build the XMesa renderer into libGL to allow rendering to display servers that lack the GLX extension. More testing needed. @ text @a2 50 XCOMM XCOMM Imake tokens which are significant to building libGL: XCOMM XCOMM BuildGLXLibrary - if defined, build libs in xc/lib/GL and xc/lib/GLw XCOMM XCOMM BuildXF86DRI - if defined, build libGL with DRI capability XCOMM XCOMM Only zero or one of the following can be defined at once: XCOMM GlxBuiltInGamma - if defined, build gamma_dri.so driver into libGL XCOMM GlxBuiltInTdfx - if defined, build tdfx_dri.so driver into libGL XCOMM GlxBuiltInMga - if defined, build mga_dri.so driver into libGL XCOMM GlxBuiltInI810 - if defined, build i810_dri.so driver into libGL XCOMM GlxBuiltInR128 - if defined, build r128_dri.so driver into libGL XCOMM GlxBuiltInRadeon - if defined, build radeon_dri.so driver into libGL XCOMM GlxBuiltInFfb - if defined, build ffb_dri.so driver into libGL XCOMM GlxBuiltInSIS - if defined, build sis_dri.so driver into libGL XCOMM XCOMM GlxUseBuiltInDRIDriver - automatically defined if any of the XCOMM GlxBuiltIn[Gamma,Tdfx,Mga,I810,R128,Radeon,Ffb,SIS] tokens is defined XCOMM XCOMM GlxBuiltInXMesa - if defined, build XMesa (Xlib Mesa driver) into libGL XCOMM to enable rendering to displays that lack the GLX extension. XCOMM XCOMM GlxDriverUsesMesa - will be defined if building a DRI driver into XCOMM libGL and it uses Mesa. XCOMM XCOMM GlxUseSGISI - if defined, use the SGI OpenGL Sample Implementation XCOMM to build the GLX server extension (not fully implemented yet). XCOMM XCOMM NormalLibGlx - if defined, build static libGL.a library XCOMM XCOMM SharedLibGlx - if defined, build dynamic libGL.so library XCOMM XCOMM DebugLibGlx - if defined, build libGL with debug info XCOMM XCOMM ProfileLibGlx - if defined, build libGL with profiling info XCOMM XCOMM SharedGlxRev - dynamic library version, currently defined to be "1.2" XCOMM XCOMM GlxSoProf - if defined, build dynamic libGL for profiling with soprof XCOMM XCOMM GlxStubLib - purpose??? XCOMM XCOMM XCOMM Server-side tokens: XCOMM BuildGlxExt XCOMM GlxUseSGISI d12 3 a14 2 #if BuildXF86DRI || GlxDriverUsesMesa || GlxBuiltInXMesa MESADIRS = mesa/include/GL mesa/src mesa/src/X d20 1 @ 1.29 log @XFree86 4.0.2 merge @ text @d132 1 a132 1 DRVOBJS = $(GAMMAOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d138 2 a139 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/gamma d149 1 a149 1 DRVOBJS = $(TDFXOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d157 2 a158 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/tdfx d168 1 a168 1 DRVOBJS = $(I810OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d174 2 a175 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/i810 d185 1 a185 1 DRVOBJS = $(MGAOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d191 2 a192 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/mga d202 22 a223 5 DRVOBJS = $(R128OBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(R128UOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(R128DOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(R128POBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(R128DONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) d225 2 a226 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/r128 d242 2 a243 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/ffb d253 1 a253 1 DRVOBJS = $(SISOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d259 2 a260 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/sis d370 1 @ 1.28 log @XFree86 4.0.1f merge @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.33 2000/11/13 23:31:22 dawes Exp $ d58 1 a58 1 ASM_OBJS = mesa/src/X86/common_x86_asm.o \ d66 8 a73 4 mesa/src/X86/x86_xform_raw4.o \ mesa/src/X86/mmx_blend.o #ifdef MesaUse3DNow ASM_OBJS += mesa/src/X86/3dnow_norm_raw.o \ d84 2 a85 2 #ifdef MesaUseKatmai ASM_OBJS += mesa/src/X86/katmai_norm_raw.o \ d96 2 @ 1.28.4.1 log @Merge in XFree86 4.0.2 updates from trunk. @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.34 2000/12/12 23:24:26 dawes Exp $ d58 1 a58 1 ASM_BASE_OBJS = mesa/src/X86/common_x86_asm.o \ d66 4 a69 8 mesa/src/X86/x86_xform_raw4.o #if MesaUseMMX MMX_OBJS = mesa/src/X86/mmx_blend.o #endif #if MesaUse3DNow 3DNOW_OBJS = mesa/src/X86/3dnow_norm_raw.o \ d80 2 a81 2 #if MesaUseKatmai KATMAI_OBJS = mesa/src/X86/katmai_norm_raw.o \ a91 2 ASM_OBJS = $(ASM_BASE_OBJS) $(MMX_OBJS) $(3DNOW_OBJS) $(KATMAI_OBJS) @ 1.28.4.2 log @Full merge from trunk. @ text @d132 1 a132 1 DRVOBJS = $(GAMMAOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d138 1 a138 2 DRVSUBDIRS = mesa/src/drv/gamma GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d148 1 a148 1 DRVOBJS = $(TDFXOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d156 1 a156 2 DRVSUBDIRS = mesa/src/drv/tdfx GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d166 1 a166 1 DRVOBJS = $(I810OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d172 1 a172 2 DRVSUBDIRS = mesa/src/drv/i810 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d182 1 a182 1 DRVOBJS = $(MGAOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d188 1 a188 2 DRVSUBDIRS = mesa/src/drv/mga GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d198 5 a202 22 DRVOBJS = $(R128OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(R128UOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(R128DOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(R128POBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(R128DONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) DRVSUBDIRS = mesa/src/drv/common mesa/src/drv/r128 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) #elif GlxBuiltInRadeon RADEONOBJS = mesa/src/drv/radeon/?*.o RADEONUOBJS = mesa/src/drv/radeon/unshared/?*.o RADEONDOBJS = mesa/src/drv/radeon/debugger/?*.o RADEONPOBJS = mesa/src/drv/radeon/profiled/?*.o RADEONDONES = mesa/src/drv/radeon/DONE DRVOBJS = $(RADEONOBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(RADEONUOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(RADEONDOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(RADEONPOBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(RADEONDONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) d204 1 a204 2 DRVSUBDIRS = mesa/src/drv/common mesa/src/drv/radeon GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d220 1 a220 2 DRVSUBDIRS = mesa/src/drv/ffb GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d230 1 a230 1 DRVOBJS = $(SISOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d236 1 a236 2 DRVSUBDIRS = mesa/src/drv/sis GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) a345 1 !GlxBuiltInRadeon && \ @ 1.27 log @Sync with latest Mesa 3.4 CVS sources @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.32 2000/09/24 13:50:59 alanh Exp $ @ 1.27.2.1 log @Add basic Radeon 3D driver (not fully functional yet) @ text @d126 1 a126 1 DRVOBJS = $(GAMMAOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d132 1 a132 2 DRVSUBDIRS = mesa/src/drv/gamma GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d142 1 a142 1 DRVOBJS = $(TDFXOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d150 1 a150 2 DRVSUBDIRS = mesa/src/drv/tdfx GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d160 1 a160 1 DRVOBJS = $(I810OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d166 1 a166 2 DRVSUBDIRS = mesa/src/drv/i810 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d176 1 a176 1 DRVOBJS = $(MGAOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d182 1 a182 2 DRVSUBDIRS = mesa/src/drv/mga GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d192 5 a196 22 DRVOBJS = $(R128OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(R128UOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(R128DOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(R128POBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(R128DONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) DRVSUBDIRS = mesa/src/drv/common mesa/src/drv/r128 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) #elif GlxBuiltInRadeon RADEONOBJS = mesa/src/drv/radeon/?*.o RADEONUOBJS = mesa/src/drv/radeon/unshared/?*.o RADEONDOBJS = mesa/src/drv/radeon/debugger/?*.o RADEONPOBJS = mesa/src/drv/radeon/profiled/?*.o RADEONDONES = mesa/src/drv/radeon/DONE DRVOBJS = $(RADEONOBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(RADEONUOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(RADEONDOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(RADEONPOBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(RADEONDONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) d198 1 a198 2 DRVSUBDIRS = mesa/src/drv/common mesa/src/drv/radeon GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d214 1 a214 2 DRVSUBDIRS = mesa/src/drv/ffb GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d224 1 a224 1 DRVOBJS = $(SISOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d230 1 a230 2 DRVSUBDIRS = mesa/src/drv/sis GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) a339 1 !GlxBuiltInRadeon && \ @ 1.27.2.2 log @Merge in XFree86 4.0.2 updates from trunk. @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.34 2000/12/12 23:24:26 dawes Exp $ d58 1 a58 1 ASM_BASE_OBJS = mesa/src/X86/common_x86_asm.o \ d66 4 a69 8 mesa/src/X86/x86_xform_raw4.o #if MesaUseMMX MMX_OBJS = mesa/src/X86/mmx_blend.o #endif #if MesaUse3DNow 3DNOW_OBJS = mesa/src/X86/3dnow_norm_raw.o \ d80 2 a81 2 #if MesaUseKatmai KATMAI_OBJS = mesa/src/X86/katmai_norm_raw.o \ a91 2 ASM_OBJS = $(ASM_BASE_OBJS) $(MMX_OBJS) $(3DNOW_OBJS) $(KATMAI_OBJS) @ 1.27.4.1 log @Initial, software-fallback only Rage Pro driver. Suggest not running at all, or at least disabling 2D acceleration (Option "accel" "0") for now. Todo: Refactor DMA setup, buffer code to enable vertex DMA buffers. First cut will be PIO only, add full async DMA and AGP later. demos> ./glinfo GL_VERSION: 1.2 Mesa 3.4 GL_EXTENSIONS: GL_ARB_multitexture GL_ARB_tranpose_matrix GL_EXT_abgr GL_EXT_blend_func_separate GL_EXT_clip_volume_hint GL_EXT_compiled_vertex_array GL_EXT_histogram GL_EXT_packed_pixels GL_EXT_polygon_offset GL_EXT_rescale_normal GL_EXT_stencil_wrap GL_EXT_texture3D GL_EXT_texture_env_add GL_EXT_texture_object GL_EXT_texture_lod_bias GL_EXT_vertex_array GL_MESA_window_pos GL_MESA_resize_buffers GL_NV_texgen_reflection GL_PGI_misc_hints GL_SGIS_pixel_texture GL_SGIS_texture_edge_clamp GL_RENDERER: Mesa DRI Mach64 20001203 (Rage Pro) x86/3DNow! GL_VENDOR: Gareth Hughes GLU_VERSION: 1.1 Mesa 3.5 GLU_EXTENSIONS: GL_EXT_abgr GLUT_API_VERSION: 3 GLUT_XLIB_IMPLEMENTATION: 15 @ text @a231 16 #elif GlxBuiltInMach64 MACH64OBJS = mesa/src/drv/mach64/?*.o MACH64UOBJS = mesa/src/drv/mach64/unshared/?*.o MACH64DOBJS = mesa/src/drv/mach64/debugger/?*.o MACH64POBJS = mesa/src/drv/mach64/profiled/?*.o MACH64DONES = mesa/src/drv/mach64/DONE DRVOBJS = $(MACH64OBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(MACH64UOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(MACH64DOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(MACH64POBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(MACH64DONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/mach64 d267 1 a267 1 OBJS = $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) a341 1 !GlxBuiltInMach64 && \ @ 1.26 log @merge with 4.0.1d @ text @d34 1 a34 1 GLAPI_OBJ = glx/glapi_x86.o d37 5 a41 5 GLXOBJS = glx/?*.o GLXUOBJS = glx/unshared/?*.o $(GLAPI_OBJ) GLXDOBJS = glx/debugger/?*.o $(GLAPI_OBJ) GLXPOBJS = glx/profiled/?*.o $(GLAPI_OBJ) GLXDONES = glx/DONE d44 5 a48 5 DRIOBJS = dri/XF86dri.o dri/dri_glx.o DRIUOBJS = dri/unshared/XF86dri.o dri/unshared/dri_glx.o DRIDOBJS = dri/debugger/XF86dri.o dri/debugger/dri_glx.o DRIPOBJS = dri/profiled/XF86dri.o dri/profiled/dri_glx.o DRIDONES = dri/DONE d50 5 a54 5 DRMOBJS = dri/drm/?*.o DRMUOBJS = dri/drm/unshared/?*.o DRMDOBJS = dri/drm/debugger/?*.o DRMPOBJS = dri/drm/profiled/?*.o DRMDONES = dri/drm/DONE d56 1 a56 1 MESAOBJS = mesa/src/?*.o d58 10 a67 4 ASM_OBJS = mesa/src/X86/common_x86asm.o \ mesa/src/X86/mmx_blend.o \ mesa/src/X86/vertex.o \ mesa/src/X86/x86a.o d69 2 a70 2 ASM_OBJS += mesa/src/X86/3dnow_norm.o \ mesa/src/X86/3dnow_norm_raw.o \ d78 1 a78 2 mesa/src/X86/3dnow_xform_raw4.o \ mesa/src/X86/vertex_3dnow.o d81 2 a82 2 ASM_OBJS += mesa/src/X86/katmai_norm.o \ mesa/src/X86/katmai_norm_raw.o \ d90 1 a90 2 mesa/src/X86/katmai_xform_raw4.o \ mesa/src/X86/vertex_katmai.o @ 1.25 log @commit xfree86 4.0.1d-pre update @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.31 2000/08/28 16:04:47 dawes Exp $ @ 1.25.2.1 log @Initial checkin of Mesa-3.4 updates. @ text @d34 1 a34 1 GLAPI_OBJ = glx/glapi_x86.o d37 5 a41 5 GLXOBJS = glx/?*.o GLXUOBJS = glx/unshared/?*.o $(GLAPI_OBJ) GLXDOBJS = glx/debugger/?*.o $(GLAPI_OBJ) GLXPOBJS = glx/profiled/?*.o $(GLAPI_OBJ) GLXDONES = glx/DONE d44 5 a48 5 DRIOBJS = dri/XF86dri.o dri/dri_glx.o DRIUOBJS = dri/unshared/XF86dri.o dri/unshared/dri_glx.o DRIDOBJS = dri/debugger/XF86dri.o dri/debugger/dri_glx.o DRIPOBJS = dri/profiled/XF86dri.o dri/profiled/dri_glx.o DRIDONES = dri/DONE d50 5 a54 5 DRMOBJS = dri/drm/?*.o DRMUOBJS = dri/drm/unshared/?*.o DRMDOBJS = dri/drm/debugger/?*.o DRMPOBJS = dri/drm/profiled/?*.o DRMDONES = dri/drm/DONE d56 1 a56 1 MESAOBJS = mesa/src/?*.o d58 4 a61 11 ASM_OBJS = mesa/src/X86/common_x86_asm.o \ mesa/src/X86/x86_cliptest.o \ mesa/src/X86/x86_vertex.o \ mesa/src/X86/x86_xform_masked2.o \ mesa/src/X86/x86_xform_masked3.o \ mesa/src/X86/x86_xform_masked4.o \ mesa/src/X86/x86_xform_raw2.o \ mesa/src/X86/x86_xform_raw3.o \ mesa/src/X86/x86_xform_raw4.o \ mesa/src/X86/mmx_blend.o d63 2 a64 2 ASM_OBJS += mesa/src/X86/3dnow_norm_raw.o \ mesa/src/X86/3dnow_vertex.o \ d72 2 a73 1 mesa/src/X86/3dnow_xform_raw4.o d76 2 a77 2 ASM_OBJS += mesa/src/X86/katmai_norm_raw.o \ mesa/src/X86/katmai_vertex.o \ d85 2 a86 1 mesa/src/X86/katmai_xform_raw4.o d88 1 @ 1.25.2.2 log @merge trunk into tdfx-3-0-0-branch (in batches). @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.32 2000/09/24 13:50:59 alanh Exp $ d68 1 a92 1 @ 1.25.2.3 log @merge trunk into tdfx-3-0-0-branch freeze tag before merge is tdfx-3-0-0-20001201-freeze @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.33 2000/11/13 23:31:22 dawes Exp $ @ 1.25.2.4 log @merge from trunk @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.34 2000/12/12 23:24:26 dawes Exp $ d58 1 a58 1 ASM_BASE_OBJS = mesa/src/X86/common_x86_asm.o \ d66 4 a69 8 mesa/src/X86/x86_xform_raw4.o #if MesaUseMMX MMX_OBJS = mesa/src/X86/mmx_blend.o #endif #if MesaUse3DNow 3DNOW_OBJS = mesa/src/X86/3dnow_norm_raw.o \ d80 2 a81 2 #if MesaUseKatmai KATMAI_OBJS = mesa/src/X86/katmai_norm_raw.o \ a92 2 ASM_OBJS = $(ASM_BASE_OBJS) $(MMX_OBJS) $(3DNOW_OBJS) $(KATMAI_OBJS) d126 1 a126 1 DRVOBJS = $(GAMMAOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d132 1 a132 2 DRVSUBDIRS = mesa/src/drv/gamma GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d142 1 a142 1 DRVOBJS = $(TDFXOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d150 1 a150 2 DRVSUBDIRS = mesa/src/drv/tdfx GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d160 1 a160 1 DRVOBJS = $(I810OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d166 1 a166 2 DRVSUBDIRS = mesa/src/drv/i810 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d176 1 a176 1 DRVOBJS = $(MGAOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d182 1 a182 2 DRVSUBDIRS = mesa/src/drv/mga GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d192 5 a196 22 DRVOBJS = $(R128OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(R128UOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(R128DOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(R128POBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(R128DONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) DRVSUBDIRS = mesa/src/drv/common mesa/src/drv/r128 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) #elif GlxBuiltInRadeon RADEONOBJS = mesa/src/drv/radeon/?*.o RADEONUOBJS = mesa/src/drv/radeon/unshared/?*.o RADEONDOBJS = mesa/src/drv/radeon/debugger/?*.o RADEONPOBJS = mesa/src/drv/radeon/profiled/?*.o RADEONDONES = mesa/src/drv/radeon/DONE DRVOBJS = $(RADEONOBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(RADEONUOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(RADEONDOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(RADEONPOBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(RADEONDONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) d198 1 a198 2 DRVSUBDIRS = mesa/src/drv/common mesa/src/drv/radeon GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d214 1 a214 2 DRVSUBDIRS = mesa/src/drv/ffb GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d224 1 a224 1 DRVOBJS = $(SISOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d230 1 a230 2 DRVSUBDIRS = mesa/src/drv/sis GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) a339 1 !GlxBuiltInRadeon && \ @ 1.24 log @Allow GlxBuiltInMga to build @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.29 2000/07/02 19:23:34 dawes Exp $ @ 1.24.2.1 log @merge trunk into radeon branch. @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.31 2000/08/28 16:04:47 dawes Exp $ @ 1.23 log @Merged tdfx-2-1-branch @ text @d172 5 a176 5 DRVOBJS = $(MGAOBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(MGAUOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(MGADOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(MGAPOBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(MGADONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) @ 1.23.2.1 log @merge trunk into gamma-2-0-0-branch @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.34 2000/12/12 23:24:26 dawes Exp $ d34 1 a34 1 GLAPI_OBJ = glx/glapi_x86.o d37 5 a41 5 GLXOBJS = glx/?*.o GLXUOBJS = glx/unshared/?*.o $(GLAPI_OBJ) GLXDOBJS = glx/debugger/?*.o $(GLAPI_OBJ) GLXPOBJS = glx/profiled/?*.o $(GLAPI_OBJ) GLXDONES = glx/DONE d44 11 a54 11 DRIOBJS = dri/XF86dri.o dri/dri_glx.o DRIUOBJS = dri/unshared/XF86dri.o dri/unshared/dri_glx.o DRIDOBJS = dri/debugger/XF86dri.o dri/debugger/dri_glx.o DRIPOBJS = dri/profiled/XF86dri.o dri/profiled/dri_glx.o DRIDONES = dri/DONE DRMOBJS = dri/drm/?*.o DRMUOBJS = dri/drm/unshared/?*.o DRMDOBJS = dri/drm/debugger/?*.o DRMPOBJS = dri/drm/profiled/?*.o DRMDONES = dri/drm/DONE d56 1 a56 1 MESAOBJS = mesa/src/?*.o d58 7 a64 17 ASM_BASE_OBJS = mesa/src/X86/common_x86_asm.o \ mesa/src/X86/x86_cliptest.o \ mesa/src/X86/x86_vertex.o \ mesa/src/X86/x86_xform_masked2.o \ mesa/src/X86/x86_xform_masked3.o \ mesa/src/X86/x86_xform_masked4.o \ mesa/src/X86/x86_xform_raw2.o \ mesa/src/X86/x86_xform_raw3.o \ mesa/src/X86/x86_xform_raw4.o #if MesaUseMMX MMX_OBJS = mesa/src/X86/mmx_blend.o #endif #if MesaUse3DNow 3DNOW_OBJS = mesa/src/X86/3dnow_norm_raw.o \ mesa/src/X86/3dnow_vertex.o \ d72 2 a73 1 mesa/src/X86/3dnow_xform_raw4.o d75 3 a77 3 #if MesaUseKatmai KATMAI_OBJS = mesa/src/X86/katmai_norm_raw.o \ mesa/src/X86/katmai_vertex.o \ d85 2 a86 1 mesa/src/X86/katmai_xform_raw4.o a88 2 ASM_OBJS = $(ASM_BASE_OBJS) $(MMX_OBJS) $(3DNOW_OBJS) $(KATMAI_OBJS) d122 1 a122 1 DRVOBJS = $(GAMMAOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d128 1 a128 2 DRVSUBDIRS = mesa/src/drv/gamma GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d138 1 a138 1 DRVOBJS = $(TDFXOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d146 1 a146 2 DRVSUBDIRS = mesa/src/drv/tdfx GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d156 1 a156 1 DRVOBJS = $(I810OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d162 1 a162 2 DRVSUBDIRS = mesa/src/drv/i810 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d172 5 a176 5 DRVOBJS = $(MGAOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(MGAUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(MGADOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(MGAPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(MGADONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) d178 1 a178 2 DRVSUBDIRS = mesa/src/drv/mga GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d188 5 a192 22 DRVOBJS = $(R128OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(R128UOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(R128DOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(R128POBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(R128DONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) DRVSUBDIRS = mesa/src/drv/common mesa/src/drv/r128 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) #elif GlxBuiltInRadeon RADEONOBJS = mesa/src/drv/radeon/?*.o RADEONUOBJS = mesa/src/drv/radeon/unshared/?*.o RADEONDOBJS = mesa/src/drv/radeon/debugger/?*.o RADEONPOBJS = mesa/src/drv/radeon/profiled/?*.o RADEONDONES = mesa/src/drv/radeon/DONE DRVOBJS = $(RADEONOBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(RADEONUOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(RADEONDOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(RADEONPOBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(RADEONDONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) d194 1 a194 2 DRVSUBDIRS = mesa/src/drv/common mesa/src/drv/radeon GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d210 1 a210 2 DRVSUBDIRS = mesa/src/drv/ffb GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d220 1 a220 1 DRVOBJS = $(SISOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d226 1 a226 2 DRVSUBDIRS = mesa/src/drv/sis GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) a335 1 !GlxBuiltInRadeon && \ @ 1.22 log @Profiling support @ text @d6 1 d56 1 d75 12 d90 2 d305 1 a305 1 $(LN) $(SHLIBDIR)/lib$(LIBNAME).so $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so d307 1 a307 1 $(LN) $(SHLIBDIR)/lib$(LIBNAME).so.1 $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 @ 1.22.2.1 log @Merge trunk with ati-4-1-1-branch. Needed for Mobility M3 to work with latest 3D driver development. @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.31 2000/08/28 16:04:47 dawes Exp $ a5 1 a54 1 MESAOBJS = mesa/src/?*.o a72 12 #ifdef MesaUseKatmai ASM_OBJS += mesa/src/X86/katmai_norm.o \ mesa/src/X86/katmai_norm_raw.o \ mesa/src/X86/katmai_xform_masked1.o \ mesa/src/X86/katmai_xform_masked2.o \ mesa/src/X86/katmai_xform_masked3.o \ mesa/src/X86/katmai_xform_masked4.o \ mesa/src/X86/katmai_xform_raw1.o \ mesa/src/X86/katmai_xform_raw2.o \ mesa/src/X86/katmai_xform_raw3.o \ mesa/src/X86/katmai_xform_raw4.o \ mesa/src/X86/vertex_katmai.o a75 2 #endif d156 5 a160 5 DRVOBJS = $(MGAOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(MGAUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(MGADOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(MGAPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(MGADONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) d289 1 a289 1 $(LN) $(SHLIBDIR)/lib$(LIBNAME).so $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so || true d291 1 a291 1 $(LN) $(SHLIBDIR)/lib$(LIBNAME).so.1 $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 || true @ 1.22.2.2 log @Sync with latest Mesa-3.4 sources. Change Imakefiles to allow the enabling of SSE assembly code when appropriate (x86 platform with kernel 2.4.0 or higher). @ text @d34 1 a34 1 GLAPI_OBJ = glx/glapi_x86.o d37 5 a41 5 GLXOBJS = glx/?*.o GLXUOBJS = glx/unshared/?*.o $(GLAPI_OBJ) GLXDOBJS = glx/debugger/?*.o $(GLAPI_OBJ) GLXPOBJS = glx/profiled/?*.o $(GLAPI_OBJ) GLXDONES = glx/DONE d44 5 a48 5 DRIOBJS = dri/XF86dri.o dri/dri_glx.o DRIUOBJS = dri/unshared/XF86dri.o dri/unshared/dri_glx.o DRIDOBJS = dri/debugger/XF86dri.o dri/debugger/dri_glx.o DRIPOBJS = dri/profiled/XF86dri.o dri/profiled/dri_glx.o DRIDONES = dri/DONE d50 5 a54 5 DRMOBJS = dri/drm/?*.o DRMUOBJS = dri/drm/unshared/?*.o DRMDOBJS = dri/drm/debugger/?*.o DRMPOBJS = dri/drm/profiled/?*.o DRMDONES = dri/drm/DONE d56 1 a56 1 MESAOBJS = mesa/src/?*.o d58 4 a61 11 ASM_OBJS = mesa/src/X86/common_x86_asm.o \ mesa/src/X86/x86_cliptest.o \ mesa/src/X86/x86_vertex.o \ mesa/src/X86/x86_xform_masked2.o \ mesa/src/X86/x86_xform_masked3.o \ mesa/src/X86/x86_xform_masked4.o \ mesa/src/X86/x86_xform_raw2.o \ mesa/src/X86/x86_xform_raw3.o \ mesa/src/X86/x86_xform_raw4.o \ mesa/src/X86/mmx_blend.o d63 2 a64 2 ASM_OBJS += mesa/src/X86/3dnow_norm_raw.o \ mesa/src/X86/3dnow_vertex.o \ d72 2 a73 1 mesa/src/X86/3dnow_xform_raw4.o d76 2 a77 2 ASM_OBJS += mesa/src/X86/katmai_norm_raw.o \ mesa/src/X86/katmai_vertex.o \ d85 2 a86 1 mesa/src/X86/katmai_xform_raw4.o d88 1 @ 1.22.2.3 log @Merged trunk into branch. @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.32 2000/09/24 13:50:59 alanh Exp $ d68 1 @ 1.22.2.4 log @Fix up merge from trunk. @ text @a91 1 @ 1.22.2.5 log @Merge with trunk (almost there!). @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.33 2000/11/13 23:31:22 dawes Exp $ @ 1.21 log @first part of 4.0.1b merge @ text @d21 6 a26 3 #if 0 LOWSRC = lowpc.c LOWOBJ = lowpc.o d28 2 a29 2 HISRC = highpc.c HIOBJ = highpc.o d247 1 a247 1 OBJS = $(LOWOBJ) $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) $(HIOBJ) a250 1 #if 1 a254 3 #else UOBJS = $(OBJS) #endif a258 5 #if 0 SubdirLibraryRule(highpc.o lowpc.o) NormalLintTarget(highpc.c lowpc.c) #endif @ 1.20 log @fix glide3x to glide3 @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.28 2000/06/30 19:30:16 dawes Exp $ d293 1 @ 1.20.2.1 log @merge trunk to ppc-1-0-0-branch @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.29 2000/07/02 19:23:34 dawes Exp $ a5 1 d21 3 a23 6 XCOMM XCOMM Not related to ProfileLibGlx - I dont know how that works. KW. XCOMM #ifdef GlxSoProf PROFSRC = lowpc.c highpc.c PROFOBJ = lowpc.o highpc.o d25 2 a26 2 SubdirLibraryRule($(PROFOBJ)) NormalLintTarget($(PROFSRC)) a51 1 MESAOBJS = mesa/src/?*.o a69 12 #ifdef MesaUseKatmai ASM_OBJS += mesa/src/X86/katmai_norm.o \ mesa/src/X86/katmai_norm_raw.o \ mesa/src/X86/katmai_xform_masked1.o \ mesa/src/X86/katmai_xform_masked2.o \ mesa/src/X86/katmai_xform_masked3.o \ mesa/src/X86/katmai_xform_masked4.o \ mesa/src/X86/katmai_xform_raw1.o \ mesa/src/X86/katmai_xform_raw2.o \ mesa/src/X86/katmai_xform_raw3.o \ mesa/src/X86/katmai_xform_raw4.o \ mesa/src/X86/vertex_katmai.o a72 2 #endif d244 1 a244 1 OBJS = $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) d248 1 d253 3 d261 5 a292 1 MakeDir($(DESTDIR)$(SYSTEMUSRLIBDIR)) d294 1 a294 1 $(LN) $(SHLIBDIR)/lib$(LIBNAME).so $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so || true d296 1 a296 1 $(LN) $(SHLIBDIR)/lib$(LIBNAME).so.1 $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 || true @ 1.20.2.2 log @merge trunk to ppc-1-0-0-branch again @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.31 2000/08/28 16:04:47 dawes Exp $ d172 5 a176 5 DRVOBJS = $(MGAOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(MGAUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(MGADOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(MGAPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(MGADONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) @ 1.19 log @First set of misc changes to bring upto 4.0.1 @ text @d125 1 a125 1 REQUIREDLIBS += -lglide3x -ldl @ 1.18 log @added glapi_x86.o to GLX[UDP]OBJS objects @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.16 2000/03/02 16:07:30 martin Exp $ d29 4 d34 3 a36 3 GLXUOBJS = glx/unshared/?*.o glx/glapi_x86.o GLXDOBJS = glx/debugger/?*.o glx/glapi_x86.o GLXPOBJS = glx/profiled/?*.o glx/glapi_x86.o d109 1 a109 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d127 1 a127 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d143 1 a143 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d159 1 a159 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d175 33 a207 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d224 1 a224 1 GLXSUBDIRS = glx dri d236 2 a237 7 #if BuildXF86DRI SUBDIRS = $(GLXSUBDIRS) OTHERSUBDIRS = mesa/dri mesa/include/GL mesa/src #else SUBDIRS = glx a239 5 MakeSubdirs($(SUBDIRS)) MakefileSubdirs($(OTHERSUBDIRS)) DependSubdirs($(SUBDIRS) $(OTHERSUBDIRS)) d270 8 d283 1 d308 6 d318 10 a327 1 #if BuildXF86DRI && !GlxBuiltInGamma && !GlxBuiltInTdfx && !GlxBuiltInI810 && !GlxBuiltInMga && !GlxBuiltInMesa d329 1 a329 1 DRIVERSUBDIRS = mesa/dri mesa/include/GL mesa/src a331 2 DependSubdirs($(DRIVERSUBDIRS)) InstallSubdirs($(DRIVERSUBDIRS)) d334 4 @ 1.18.2.1 log @ Added optional support for the Katmai assembly. It doesn't work so me, so I'm not turning it on. Improved the lock handling in the DRI cases. This results in ~10% speedup. @ text @a65 14 #ifdef MesaUseKatmai ASM_OBJS += mesa/src/X86/katmai_norm.o \ mesa/src/X86/katmai_norm_raw.o \ mesa/src/X86/katmai_xform_masked1.o \ mesa/src/X86/katmai_xform_masked2.o \ mesa/src/X86/katmai_xform_masked3.o \ mesa/src/X86/katmai_xform_masked4.o \ mesa/src/X86/katmai_xform_raw1.o \ mesa/src/X86/katmai_xform_raw2.o \ mesa/src/X86/katmai_xform_raw3.o \ mesa/src/X86/katmai_xform_raw4.o \ mesa/src/X86/vertex_katmai.o #endif @ 1.18.2.2 log @Ensure we pass -mieee for Alpha. (Might not be correct way, but works for now). @ text @a5 5 #ifdef AlphaArchitecture XCOMM Ensure floating point precision, we do get FP exceptions without this. #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS) -mieee" #else a6 1 #endif a47 1 MESAOBJS = mesa/src/?*.o a79 1 MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o d82 1 @ 1.18.2.3 log @Set -mieee for Alpha. Add support for Keith's profiling. @ text @d7 4 d12 1 d27 3 a29 6 XCOMM XCOMM Not related to ProfileLibGlx - I dont know how that works. KW. XCOMM #ifdef GlxSoProf PROFSRC = lowpc.c highpc.c PROFOBJ = lowpc.o highpc.o d31 2 a32 2 SubdirLibraryRule($(PROFOBJ)) NormalLintTarget($(PROFSRC)) d239 1 a239 1 OBJS = $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) d243 1 d248 3 d256 5 d280 1 a280 1 $(LN) $(SHLIBDIR)/lib$(LIBNAME).so $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so || true d282 1 a282 1 $(LN) $(SHLIBDIR)/lib$(LIBNAME).so.1 $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 || true @ 1.18.2.4 log @Merge trunk into tdfx-2-1-branch @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.29 2000/07/02 19:23:34 dawes Exp $ a32 4 #if BuildXF86DRI && defined(i386Architecture) GLAPI_OBJ = glx/glapi_x86.o #endif d34 3 a36 3 GLXUOBJS = glx/unshared/?*.o $(GLAPI_OBJ) GLXDOBJS = glx/debugger/?*.o $(GLAPI_OBJ) GLXPOBJS = glx/profiled/?*.o $(GLAPI_OBJ) d124 1 a124 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/gamma d140 1 a140 1 REQUIREDLIBS += -lglide3 -ldl d142 1 a142 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/tdfx d158 1 a158 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/i810 d174 1 a174 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/mga d190 1 a190 33 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/r128 #elif GlxBuiltInFfb FFBOBJS = mesa/src/drv/ffb/?*.o FFBUOBJS = mesa/src/drv/ffb/unshared/?*.o FFBDOBJS = mesa/src/drv/ffb/debugger/?*.o FFBPOBJS = mesa/src/drv/ffb/profiled/?*.o FFBDONES = mesa/src/drv/ffb/DONE DRVOBJS = $(FFBOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(FFBUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(FFBDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(FFBPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(FFBDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/ffb #elif GlxBuiltInSIS SISOBJS = mesa/src/drv/sis/?*.o SISUOBJS = mesa/src/drv/sis/unshared/?*.o SISDOBJS = mesa/src/drv/sis/debugger/?*.o SISPOBJS = mesa/src/drv/sis/profiled/?*.o SISDONES = mesa/src/drv/sis/DONE DRVOBJS = $(SISOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(SISUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(SISDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(SISPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(SISDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/sis d207 1 a207 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d219 7 a225 2 #if !GlxUseSGISI && (!GlxBuiltInMesa || !defined(GlxDriverUsesMesa)) MakeSubdirs($(GLXSUBDIRS)) d228 5 a253 8 #if HasParallelMake MakeMutex($(GLXSUBDIRS) $(DONES)) #endif #if HasGnuMake || HasBsdMake $(DONES): $(GLXSUBDIRS) #endif a258 1 a267 1 MakeDir($(DESTDIR)$(SYSTEMUSRLIBDIR)) a282 6 XCOMM libOSmesa needs libGL, so build it now #if BuildXF86DRI && !GlxUseSGISI && (!GlxBuiltInMesa || !defined(GlxDriverUsesMesa)) OSMESASUBDIRS = mesa/src/OSmesa MakeSubdirs($(OSMESASUBDIRS)) #endif d287 1 a287 10 #if BuildXF86DRI && \ !GlxUseSGISI && \ !GlxBuiltInGamma && \ !GlxBuiltInTdfx && \ !GlxBuiltInI810 && \ !GlxBuiltInMga && \ !GlxBuiltInR128 && \ !GlxBuiltInFfb && \ !GlxBuiltInSIS && \ !GlxBuiltInMesa d289 1 a289 1 DRIVERSUBDIRS = mesa/src/drv d292 2 a295 4 SUBDIRS = $(GLXSUBDIRS) $(OSMESASUBDIRS) $(DRIVERSUBDIRS) DependSubdirs($(SUBDIRS)) @ 1.17 log @added -ldl to REQUIREDLIBS when building GlxBuiltInTdfx @ text @d30 3 a32 3 GLXUOBJS = glx/unshared/?*.o GLXDOBJS = glx/debugger/?*.o GLXPOBJS = glx/profiled/?*.o @ 1.16 log @added ASM_OBJS to fix static libGL.a build problem @ text @d121 1 a121 1 REQUIREDLIBS += -lglide3x @ 1.15 log @Merged glxmisc-3-0-0 @ text @d48 20 d69 3 a71 3 MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o @ 1.14 log @Merged ati-4-0-1 @ text @d236 7 @ 1.14.2.1 log @Merge trunk into bsd-1-0-1-branch. @ text @a235 7 #if LinkGLToUsrLib && AlternateUsrLibDir install:: $(RM) $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so $(LN) $(SHLIBDIR)/lib$(LIBNAME).so $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so $(RM) $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 $(LN) $(SHLIBDIR)/lib$(LIBNAME).so.1 $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 #endif @ 1.13 log @fixed make subdirs and make depend problem @ text @d137 16 d256 1 @ 1.13.2.1 log @added InstallSubdirs rule for DRI drivers @ text @a239 1 InstallSubdirs($(DRIVERSUBDIRS)) @ 1.13.2.2 log @added install rule to make /usr/lib/libGL.so symlink @ text @a219 5 #if LinkGLToUsrLib && AlternateUsrLibDir install:: $(RM) $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so $(LN) $(SHLIBDIR)/lib$(LIBNAME).so $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so #endif @ 1.13.2.3 log @add commands to make /usr/lib/libGL.so.1 symlink @ text @a223 2 $(RM) $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 $(LN) $(SHLIBDIR)/lib$(LIBNAME).so.1 $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 @ 1.13.2.4 log @merge from trunk @ text @a136 16 #elif GlxBuiltInR128 R128OBJS = mesa/src/drv/r128/?*.o R128UOBJS = mesa/src/drv/r128/unshared/?*.o R128DOBJS = mesa/src/drv/r128/debugger/?*.o R128POBJS = mesa/src/drv/r128/profiled/?*.o R128DONES = mesa/src/drv/r128/DONE DRVOBJS = $(R128OBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(R128UOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(R128DOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(R128POBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(R128DONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src @ 1.12 log @build libGL.so before the DRI drivers @ text @d167 2 a168 2 XCOMM SUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src SUBDIRS = glx dri d174 2 a175 1 DependSubdirs($(SUBDIRS)) @ 1.11 log @removed references to non-existant mesa/src/X/ directory. cleaned up indentation @ text @d14 2 a15 5 #if BuildXF86DRI DRIDIRS = dri MESADIRS = mesa/dri mesa/include/GL mesa/src #endif SUBDIRS = glx $(DRIDIRS) $(MESADIRS) a20 6 MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) LIBNAME = GL SOREV = $(SOGLREV) a41 2 #if !GlxUseSGISI #if GlxBuiltInGamma d48 5 a52 5 GAMMAOBJS = mesa/src/drv/gamma/?*.o GAMMAUOBJS = mesa/src/drv/gamma/unshared/?*.o GAMMADOBJS = mesa/src/drv/gamma/debugger/?*.o GAMMAPOBJS = mesa/src/drv/gamma/profiled/?*.o GAMMADONES = mesa/src/drv/gamma/DONE d60 19 d85 2 a87 5 DRMOBJS = dri/drm/?*.o DRMUOBJS = dri/drm/unshared/?*.o DRMDOBJS = dri/drm/debugger/?*.o DRMPOBJS = dri/drm/profiled/?*.o DRMDONES = dri/drm/DONE a94 12 MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o MESADONES = mesa/src/DONE mesa/src/X86/DONE DRIMESAOBJS = mesa/dri/?*.o DRIMESAUOBJS = mesa/dri/unshared/?*.o DRIMESADOBJS = mesa/dri/debugger/?*.o DRIMESAPOBJS = mesa/dri/profiled/?*.o DRIMESADONES = mesa/dri/DONE d103 2 a106 6 DRMOBJS = dri/drm/?*.o DRMUOBJS = dri/drm/unshared/?*.o DRMDOBJS = dri/drm/debugger/?*.o DRMPOBJS = dri/drm/profiled/?*.o DRMDONES = dri/drm/DONE a112 18 COMMONOBJS = mesa/src/drv/common/?*.o COMMONUOBJS = mesa/src/drv/common/unshared/?*.o COMMONDOBJS = mesa/src/drv/common/debugger/?*.o COMMONPOBJS = mesa/src/drv/common/profiled/?*.o COMMONDONES = mesa/src/drv/common/DONE MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o MESADONES = mesa/src/DONE mesa/src/X86/DONE DRIMESAOBJS = mesa/dri/?*.o DRIMESAUOBJS = mesa/dri/unshared/?*.o DRIMESADOBJS = mesa/dri/debugger/?*.o DRIMESAPOBJS = mesa/dri/profiled/?*.o DRIMESADONES = mesa/dri/DONE d119 2 a122 6 DRMOBJS = dri/drm/?*.o DRMUOBJS = dri/drm/unshared/?*.o DRMDOBJS = dri/drm/debugger/?*.o DRMPOBJS = dri/drm/profiled/?*.o DRMDONES = dri/drm/DONE a128 18 COMMONOBJS = mesa/src/drv/common/?*.o COMMONUOBJS = mesa/src/drv/common/unshared/?*.o COMMONDOBJS = mesa/src/drv/common/debugger/?*.o COMMONPOBJS = mesa/src/drv/common/profiled/?*.o COMMONDONES = mesa/src/drv/common/DONE MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o MESADONES = mesa/src/DONE mesa/src/X86/DONE DRIMESAOBJS = mesa/dri/?*.o DRIMESAUOBJS = mesa/dri/unshared/?*.o DRIMESADOBJS = mesa/dri/debugger/?*.o DRIMESAPOBJS = mesa/dri/profiled/?*.o DRIMESADONES = mesa/dri/DONE d135 1 d138 1 d145 2 d148 6 d155 6 d162 9 d173 5 d179 1 a179 1 OBJS = $(LIBNAME).a d181 1 a181 1 OBJS = $(LOWOBJ) $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) $(HIOBJ) d183 1 d193 1 d213 1 a213 1 NormalDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(UOBJS)) d217 1 a217 1 SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(SUBDIRS) $(DONES),$(OBJS) $(THREADOBJS),.,.) d221 1 a221 1 DebuggedDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(DOBJS)) d225 1 a225 1 ProfiledDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(POBJS)) d229 12 @ 1.10 log @Merged mga branch with trunk @ text @d31 2 a32 2 LOWSRC = lowpc.c LOWOBJ = lowpc.o d34 2 a35 2 HISRC = highpc.c HIOBJ = highpc.o d108 1 a108 1 REQUIREDLIBS += -lglide3x d124 5 a128 5 COMMONOBJS = mesa/src/drv/common/?*.o COMMONUOBJS = mesa/src/drv/common/unshared/?*.o COMMONDOBJS = mesa/src/drv/common/debugger/?*.o COMMONPOBJS = mesa/src/drv/common/profiled/?*.o COMMONDONES = mesa/src/drv/common/DONE a147 3 d156 11 a166 11 MGAOBJS = mesa/src/drv/mga/?*.o MGAUOBJS = mesa/src/drv/mga/unshared/?*.o MGADOBJS = mesa/src/drv/mga/debugger/?*.o MGAPOBJS = mesa/src/drv/mga/profiled/?*.o MGADONES = mesa/src/drv/mga/DONE COMMONOBJS = mesa/src/drv/common/?*.o COMMONUOBJS = mesa/src/drv/common/unshared/?*.o COMMONDOBJS = mesa/src/drv/common/debugger/?*.o COMMONPOBJS = mesa/src/drv/common/profiled/?*.o COMMONDONES = mesa/src/drv/common/DONE d189 5 a193 5 DRVOBJS = mesa/src/?*.o mesa/src/X/?*.o DRVUOBJS = mesa/src/unshared/?*.o mesa/src/X/unshared/?*.o DRVDOBJS = mesa/src/debugger/?*.o mesa/src/X/debugger/?*.o DRVPOBJS = mesa/src/profiled/?*.o mesa/src/X/profiled/?*.o DRVDONES = mesa/src/DONE mesa/src/X/DONE d200 1 a200 1 OBJS = $(LIBNAME).a @ 1.10.6.1 log @ Merge the trunk into the branch. @ text @d14 5 a18 2 LIBNAME = GL SOREV = $(SOGLREV) d24 6 d31 2 a32 2 LOWSRC = lowpc.c LOWOBJ = lowpc.o d34 2 a35 2 HISRC = highpc.c HIOBJ = highpc.o d51 2 d59 5 a63 5 MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o MESADONES = mesa/src/DONE mesa/src/X86/DONE a70 19 COMMONOBJS = mesa/src/drv/common/?*.o COMMONUOBJS = mesa/src/drv/common/unshared/?*.o COMMONDOBJS = mesa/src/drv/common/debugger/?*.o COMMONPOBJS = mesa/src/drv/common/profiled/?*.o COMMONDONES = mesa/src/drv/common/DONE #if GlxUseSGISI XCOMM nothing #elif GlxBuiltInGamma GAMMAOBJS = mesa/src/drv/gamma/?*.o GAMMAUOBJS = mesa/src/drv/gamma/unshared/?*.o GAMMADOBJS = mesa/src/drv/gamma/debugger/?*.o GAMMAPOBJS = mesa/src/drv/gamma/profiled/?*.o GAMMADONES = mesa/src/drv/gamma/DONE a76 2 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d78 5 d90 12 d108 1 a108 1 REQUIREDLIBS += -lglide3x d110 1 a110 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d112 5 a116 1 #elif GlxBuiltInI810 d124 18 d148 2 a149 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d153 29 a181 5 MGAOBJS = mesa/src/drv/mga/?*.o MGAUOBJS = mesa/src/drv/mga/unshared/?*.o MGADOBJS = mesa/src/drv/mga/debugger/?*.o MGAPOBJS = mesa/src/drv/mga/profiled/?*.o MGADONES = mesa/src/drv/mga/DONE a188 17 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src #elif GlxBuiltInR128 R128OBJS = mesa/src/drv/r128/?*.o R128UOBJS = mesa/src/drv/r128/unshared/?*.o R128DOBJS = mesa/src/drv/r128/debugger/?*.o R128POBJS = mesa/src/drv/r128/profiled/?*.o R128DONES = mesa/src/drv/r128/DONE DRVOBJS = $(R128OBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(R128UOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(R128DOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(R128POBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(R128DONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src a190 1 d192 5 a196 7 DRVOBJS = mesa/src/?*.o DRVUOBJS = mesa/src/unshared/?*.o DRVDOBJS = mesa/src/debugger/?*.o DRVPOBJS = mesa/src/profiled/?*.o DRVDONES = mesa/src/DONE GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src a197 6 #else XCOMM No built-in drivers. This is the usual case. GLXSUBDIRS = glx dri a198 6 #else XCOMM BuildXF86DRI was not defined. Just build an indirect-only libGL. GLXSUBDIRS = glx a199 9 #if BuildXF86DRI SUBDIRS = $(GLXSUBDIRS) OTHERSUBDIRS = mesa/dri mesa/include/GL mesa/src #else SUBDIRS = glx a201 6 MakeSubdirs($(SUBDIRS)) MakefileSubdirs($(OTHERSUBDIRS)) DependSubdirs($(SUBDIRS) $(OTHERSUBDIRS)) d205 1 a205 1 OBJS = $(LOWOBJ) $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) $(HIOBJ) a206 1 a215 1 d235 1 a235 1 NormalDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(UOBJS)) d239 1 a239 1 SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(GLXSUBDIRS) $(DONES),$(OBJS) $(THREADOBJS),.,.) d243 1 a243 1 DebuggedDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(DOBJS)) d247 1 a247 1 ProfiledDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(POBJS)) a250 13 XCOMM libGL has now been made, continue with building the drivers. #if BuildXF86DRI && !GlxBuiltInGamma && !GlxBuiltInTdfx && !GlxBuiltInI810 && !GlxBuiltInMga && !GlxBuiltInMesa DRIVERSUBDIRS = mesa/dri mesa/include/GL mesa/src MakeSubdirs($(DRIVERSUBDIRS)) DependSubdirs($(DRIVERSUBDIRS)) InstallSubdirs($(DRIVERSUBDIRS)) #endif @ 1.10.6.2 log @ Merge the latest version of the trunk into my tdfx-2-0 branch. @ text @a235 7 #if LinkGLToUsrLib && AlternateUsrLibDir install:: $(RM) $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so $(LN) $(SHLIBDIR)/lib$(LIBNAME).so $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so $(RM) $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 $(LN) $(SHLIBDIR)/lib$(LIBNAME).so.1 $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 #endif @ 1.10.10.1 log @Merged trunk into bsd-1-0-0-branch @ text @d14 5 a18 2 LIBNAME = GL SOREV = $(SOGLREV) d24 6 d31 2 a32 2 LOWSRC = lowpc.c LOWOBJ = lowpc.o d34 2 a35 2 HISRC = highpc.c HIOBJ = highpc.o d51 2 d59 5 a63 5 MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o MESADONES = mesa/src/DONE mesa/src/X86/DONE a70 19 COMMONOBJS = mesa/src/drv/common/?*.o COMMONUOBJS = mesa/src/drv/common/unshared/?*.o COMMONDOBJS = mesa/src/drv/common/debugger/?*.o COMMONPOBJS = mesa/src/drv/common/profiled/?*.o COMMONDONES = mesa/src/drv/common/DONE #if GlxUseSGISI XCOMM nothing #elif GlxBuiltInGamma GAMMAOBJS = mesa/src/drv/gamma/?*.o GAMMAUOBJS = mesa/src/drv/gamma/unshared/?*.o GAMMADOBJS = mesa/src/drv/gamma/debugger/?*.o GAMMAPOBJS = mesa/src/drv/gamma/profiled/?*.o GAMMADONES = mesa/src/drv/gamma/DONE a76 2 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d78 5 d90 12 d108 1 a108 1 REQUIREDLIBS += -lglide3x d110 1 a110 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d112 5 a116 1 #elif GlxBuiltInI810 d124 18 d148 2 a149 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d153 29 a181 5 MGAOBJS = mesa/src/drv/mga/?*.o MGAUOBJS = mesa/src/drv/mga/unshared/?*.o MGADOBJS = mesa/src/drv/mga/debugger/?*.o MGAPOBJS = mesa/src/drv/mga/profiled/?*.o MGADONES = mesa/src/drv/mga/DONE a188 17 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src #elif GlxBuiltInR128 R128OBJS = mesa/src/drv/r128/?*.o R128UOBJS = mesa/src/drv/r128/unshared/?*.o R128DOBJS = mesa/src/drv/r128/debugger/?*.o R128POBJS = mesa/src/drv/r128/profiled/?*.o R128DONES = mesa/src/drv/r128/DONE DRVOBJS = $(R128OBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(R128UOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(R128DOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(R128POBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(R128DONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src a190 1 d192 5 a196 7 DRVOBJS = mesa/src/?*.o DRVUOBJS = mesa/src/unshared/?*.o DRVDOBJS = mesa/src/debugger/?*.o DRVPOBJS = mesa/src/profiled/?*.o DRVDONES = mesa/src/DONE GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src a197 6 #else XCOMM No built-in drivers. This is the usual case. GLXSUBDIRS = glx dri a198 6 #else XCOMM BuildXF86DRI was not defined. Just build an indirect-only libGL. GLXSUBDIRS = glx a199 9 #if BuildXF86DRI SUBDIRS = $(GLXSUBDIRS) OTHERSUBDIRS = mesa/dri mesa/include/GL mesa/src #else SUBDIRS = glx a201 6 MakeSubdirs($(SUBDIRS)) MakefileSubdirs($(OTHERSUBDIRS)) DependSubdirs($(SUBDIRS) $(OTHERSUBDIRS)) d205 1 a205 1 OBJS = $(LOWOBJ) $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) $(HIOBJ) a206 1 a215 1 d235 1 a235 1 NormalDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(UOBJS)) d239 1 a239 1 SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(GLXSUBDIRS) $(DONES),$(OBJS) $(THREADOBJS),.,.) d243 1 a243 1 DebuggedDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(DOBJS)) d247 1 a247 1 ProfiledDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(POBJS)) a250 13 XCOMM libGL has now been made, continue with building the drivers. #if BuildXF86DRI && !GlxBuiltInGamma && !GlxBuiltInTdfx && !GlxBuiltInI810 && !GlxBuiltInMga && !GlxBuiltInMesa DRIVERSUBDIRS = mesa/dri mesa/include/GL mesa/src MakeSubdirs($(DRIVERSUBDIRS)) DependSubdirs($(DRIVERSUBDIRS)) InstallSubdirs($(DRIVERSUBDIRS)) #endif @ 1.10.12.1 log @Merged trunk into mgadh-0-0-3-branch @ text @d14 5 a18 2 LIBNAME = GL SOREV = $(SOGLREV) d24 6 d31 2 a32 2 LOWSRC = lowpc.c LOWOBJ = lowpc.o d34 2 a35 2 HISRC = highpc.c HIOBJ = highpc.o d51 2 d59 5 a63 5 MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o MESADONES = mesa/src/DONE mesa/src/X86/DONE a70 19 COMMONOBJS = mesa/src/drv/common/?*.o COMMONUOBJS = mesa/src/drv/common/unshared/?*.o COMMONDOBJS = mesa/src/drv/common/debugger/?*.o COMMONPOBJS = mesa/src/drv/common/profiled/?*.o COMMONDONES = mesa/src/drv/common/DONE #if GlxUseSGISI XCOMM nothing #elif GlxBuiltInGamma GAMMAOBJS = mesa/src/drv/gamma/?*.o GAMMAUOBJS = mesa/src/drv/gamma/unshared/?*.o GAMMADOBJS = mesa/src/drv/gamma/debugger/?*.o GAMMAPOBJS = mesa/src/drv/gamma/profiled/?*.o GAMMADONES = mesa/src/drv/gamma/DONE a76 2 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d78 5 d90 12 d108 1 a108 1 REQUIREDLIBS += -lglide3x d110 1 a110 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d112 5 a116 1 #elif GlxBuiltInI810 d124 18 d148 2 a149 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d153 29 a181 5 MGAOBJS = mesa/src/drv/mga/?*.o MGAUOBJS = mesa/src/drv/mga/unshared/?*.o MGADOBJS = mesa/src/drv/mga/debugger/?*.o MGAPOBJS = mesa/src/drv/mga/profiled/?*.o MGADONES = mesa/src/drv/mga/DONE a188 17 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src #elif GlxBuiltInR128 R128OBJS = mesa/src/drv/r128/?*.o R128UOBJS = mesa/src/drv/r128/unshared/?*.o R128DOBJS = mesa/src/drv/r128/debugger/?*.o R128POBJS = mesa/src/drv/r128/profiled/?*.o R128DONES = mesa/src/drv/r128/DONE DRVOBJS = $(R128OBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(R128UOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(R128DOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(R128POBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(R128DONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src a190 1 d192 5 a196 7 DRVOBJS = mesa/src/?*.o DRVUOBJS = mesa/src/unshared/?*.o DRVDOBJS = mesa/src/debugger/?*.o DRVPOBJS = mesa/src/profiled/?*.o DRVDONES = mesa/src/DONE GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src a197 6 #else XCOMM No built-in drivers. This is the usual case. GLXSUBDIRS = glx dri a198 6 #else XCOMM BuildXF86DRI was not defined. Just build an indirect-only libGL. GLXSUBDIRS = glx a199 9 #if BuildXF86DRI SUBDIRS = $(GLXSUBDIRS) OTHERSUBDIRS = mesa/dri mesa/include/GL mesa/src #else SUBDIRS = glx a201 6 MakeSubdirs($(SUBDIRS)) MakefileSubdirs($(OTHERSUBDIRS)) DependSubdirs($(SUBDIRS) $(OTHERSUBDIRS)) d205 1 a205 1 OBJS = $(LOWOBJ) $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) $(HIOBJ) a206 1 a215 1 d235 1 a235 1 NormalDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(UOBJS)) d239 1 a239 1 SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(GLXSUBDIRS) $(DONES),$(OBJS) $(THREADOBJS),.,.) d243 1 a243 1 DebuggedDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(DOBJS)) d247 1 a247 1 ProfiledDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(POBJS)) a250 13 XCOMM libGL has now been made, continue with building the drivers. #if BuildXF86DRI && !GlxBuiltInGamma && !GlxBuiltInTdfx && !GlxBuiltInI810 && !GlxBuiltInMga && !GlxBuiltInMesa DRIVERSUBDIRS = mesa/dri mesa/include/GL mesa/src MakeSubdirs($(DRIVERSUBDIRS)) DependSubdirs($(DRIVERSUBDIRS)) InstallSubdirs($(DRIVERSUBDIRS)) #endif @ 1.10.2.1 log @Merged Trunk with mga-0-0-3-branch @ text @d14 5 a18 2 LIBNAME = GL SOREV = $(SOGLREV) d24 6 d31 2 a32 2 LOWSRC = lowpc.c LOWOBJ = lowpc.o d34 2 a35 2 HISRC = highpc.c HIOBJ = highpc.o d51 2 d59 5 a63 5 MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o MESADONES = mesa/src/DONE mesa/src/X86/DONE a70 19 COMMONOBJS = mesa/src/drv/common/?*.o COMMONUOBJS = mesa/src/drv/common/unshared/?*.o COMMONDOBJS = mesa/src/drv/common/debugger/?*.o COMMONPOBJS = mesa/src/drv/common/profiled/?*.o COMMONDONES = mesa/src/drv/common/DONE #if GlxUseSGISI XCOMM nothing #elif GlxBuiltInGamma GAMMAOBJS = mesa/src/drv/gamma/?*.o GAMMAUOBJS = mesa/src/drv/gamma/unshared/?*.o GAMMADOBJS = mesa/src/drv/gamma/debugger/?*.o GAMMAPOBJS = mesa/src/drv/gamma/profiled/?*.o GAMMADONES = mesa/src/drv/gamma/DONE a76 2 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d78 5 d90 12 d108 1 a108 1 REQUIREDLIBS += -lglide3x d110 1 a110 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d112 5 a116 1 #elif GlxBuiltInI810 d124 18 d148 2 a149 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d153 29 a181 5 MGAOBJS = mesa/src/drv/mga/?*.o MGAUOBJS = mesa/src/drv/mga/unshared/?*.o MGADOBJS = mesa/src/drv/mga/debugger/?*.o MGAPOBJS = mesa/src/drv/mga/profiled/?*.o MGADONES = mesa/src/drv/mga/DONE a188 17 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src #elif GlxBuiltInR128 R128OBJS = mesa/src/drv/r128/?*.o R128UOBJS = mesa/src/drv/r128/unshared/?*.o R128DOBJS = mesa/src/drv/r128/debugger/?*.o R128POBJS = mesa/src/drv/r128/profiled/?*.o R128DONES = mesa/src/drv/r128/DONE DRVOBJS = $(R128OBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(R128UOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(R128DOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(R128POBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(R128DONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src a190 1 d192 5 a196 7 DRVOBJS = mesa/src/?*.o DRVUOBJS = mesa/src/unshared/?*.o DRVDOBJS = mesa/src/debugger/?*.o DRVPOBJS = mesa/src/profiled/?*.o DRVDONES = mesa/src/DONE GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src a197 6 #else XCOMM No built-in drivers. This is the usual case. GLXSUBDIRS = glx dri a198 6 #else XCOMM BuildXF86DRI was not defined. Just build an indirect-only libGL. GLXSUBDIRS = glx a199 9 #if BuildXF86DRI SUBDIRS = $(GLXSUBDIRS) OTHERSUBDIRS = mesa/dri mesa/include/GL mesa/src #else SUBDIRS = glx a201 6 MakeSubdirs($(SUBDIRS)) MakefileSubdirs($(OTHERSUBDIRS)) DependSubdirs($(SUBDIRS) $(OTHERSUBDIRS)) d205 1 a205 1 OBJS = $(LOWOBJ) $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) $(HIOBJ) a206 1 a215 1 d235 1 a235 1 NormalDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(UOBJS)) d239 1 a239 1 SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(GLXSUBDIRS) $(DONES),$(OBJS) $(THREADOBJS),.,.) d243 1 a243 1 DebuggedDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(DOBJS)) d247 1 a247 1 ProfiledDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(POBJS)) a250 13 XCOMM libGL has now been made, continue with building the drivers. #if BuildXF86DRI && !GlxBuiltInGamma && !GlxBuiltInTdfx && !GlxBuiltInI810 && !GlxBuiltInMga && !GlxBuiltInMesa DRIVERSUBDIRS = mesa/dri mesa/include/GL mesa/src MakeSubdirs($(DRIVERSUBDIRS)) DependSubdirs($(DRIVERSUBDIRS)) InstallSubdirs($(DRIVERSUBDIRS)) #endif @ 1.9 log @Merge with 4.0 @ text @d30 8 d109 81 d205 1 a205 1 OBJS = $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) d208 1 d213 3 d219 5 @ 1.9.2.1 log @Updated r128 driver to XFree86 4.0 Included kernel code from mga branch plus modifications for r128 Fixed compilation problem with DDC support and static X server @ text @a100 30 #elif GlxBuiltInR128 DRMOBJS = dri/drm/?*.o DRMUOBJS = dri/drm/unshared/?*.o DRMDOBJS = dri/drm/debugger/?*.o DRMPOBJS = dri/drm/profiled/?*.o DRMDONES = dri/drm/DONE R128OBJS = mesa/src/drv/r128/?*.o R128UOBJS = mesa/src/drv/r128/unshared/?*.o R128DOBJS = mesa/src/drv/r128/debugger/?*.o R128POBJS = mesa/src/drv/r128/profiled/?*.o R128DONES = mesa/src/drv/r128/DONE MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o MESADONES = mesa/src/DONE mesa/src/X86/DONE DRIMESAOBJS = mesa/dri/?*.o DRIMESAUOBJS = mesa/dri/unshared/?*.o DRIMESADOBJS = mesa/dri/debugger/?*.o DRIMESAPOBJS = mesa/dri/profiled/?*.o DRIMESADONES = mesa/dri/DONE DRVOBJS = $(R128OBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(R128UOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(R128DOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(R128POBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(R128DONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) @ 1.9.2.2 log @- Merged the trunk into the ati-4-0-1-branch - Changed kernel and driver code to better handle CCE timeouts - Fixed static 3D driver build problem - Fixed very large packets bug in drmR128SubmitPackets - Fixed static server drm build problem - Fixed ring buffer wrapping problem - Fixed drmR128GetVertexBuffers timeout @ text @a29 8 #if 0 LOWSRC = lowpc.c LOWOBJ = lowpc.o HISRC = highpc.c HIOBJ = highpc.o #endif a100 1 a130 75 #elif GlxBuiltInI810 DRMOBJS = dri/drm/?*.o DRMUOBJS = dri/drm/unshared/?*.o DRMDOBJS = dri/drm/debugger/?*.o DRMPOBJS = dri/drm/profiled/?*.o DRMDONES = dri/drm/DONE I810OBJS = mesa/src/drv/i810/?*.o I810UOBJS = mesa/src/drv/i810/unshared/?*.o I810DOBJS = mesa/src/drv/i810/debugger/?*.o I810POBJS = mesa/src/drv/i810/profiled/?*.o I810DONES = mesa/src/drv/i810/DONE COMMONOBJS = mesa/src/drv/common/?*.o COMMONUOBJS = mesa/src/drv/common/unshared/?*.o COMMONDOBJS = mesa/src/drv/common/debugger/?*.o COMMONPOBJS = mesa/src/drv/common/profiled/?*.o COMMONDONES = mesa/src/drv/common/DONE MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o MESADONES = mesa/src/DONE mesa/src/X86/DONE DRIMESAOBJS = mesa/dri/?*.o DRIMESAUOBJS = mesa/dri/unshared/?*.o DRIMESADOBJS = mesa/dri/debugger/?*.o DRIMESAPOBJS = mesa/dri/profiled/?*.o DRIMESADONES = mesa/dri/DONE DRVOBJS = $(I810OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(I810UOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(I810DOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(I810POBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(I810DONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) #elif GlxBuiltInMga DRMOBJS = dri/drm/?*.o DRMUOBJS = dri/drm/unshared/?*.o DRMDOBJS = dri/drm/debugger/?*.o DRMPOBJS = dri/drm/profiled/?*.o DRMDONES = dri/drm/DONE MGAOBJS = mesa/src/drv/mga/?*.o MGAUOBJS = mesa/src/drv/mga/unshared/?*.o MGADOBJS = mesa/src/drv/mga/debugger/?*.o MGAPOBJS = mesa/src/drv/mga/profiled/?*.o MGADONES = mesa/src/drv/mga/DONE COMMONOBJS = mesa/src/drv/common/?*.o COMMONUOBJS = mesa/src/drv/common/unshared/?*.o COMMONDOBJS = mesa/src/drv/common/debugger/?*.o COMMONPOBJS = mesa/src/drv/common/profiled/?*.o COMMONDONES = mesa/src/drv/common/DONE MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o MESADONES = mesa/src/DONE mesa/src/X86/DONE DRIMESAOBJS = mesa/dri/?*.o DRIMESAUOBJS = mesa/dri/unshared/?*.o DRIMESADOBJS = mesa/dri/debugger/?*.o DRIMESAPOBJS = mesa/dri/profiled/?*.o DRIMESADONES = mesa/dri/DONE DRVOBJS = $(MGAOBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(MGAUOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(MGADOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(MGAPOBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(MGADONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) d146 1 a146 1 OBJS = $(LOWOBJ) $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) $(HIOBJ) a148 1 #if 1 a152 3 #else UOBJS = $(OBJS) #endif a156 5 #if 0 SubdirLibraryRule(highpc.o lowpc.o) NormalLintTarget(highpc.c lowpc.c) #endif d182 1 @ 1.9.2.3 log @- Merge trunk into ati branch - Fix texture allocation to use both AGP and local textures (still need to fix LRU algorithm to choose from both local and AGP heaps for texture swapping) @ text @d14 5 a18 2 LIBNAME = GL SOREV = $(SOGLREV) d24 6 d31 2 a32 2 LOWSRC = lowpc.c LOWOBJ = lowpc.o d34 2 a35 2 HISRC = highpc.c HIOBJ = highpc.o d51 2 d59 5 a63 5 MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o MESADONES = mesa/src/DONE mesa/src/X86/DONE a70 19 COMMONOBJS = mesa/src/drv/common/?*.o COMMONUOBJS = mesa/src/drv/common/unshared/?*.o COMMONDOBJS = mesa/src/drv/common/debugger/?*.o COMMONPOBJS = mesa/src/drv/common/profiled/?*.o COMMONDONES = mesa/src/drv/common/DONE #if GlxUseSGISI XCOMM nothing #elif GlxBuiltInGamma GAMMAOBJS = mesa/src/drv/gamma/?*.o GAMMAUOBJS = mesa/src/drv/gamma/unshared/?*.o GAMMADOBJS = mesa/src/drv/gamma/debugger/?*.o GAMMAPOBJS = mesa/src/drv/gamma/profiled/?*.o GAMMADONES = mesa/src/drv/gamma/DONE a76 2 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d78 5 d90 12 d108 8 a115 1 REQUIREDLIBS += -lglide3x d117 23 a139 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d142 5 d154 18 d178 18 a195 1 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src d197 5 a201 1 #elif GlxBuiltInMga d203 5 a207 5 MGAOBJS = mesa/src/drv/mga/?*.o MGAUOBJS = mesa/src/drv/mga/unshared/?*.o MGADOBJS = mesa/src/drv/mga/debugger/?*.o MGAPOBJS = mesa/src/drv/mga/profiled/?*.o MGADONES = mesa/src/drv/mga/DONE a214 18 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src #elif GlxBuiltInR128 R128OBJS = mesa/src/drv/r128/?*.o R128UOBJS = mesa/src/drv/r128/unshared/?*.o R128DOBJS = mesa/src/drv/r128/debugger/?*.o R128POBJS = mesa/src/drv/r128/profiled/?*.o R128DONES = mesa/src/drv/r128/DONE DRVOBJS = $(R128OBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(R128UOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(R128DOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(R128POBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(R128DONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src a215 1 d217 5 a221 7 DRVOBJS = mesa/src/?*.o DRVUOBJS = mesa/src/unshared/?*.o DRVDOBJS = mesa/src/debugger/?*.o DRVPOBJS = mesa/src/profiled/?*.o DRVDONES = mesa/src/DONE GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src a222 6 #else XCOMM No built-in drivers. This is the usual case. GLXSUBDIRS = glx dri a223 6 #else XCOMM BuildXF86DRI was not defined. Just build an indirect-only libGL. GLXSUBDIRS = glx a224 9 #if BuildXF86DRI SUBDIRS = $(GLXSUBDIRS) OTHERSUBDIRS = mesa/dri mesa/include/GL mesa/src #else SUBDIRS = glx a226 6 MakeSubdirs($(SUBDIRS)) MakefileSubdirs($(OTHERSUBDIRS)) DependSubdirs($(SUBDIRS) $(OTHERSUBDIRS)) d230 1 a230 1 OBJS = $(LOWOBJ) $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) $(HIOBJ) a231 1 a240 1 d260 1 a260 1 NormalDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(UOBJS)) d264 1 a264 1 SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(GLXSUBDIRS) $(DONES),$(OBJS) $(THREADOBJS),.,.) d268 1 a268 1 DebuggedDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(DOBJS)) d272 1 a272 1 ProfiledDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(POBJS)) a273 13 #endif XCOMM libGL has now been made, continue with building the drivers. #if BuildXF86DRI && !GlxBuiltInGamma && !GlxBuiltInTdfx && !GlxBuiltInI810 && !GlxBuiltInMga && !GlxBuiltInMesa DRIVERSUBDIRS = mesa/dri mesa/include/GL mesa/src MakeSubdirs($(DRIVERSUBDIRS)) DependSubdirs($(DRIVERSUBDIRS)) @ 1.9.2.4 log @- Fix merge problems - Remove rcs keywords - Fix lib/GL install problem - Prepare for merge into trunk @ text @a255 1 InstallSubdirs($(DRIVERSUBDIRS)) @ 1.8 log @updated for GlxBuiltInGamma @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.15 2000/02/16 17:26:30 dawes Exp $ @ 1.7 log @3.9.18 merge @ text @d45 24 a68 5 DRVOBJS = mesa/src/drv/gamma/?*.o DRVUOBJS = mesa/src/drv/gamma/unshared/?*.o DRVDOBJS = mesa/src/drv/gamma/debugger/?*.o DRVPOBJS = mesa/src/drv/gamma/profiled/?*.o DRVDONES = mesa/src/drv/gamma/DONE @ 1.7.4.1 log @merge, stage 1 @ text @a81 47 #elif GlxBuiltInI810 I810OBJS = mesa/src/drv/i810/?*.o I810UOBJS = mesa/src/drv/i810/unshared/?*.o I810DOBJS = mesa/src/drv/i810/debugger/?*.o I810POBJS = mesa/src/drv/i810/profiled/?*.o I810DONES = mesa/src/drv/i810/DONE COMMONOBJS = mesa/src/drv/common/?*.o COMMONUOBJS = mesa/src/drv/common/unshared/?*.o COMMONDOBJS = mesa/src/drv/common/debugger/?*.o COMMONPOBJS = mesa/src/drv/common/profiled/?*.o COMMONDONES = mesa/src/drv/common/DONE MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o MESADONES = mesa/src/DONE mesa/src/X86/DONE DRVOBJS = $(I810OBJS) $(COMMONOBJS) $(MESAOBJS) DRVUOBJS = $(I810UOBJS) $(COMMONUOBJS) $(MESAUOBJS) DRVDOBJS = $(I810DOBJS) $(COMMONDOBJS) $(MESADOBJS) DRVPOBJS = $(I810POBJS) $(COMMONPOBJS) $(MESAPOBJS) DRVDONES = $(I810DONES) $(COMMONDONES) $(MESADONES) #elif GlxBuiltInMga MGAOBJS = mesa/src/drv/mga/?*.o MGAUOBJS = mesa/src/drv/mga/unshared/?*.o MGADOBJS = mesa/src/drv/mga/debugger/?*.o MGAPOBJS = mesa/src/drv/mga/profiled/?*.o MGADONES = mesa/src/drv/mga/DONE COMMONOBJS = mesa/src/drv/common/?*.o COMMONUOBJS = mesa/src/drv/common/unshared/?*.o COMMONDOBJS = mesa/src/drv/common/debugger/?*.o COMMONPOBJS = mesa/src/drv/common/profiled/?*.o COMMONDONES = mesa/src/drv/common/DONE MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o MESADONES = mesa/src/DONE mesa/src/X86/DONE DRVOBJS = $(MGAOBJS) $(COMMONOBJS) $(MESAOBJS) DRVUOBJS = $(MGAUOBJS) $(COMMONUOBJS) $(MESAUOBJS) DRVDOBJS = $(MGADOBJS) $(COMMONDOBJS) $(MESADOBJS) DRVPOBJS = $(MGAPOBJS) $(COMMONPOBJS) $(MESAPOBJS) DRVDONES = $(MGADONES) $(COMMONDONES) $(MESADONES) @ 1.7.4.2 log @Support for builtin i810,mga drivers. @ text @a29 8 #if 0 LOWSRC = lowpc.c LOWOBJ = lowpc.o HISRC = highpc.c HIOBJ = highpc.o #endif a84 6 DRMOBJS = dri/drm/?*.o DRMUOBJS = dri/drm/unshared/?*.o DRMDOBJS = dri/drm/debugger/?*.o DRMPOBJS = dri/drm/profiled/?*.o DRMDONES = dri/drm/DONE a89 1 a94 1 d100 5 a104 15 DRIMESAOBJS = mesa/dri/?*.o DRIMESAUOBJS = mesa/dri/unshared/?*.o DRIMESADOBJS = mesa/dri/debugger/?*.o DRIMESAPOBJS = mesa/dri/profiled/?*.o DRIMESADONES = mesa/dri/DONE DRVOBJS = $(I810OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(I810UOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(I810DOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(I810POBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(I810DONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) a107 6 DRMOBJS = dri/drm/?*.o DRMUOBJS = dri/drm/unshared/?*.o DRMDOBJS = dri/drm/debugger/?*.o DRMPOBJS = dri/drm/profiled/?*.o DRMDONES = dri/drm/DONE a112 1 a117 1 d123 5 a127 13 DRIMESAOBJS = mesa/dri/?*.o DRIMESAUOBJS = mesa/dri/unshared/?*.o DRIMESADOBJS = mesa/dri/debugger/?*.o DRIMESAPOBJS = mesa/dri/profiled/?*.o DRIMESADONES = mesa/dri/DONE DRVOBJS = $(MGAOBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(MGAUOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(MGADOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(MGAPOBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(MGADONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) d144 1 a144 1 OBJS = $(LOWOBJ) $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) $(HIOBJ) a146 1 #if 1 a150 3 #else UOBJS = $(OBJS) #endif a153 5 #if 0 SubdirLibraryRule(highpc.o lowpc.o) NormalLintTarget(highpc.c lowpc.c) #endif @ 1.7.4.3 log @Merge w/ 4.0 to mga-0-0-2-branch @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.16 2000/03/02 16:07:30 martin Exp $ @ 1.6 log @Merged dispatch-0-0-2 @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.10 1999/12/14 01:32:21 robin Exp $ d109 1 a109 1 OBJS += $(THREADS_LIBS) d122 1 a122 1 SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(SUBDIRS) $(DONES),$(OBJS),.,.) @ 1.5 log @Merged dispatch-0-0-1 @ text @d2 2 a3 1 XCOMM $PI: xc/lib/GL/Imakefile,v 1.11 1999/06/14 21:10:34 faith Exp $ d107 4 @ 1.5.2.1 log @added thread support @ text @d2 1 a2 2 #include a105 4 #if LocalThreads OBJS += $(THREADS_LIBS) #endif @ 1.4 log @Merge between X_3_9_16 and X_3_9_17 Compiles but may not run. @ text @d15 1 a15 1 MESADIRS = mesa/include/GL mesa/src d36 4 a39 4 DRIOBJS = dri/?*.o DRIUOBJS = dri/unshared/?*.o DRIDOBJS = dri/debugger/?*.o DRIPOBJS = dri/profiled/?*.o a41 5 DRMOBJS = dri/drm/?*.o DRMUOBJS = dri/drm/unshared/?*.o DRMDOBJS = dri/drm/debugger/?*.o DRMPOBJS = dri/drm/profiled/?*.o DRMDONES = dri/drm/DONE d50 6 d61 1 d67 14 a80 6 DRVOBJS = $(TDFXOBJS) $(MESAOBJS) DRVUOBJS = $(TDFXUOBJS) $(MESAUOBJS) DRVDOBJS = $(TDFXDOBJS) $(MESADOBJS) DRVPOBJS = $(TDFXPOBJS) $(MESAPOBJS) DRVDONES = $(TDFXDONES) $(MESADONES) REQUIREDLIBS += -lglide3x d96 1 a96 1 OBJS = $(GLXOBJS) $(DRIOBJS) $(DRMOBJS) $(DRVOBJS) d99 1 a99 1 UOBJS = $(GLXUOBJS) $(DRIUOBJS) $(DRMUOBJS) $(DRVUOBJS) d103 3 a105 3 DOBJS = $(GLXDOBJS) $(DRIDOBJS) $(DRMDOBJS) $(DRVDOBJS) POBJS = $(GLXPOBJS) $(DRIPOBJS) $(DRMPOBJS) $(DRVPOBJS) DONES = $(GLXDONES) $(DRIDONES) $(DRMDONES) $(DRVDONES) d128 1 @ 1.3 log @ Upgrade to the latest Mesa 3.2 code. Fixed several driver texture management bugs in the tdfx driver. Fix a problem with unbinding a context (performer). Included the Mesa header files in the X tree instead of making copies. @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.9 1999/07/10 07:24:35 dawes Exp $ @ 1.3.8.1 log @Added the initial r128 client-side DRI driver. This driver is not yet functional. @ text @a70 16 #elif GlxBuiltInR128 R128OBJS = mesa/src/drv/r128/?*.o R128UOBJS = mesa/src/drv/r128/unshared/?*.o R128DOBJS = mesa/src/drv/r128/debugger/?*.o R128POBJS = mesa/src/drv/r128/profiled/?*.o R128DONES = mesa/src/drv/r128/DONE MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o MESADONES = mesa/src/DONE mesa/src/X86/DONE DRVOBJS = $(R128OBJS) $(MESAOBJS) DRVUOBJS = $(R128UOBJS) $(MESAUOBJS) DRVDOBJS = $(R128DOBJS) $(MESADOBJS) DRVPOBJS = $(R128POBJS) $(MESAPOBJS) DRVDONES = $(R128DONES) $(MESADONES) @ 1.3.2.1 log @ Implementation of protocol, client support (i810) and limited server-side support for private depth and back buffers. Commit of Jeff's changes for host-specific memory types from agp. Added mga and i810 drivers to the config files. @ text @a70 42 #elif GlxBuiltInI810 I810OBJS = mesa/src/drv/i810/?*.o I810UOBJS = mesa/src/drv/i810/unshared/?*.o I810DOBJS = mesa/src/drv/i810/debugger/?*.o I810POBJS = mesa/src/drv/i810/profiled/?*.o I810DONES = mesa/src/drv/i810/DONE COMMONOBJS = mesa/src/drv/common/?*.o COMMONUOBJS = mesa/src/drv/common/unshared/?*.o COMMONDOBJS = mesa/src/drv/common/debugger/?*.o COMMONPOBJS = mesa/src/drv/common/profiled/?*.o COMMONDONES = mesa/src/drv/common/DONE MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o MESADONES = mesa/src/DONE mesa/src/X86/DONE DRVOBJS = $(I810OBJS) $(COMMONOBJS) $(MESAOBJS) DRVUOBJS = $(I810UOBJS) $(COMMONUOBJS) $(MESAUOBJS) DRVDOBJS = $(I810DOBJS) $(COMMONDOBJS) $(MESADOBJS) DRVPOBJS = $(I810POBJS) $(COMMONPOBJS) $(MESAPOBJS) DRVDONES = $(I810DONES) $(COMMONDONES) $(MESADONES) #elif GlxBuiltInMga MGAOBJS = mesa/src/drv/mga/?*.o MGAUOBJS = mesa/src/drv/mga/unshared/?*.o MGADOBJS = mesa/src/drv/mga/debugger/?*.o MGAPOBJS = mesa/src/drv/mga/profiled/?*.o MGADONES = mesa/src/drv/mga/DONE COMMONOBJS = mesa/src/drv/common/?*.o COMMONUOBJS = mesa/src/drv/common/unshared/?*.o COMMONDOBJS = mesa/src/drv/common/debugger/?*.o COMMONPOBJS = mesa/src/drv/common/profiled/?*.o COMMONDONES = mesa/src/drv/common/DONE MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o MESADONES = mesa/src/DONE mesa/src/X86/DONE DRVOBJS = $(MGAOBJS) $(COMMONOBJS) $(MESAOBJS) DRVUOBJS = $(MGAUOBJS) $(COMMONUOBJS) $(MESAUOBJS) DRVDOBJS = $(MGADOBJS) $(COMMONDOBJS) $(MESADOBJS) DRVPOBJS = $(MGAPOBJS) $(COMMONPOBJS) $(MESAPOBJS) DRVDONES = $(MGADONES) $(COMMONDONES) $(MESADONES) @ 1.3.10.1 log @restored support for built-in driver @ text @d15 1 a15 1 MESADIRS = mesa/dri mesa/include/GL mesa/src d36 4 a39 4 DRIOBJS = dri/XF86dri.o dri/dri_glx.o DRIUOBJS = dri/unshared/XF86dri.o dri/unshared/dri_glx.o DRIDOBJS = dri/debugger/XF86dri.o dri/debugger/dri_glx.o DRIPOBJS = dri/profiled/XF86dri.o dri/profiled/dri_glx.o d42 5 a54 6 DRMOBJS = dri/drm/?*.o DRMUOBJS = dri/drm/unshared/?*.o DRMDOBJS = dri/drm/debugger/?*.o DRMPOBJS = dri/drm/profiled/?*.o DRMDONES = dri/drm/DONE a59 1 d65 6 a70 14 DRIMESAOBJS = mesa/dri/?*.o DRIMESAUOBJS = mesa/dri/unshared/?*.o DRIMESADOBJS = mesa/dri/debugger/?*.o DRIMESAPOBJS = mesa/dri/profiled/?*.o DRIMESADONES = mesa/dri/DONE DRVOBJS = $(TDFXOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(TDFXUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(TDFXDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(TDFXPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(TDFXDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) REQUIREDLIBS += -lglide3x d86 1 a86 1 OBJS = $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) d89 1 a89 1 UOBJS = $(GLXUOBJS) $(DRIUOBJS) $(DRVUOBJS) d93 3 a95 3 DOBJS = $(GLXDOBJS) $(DRIDOBJS) $(DRVDOBJS) POBJS = $(GLXPOBJS) $(DRIPOBJS) $(DRVPOBJS) DONES = $(GLXDONES) $(DRIDONES) $(DRVDONES) a117 1 @ 1.3.4.1 log @ All the changes to get the trunk (which includes 3.9.17) onto the tdfx-1-1 branch. @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.10 1999/12/14 01:32:21 robin Exp $ @ 1.2 log @ First DRI release of 3dfx driver. @ text @d15 1 a15 1 MESADIRS = mesa/src @ 1.1 log @Initial revision @ text @d54 17 d72 1 d78 1 @ 1.1.1.1 log @Import XFree 3.9.16 @ text @@ 1.1.1.2 log @Import of XFree86 3.9.17 @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.10 1999/12/14 01:32:21 robin Exp $ a53 17 #elif GlxBuiltInTdfx TDFXOBJS = mesa/src/drv/tdfx/?*.o TDFXUOBJS = mesa/src/drv/tdfx/unshared/?*.o TDFXDOBJS = mesa/src/drv/tdfx/debugger/?*.o TDFXPOBJS = mesa/src/drv/tdfx/profiled/?*.o TDFXDONES = mesa/src/drv/tdfx/DONE MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o MESADONES = mesa/src/DONE mesa/src/X86/DONE DRVOBJS = $(TDFXOBJS) $(MESAOBJS) DRVUOBJS = $(TDFXUOBJS) $(MESAUOBJS) DRVDOBJS = $(TDFXDOBJS) $(MESADOBJS) DRVPOBJS = $(TDFXPOBJS) $(MESAPOBJS) DRVDONES = $(TDFXDONES) $(MESADONES) REQUIREDLIBS += -lglide3x a54 1 #ifndef GlxDriverUsesMesa a59 1 #endif @ 1.1.1.3 log @Import of XFree86 3.9.18 @ text @d1 2 a2 3 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.15 2000/02/16 17:26:30 dawes Exp $ #include d15 1 a15 1 MESADIRS = mesa/dri mesa/include/GL mesa/src d36 4 a39 4 DRIOBJS = dri/XF86dri.o dri/dri_glx.o DRIUOBJS = dri/unshared/XF86dri.o dri/unshared/dri_glx.o DRIDOBJS = dri/debugger/XF86dri.o dri/debugger/dri_glx.o DRIPOBJS = dri/profiled/XF86dri.o dri/profiled/dri_glx.o d42 5 a54 6 DRMOBJS = dri/drm/?*.o DRMUOBJS = dri/drm/unshared/?*.o DRMDOBJS = dri/drm/debugger/?*.o DRMPOBJS = dri/drm/profiled/?*.o DRMDONES = dri/drm/DONE a59 1 d65 6 a70 14 DRIMESAOBJS = mesa/dri/?*.o DRIMESAUOBJS = mesa/dri/unshared/?*.o DRIMESADOBJS = mesa/dri/debugger/?*.o DRIMESAPOBJS = mesa/dri/profiled/?*.o DRIMESADONES = mesa/dri/DONE DRVOBJS = $(TDFXOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(TDFXUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(TDFXDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(TDFXPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(TDFXDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) REQUIREDLIBS += -lglide3x d86 1 a86 1 OBJS = $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) d89 1 a89 1 UOBJS = $(GLXUOBJS) $(DRIUOBJS) $(DRVUOBJS) d93 3 a95 7 DOBJS = $(GLXDOBJS) $(DRIDOBJS) $(DRVDOBJS) POBJS = $(GLXPOBJS) $(DRIPOBJS) $(DRVPOBJS) DONES = $(GLXDONES) $(DRIDONES) $(DRVDONES) #if LocalThreads THREADOBJS = $(THREADS_LIBS) #endif d107 1 a107 1 SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(SUBDIRS) $(DONES),$(OBJS) $(THREADOBJS),.,.) a117 1 @ 1.1.1.4 log @Import of XFree86 4.0 @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.16 2000/03/02 16:07:30 martin Exp $ d45 5 a49 24 DRMOBJS = dri/drm/?*.o DRMUOBJS = dri/drm/unshared/?*.o DRMDOBJS = dri/drm/debugger/?*.o DRMPOBJS = dri/drm/profiled/?*.o DRMDONES = dri/drm/DONE GAMMAOBJS = mesa/src/drv/gamma/?*.o GAMMAUOBJS = mesa/src/drv/gamma/unshared/?*.o GAMMADOBJS = mesa/src/drv/gamma/debugger/?*.o GAMMAPOBJS = mesa/src/drv/gamma/profiled/?*.o GAMMADONES = mesa/src/drv/gamma/DONE DRIMESAOBJS = mesa/dri/?*.o DRIMESAUOBJS = mesa/dri/unshared/?*.o DRIMESADOBJS = mesa/dri/debugger/?*.o DRIMESAPOBJS = mesa/dri/profiled/?*.o DRIMESADONES = mesa/dri/DONE DRVOBJS = $(GAMMAOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(GAMMAUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(GAMMADOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(GAMMAPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(GAMMADONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) @ 1.1.1.5 log @Import of XFree86 4.0.1 @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.28 2000/06/30 19:30:16 dawes Exp $ d14 5 a18 2 LIBNAME = GL SOREV = $(SOGLREV) d24 2 a25 3 #if 0 LOWSRC = lowpc.c LOWOBJ = lowpc.o d27 2 a28 7 HISRC = highpc.c HIOBJ = highpc.o #endif #if BuildXF86DRI && defined(i386Architecture) GLAPI_OBJ = glx/glapi_x86.o #endif d31 3 a33 3 GLXUOBJS = glx/unshared/?*.o $(GLAPI_OBJ) GLXDOBJS = glx/debugger/?*.o $(GLAPI_OBJ) GLXPOBJS = glx/profiled/?*.o $(GLAPI_OBJ) d43 2 d51 5 a55 25 #ifdef i386Architecture ASM_OBJS = mesa/src/X86/common_x86asm.o \ mesa/src/X86/mmx_blend.o \ mesa/src/X86/vertex.o \ mesa/src/X86/x86a.o #ifdef MesaUse3DNow ASM_OBJS += mesa/src/X86/3dnow_norm.o \ mesa/src/X86/3dnow_norm_raw.o \ mesa/src/X86/3dnow_xform_masked1.o \ mesa/src/X86/3dnow_xform_masked2.o \ mesa/src/X86/3dnow_xform_masked3.o \ mesa/src/X86/3dnow_xform_masked4.o \ mesa/src/X86/3dnow_xform_raw1.o \ mesa/src/X86/3dnow_xform_raw2.o \ mesa/src/X86/3dnow_xform_raw3.o \ mesa/src/X86/3dnow_xform_raw4.o \ mesa/src/X86/vertex_3dnow.o #endif #endif MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o $(ASM_OBJS) MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o $(ASM_OBJS) MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o $(ASM_OBJS) MESADONES = mesa/src/DONE mesa/src/X86/DONE a62 19 COMMONOBJS = mesa/src/drv/common/?*.o COMMONUOBJS = mesa/src/drv/common/unshared/?*.o COMMONDOBJS = mesa/src/drv/common/debugger/?*.o COMMONPOBJS = mesa/src/drv/common/profiled/?*.o COMMONDONES = mesa/src/drv/common/DONE #if GlxUseSGISI XCOMM nothing #elif GlxBuiltInGamma GAMMAOBJS = mesa/src/drv/gamma/?*.o GAMMAUOBJS = mesa/src/drv/gamma/unshared/?*.o GAMMADOBJS = mesa/src/drv/gamma/debugger/?*.o GAMMAPOBJS = mesa/src/drv/gamma/profiled/?*.o GAMMADONES = mesa/src/drv/gamma/DONE a68 2 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/gamma d70 5 d82 12 d100 1 a100 84 REQUIREDLIBS += -lglide3x -ldl GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/tdfx #elif GlxBuiltInI810 I810OBJS = mesa/src/drv/i810/?*.o I810UOBJS = mesa/src/drv/i810/unshared/?*.o I810DOBJS = mesa/src/drv/i810/debugger/?*.o I810POBJS = mesa/src/drv/i810/profiled/?*.o I810DONES = mesa/src/drv/i810/DONE DRVOBJS = $(I810OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(I810UOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(I810DOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(I810POBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(I810DONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/i810 #elif GlxBuiltInMga MGAOBJS = mesa/src/drv/mga/?*.o MGAUOBJS = mesa/src/drv/mga/unshared/?*.o MGADOBJS = mesa/src/drv/mga/debugger/?*.o MGAPOBJS = mesa/src/drv/mga/profiled/?*.o MGADONES = mesa/src/drv/mga/DONE DRVOBJS = $(MGAOBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(MGAUOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(MGADOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(MGAPOBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(MGADONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/mga #elif GlxBuiltInR128 R128OBJS = mesa/src/drv/r128/?*.o R128UOBJS = mesa/src/drv/r128/unshared/?*.o R128DOBJS = mesa/src/drv/r128/debugger/?*.o R128POBJS = mesa/src/drv/r128/profiled/?*.o R128DONES = mesa/src/drv/r128/DONE DRVOBJS = $(R128OBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(R128UOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(R128DOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(R128POBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(R128DONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/r128 #elif GlxBuiltInFfb FFBOBJS = mesa/src/drv/ffb/?*.o FFBUOBJS = mesa/src/drv/ffb/unshared/?*.o FFBDOBJS = mesa/src/drv/ffb/debugger/?*.o FFBPOBJS = mesa/src/drv/ffb/profiled/?*.o FFBDONES = mesa/src/drv/ffb/DONE DRVOBJS = $(FFBOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(FFBUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(FFBDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(FFBPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(FFBDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/ffb #elif GlxBuiltInSIS SISOBJS = mesa/src/drv/sis/?*.o SISUOBJS = mesa/src/drv/sis/unshared/?*.o SISDOBJS = mesa/src/drv/sis/debugger/?*.o SISPOBJS = mesa/src/drv/sis/profiled/?*.o SISDONES = mesa/src/drv/sis/DONE DRVOBJS = $(SISOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(SISUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(SISDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(SISPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(SISDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/sis a101 1 d103 5 a107 7 DRVOBJS = mesa/src/?*.o DRVUOBJS = mesa/src/unshared/?*.o DRVDOBJS = mesa/src/debugger/?*.o DRVPOBJS = mesa/src/profiled/?*.o DRVDONES = mesa/src/DONE GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src a108 6 #else XCOMM No built-in drivers. This is the usual case. GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src a109 6 #else XCOMM BuildXF86DRI was not defined. Just build an indirect-only libGL. GLXSUBDIRS = glx a110 4 #if !GlxUseSGISI && (!GlxBuiltInMesa || !defined(GlxDriverUsesMesa)) MakeSubdirs($(GLXSUBDIRS)) a112 1 d116 1 a116 1 OBJS = $(LOWOBJ) $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) $(HIOBJ) a117 1 a118 1 #if 1 a122 4 #else UOBJS = $(OBJS) #endif a126 5 #if 0 SubdirLibraryRule(highpc.o lowpc.o) NormalLintTarget(highpc.c lowpc.c) #endif a130 8 #if HasParallelMake MakeMutex($(GLXSUBDIRS) $(DONES)) #endif #if HasGnuMake || HasBsdMake $(DONES): $(GLXSUBDIRS) #endif a135 1 d137 1 a137 1 NormalDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(UOBJS)) d141 1 a141 1 SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(GLXSUBDIRS) $(DONES),$(OBJS) $(THREADOBJS),.,.) a142 7 #if LinkGLToUsrLib && AlternateUsrLibDir install:: $(RM) $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so $(LN) $(SHLIBDIR)/lib$(LIBNAME).so $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so $(RM) $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 $(LN) $(SHLIBDIR)/lib$(LIBNAME).so.1 $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 #endif d145 1 a145 1 DebuggedDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(DOBJS)) d149 1 a149 1 ProfiledDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(POBJS)) a152 30 XCOMM libOSmesa needs libGL, so build it now #if BuildXF86DRI && !GlxUseSGISI && (!GlxBuiltInMesa || !defined(GlxDriverUsesMesa)) OSMESASUBDIRS = mesa/src/OSmesa MakeSubdirs($(OSMESASUBDIRS)) #endif XCOMM libGL has now been made, continue with building the drivers. #if BuildXF86DRI && \ !GlxUseSGISI && \ !GlxBuiltInGamma && \ !GlxBuiltInTdfx && \ !GlxBuiltInI810 && \ !GlxBuiltInMga && \ !GlxBuiltInR128 && \ !GlxBuiltInFfb && \ !GlxBuiltInSIS && \ !GlxBuiltInMesa DRIVERSUBDIRS = mesa/src/drv MakeSubdirs($(DRIVERSUBDIRS)) #endif SUBDIRS = $(GLXSUBDIRS) $(OSMESASUBDIRS) $(DRIVERSUBDIRS) DependSubdirs($(SUBDIRS)) @ 1.1.1.6 log @Import of XFree86 4.0.1b @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.29 2000/07/02 19:23:34 dawes Exp $ a292 1 MakeDir($(DESTDIR)$(SYSTEMUSRLIBDIR)) @ 1.1.1.7 log @Import of XFree86 4.0.1d-pre @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.30 2000/08/25 13:42:19 dawes Exp $ d21 3 a23 6 XCOMM XCOMM Not related to ProfileLibGlx - I dont know how that works. KW. XCOMM #ifdef GlxSoProf PROFSRC = lowpc.c highpc.c PROFOBJ = lowpc.o highpc.o d25 2 a26 2 SubdirLibraryRule($(PROFOBJ)) NormalLintTarget($(PROFSRC)) d72 5 a76 13 #ifdef i386Architecture MESAARCHOBJS = mesa/src/X86/?*.o MESAARCHUOBJS = mesa/src/X86/unshared/?*.o $(ASM_OBJS) MESAARCHDOBJS = mesa/src/X86/debugger/?*.o $(ASM_OBJS) MESAARCHPOBJS = mesa/src/X86/profiled/?*.o $(ASM_OBJS) MESAARCHDONES = mesa/src/X86/DONE #endif MESAOBJS = mesa/src/?*.o $(MESAARCHOBJS) MESAUOBJS = mesa/src/unshared/?*.o $(MESAARCHUOBJS) MESADOBJS = mesa/src/debugger/?*.o $(MESAARCHDOBJS) MESAPOBJS = mesa/src/profiled/?*.o $(MESAARCHPOBJS) MESADONES = mesa/src/DONE $(MESAARCHDONES) d125 1 a125 1 REQUIREDLIBS += -lglide3 -ldl d244 1 a244 1 OBJS = $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) d248 1 d253 3 d260 5 @ 1.1.1.8 log @Import of XFree86 4.0.1d-pre (2) @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.31 2000/08/28 16:04:47 dawes Exp $ @ 1.1.1.9 log @Import of XFree86 4.0.1d @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.32 2000/09/24 13:50:59 alanh Exp $ a5 1 a54 1 MESAOBJS = mesa/src/?*.o d73 15 a87 21 #ifdef MesaUseKatmai ASM_OBJS += mesa/src/X86/katmai_norm.o \ mesa/src/X86/katmai_norm_raw.o \ mesa/src/X86/katmai_xform_masked1.o \ mesa/src/X86/katmai_xform_masked2.o \ mesa/src/X86/katmai_xform_masked3.o \ mesa/src/X86/katmai_xform_masked4.o \ mesa/src/X86/katmai_xform_raw1.o \ mesa/src/X86/katmai_xform_raw2.o \ mesa/src/X86/katmai_xform_raw3.o \ mesa/src/X86/katmai_xform_raw4.o \ mesa/src/X86/vertex_katmai.o #endif MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o #endif MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o $(ASM_OBJS) MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o $(ASM_OBJS) MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o $(ASM_OBJS) MESADONES = mesa/src/DONE mesa/src/X86/DONE d164 5 a168 5 DRVOBJS = $(MGAOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(MGAUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(MGADOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(MGAPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(MGADONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) d297 1 a297 1 $(LN) $(SHLIBDIR)/lib$(LIBNAME).so $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so || true d299 1 a299 1 $(LN) $(SHLIBDIR)/lib$(LIBNAME).so.1 $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 || true @ 1.1.1.10 log @Import of XFree86 4.0.1f @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.33 2000/11/13 23:31:22 dawes Exp $ d34 1 a34 1 GLAPI_OBJ = glx/glapi_x86.o d37 5 a41 5 GLXOBJS = glx/?*.o GLXUOBJS = glx/unshared/?*.o $(GLAPI_OBJ) GLXDOBJS = glx/debugger/?*.o $(GLAPI_OBJ) GLXPOBJS = glx/profiled/?*.o $(GLAPI_OBJ) GLXDONES = glx/DONE d44 11 a54 11 DRIOBJS = dri/XF86dri.o dri/dri_glx.o DRIUOBJS = dri/unshared/XF86dri.o dri/unshared/dri_glx.o DRIDOBJS = dri/debugger/XF86dri.o dri/debugger/dri_glx.o DRIPOBJS = dri/profiled/XF86dri.o dri/profiled/dri_glx.o DRIDONES = dri/DONE DRMOBJS = dri/drm/?*.o DRMUOBJS = dri/drm/unshared/?*.o DRMDOBJS = dri/drm/debugger/?*.o DRMPOBJS = dri/drm/profiled/?*.o DRMDONES = dri/drm/DONE d56 1 a56 1 MESAOBJS = mesa/src/?*.o d58 4 a61 10 ASM_OBJS = mesa/src/X86/common_x86_asm.o \ mesa/src/X86/x86_cliptest.o \ mesa/src/X86/x86_vertex.o \ mesa/src/X86/x86_xform_masked2.o \ mesa/src/X86/x86_xform_masked3.o \ mesa/src/X86/x86_xform_masked4.o \ mesa/src/X86/x86_xform_raw2.o \ mesa/src/X86/x86_xform_raw3.o \ mesa/src/X86/x86_xform_raw4.o \ mesa/src/X86/mmx_blend.o d63 2 a64 2 ASM_OBJS += mesa/src/X86/3dnow_norm_raw.o \ mesa/src/X86/3dnow_vertex.o \ d72 2 a73 1 mesa/src/X86/3dnow_xform_raw4.o d76 2 a77 2 ASM_OBJS += mesa/src/X86/katmai_norm_raw.o \ mesa/src/X86/katmai_vertex.o \ d85 2 a86 1 mesa/src/X86/katmai_xform_raw4.o @ 1.1.1.11 log @Import of XFree86 4.0.2 @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.34 2000/12/12 23:24:26 dawes Exp $ d58 1 a58 1 ASM_BASE_OBJS = mesa/src/X86/common_x86_asm.o \ d66 4 a69 8 mesa/src/X86/x86_xform_raw4.o #if MesaUseMMX MMX_OBJS = mesa/src/X86/mmx_blend.o #endif #if MesaUse3DNow 3DNOW_OBJS = mesa/src/X86/3dnow_norm_raw.o \ d80 2 a81 2 #if MesaUseKatmai KATMAI_OBJS = mesa/src/X86/katmai_norm_raw.o \ a91 2 ASM_OBJS = $(ASM_BASE_OBJS) $(MMX_OBJS) $(3DNOW_OBJS) $(KATMAI_OBJS) @ 1.1.1.12 log @Import of XFree86 4.0.99.1 @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.35 2001/01/08 01:07:16 martin Exp $ d132 1 a132 1 DRVOBJS = $(GAMMAOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d138 1 a138 2 DRVSUBDIRS = mesa/src/drv/gamma GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d148 1 a148 1 DRVOBJS = $(TDFXOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d156 1 a156 2 DRVSUBDIRS = mesa/src/drv/tdfx GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d166 1 a166 1 DRVOBJS = $(I810OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d172 1 a172 2 DRVSUBDIRS = mesa/src/drv/i810 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d182 1 a182 1 DRVOBJS = $(MGAOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d188 1 a188 2 DRVSUBDIRS = mesa/src/drv/mga GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d198 5 a202 22 DRVOBJS = $(R128OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(R128UOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(R128DOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(R128POBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(R128DONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) DRVSUBDIRS = mesa/src/drv/common mesa/src/drv/r128 GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) #elif GlxBuiltInRadeon RADEONOBJS = mesa/src/drv/radeon/?*.o RADEONUOBJS = mesa/src/drv/radeon/unshared/?*.o RADEONDOBJS = mesa/src/drv/radeon/debugger/?*.o RADEONPOBJS = mesa/src/drv/radeon/profiled/?*.o RADEONDONES = mesa/src/drv/radeon/DONE DRVOBJS = $(RADEONOBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) DRVUOBJS = $(RADEONUOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS) DRVDOBJS = $(RADEONDOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(RADEONPOBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(RADEONDONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) d204 1 a204 2 DRVSUBDIRS = mesa/src/drv/common mesa/src/drv/radeon GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d220 1 a220 2 DRVSUBDIRS = mesa/src/drv/ffb GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) d230 1 a230 1 DRVOBJS = $(SISOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS) d236 1 a236 2 DRVSUBDIRS = mesa/src/drv/sis GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src $(DRVSUBDIRS) a345 1 !GlxBuiltInRadeon && \ @ 1.1.1.13 log @Import -f XFree86 4.0.99.2 @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.37 2001/03/23 20:56:28 dawes Exp $ d9 5 a13 2 LIBGLBUILDDIR = GL GLXDIRS = glx d15 16 a30 4 #if BuildXF86DRI && !GlxUseSGISI && \ (!GlxBuiltInMesa || !defined(GlxDriverUsesMesa)) MESADIRS = mesa/src OSMESADIRS = mesa/src/OSmesa d33 10 d44 51 a94 3 DRIDIRS = dri mesa/dri MESADIRS = mesa/src DRIVERDIRS = mesa/src/drv d97 205 a301 2 #if GlxUseBuiltInDRIDriver SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) d303 1 a303 1 SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS) d306 76 a381 1 MakeSubdirs($(SUBDIRS)) a383 1 @ 1.1.1.14 log @Import of XFree86 4.2.99.2 @ text @d1 1 a1 51 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.40 2002/02/27 00:51:14 dawes Exp $ XCOMM XCOMM Imake tokens which are significant to building libGL: XCOMM XCOMM BuildGLXLibrary - if defined, build libs in xc/lib/GL and xc/lib/GLw XCOMM XCOMM BuildXF86DRI - if defined, build libGL with DRI capability XCOMM XCOMM Only zero or one of the following can be defined at once: XCOMM GlxBuiltInGamma - if defined, build gamma_dri.so driver into libGL XCOMM GlxBuiltInTdfx - if defined, build tdfx_dri.so driver into libGL XCOMM GlxBuiltInMga - if defined, build mga_dri.so driver into libGL XCOMM GlxBuiltInI810 - if defined, build i810_dri.so driver into libGL XCOMM GlxBuiltInR128 - if defined, build r128_dri.so driver into libGL XCOMM GlxBuiltInRadeon - if defined, build radeon_dri.so driver into libGL XCOMM GlxBuiltInFfb - if defined, build ffb_dri.so driver into libGL XCOMM GlxBuiltInSIS - if defined, build sis_dri.so driver into libGL XCOMM XCOMM GlxUseBuiltInDRIDriver - automatically defined if any of the XCOMM GlxBuiltIn[Gamma,Tdfx,Mga,I810,R128,Radeon,Ffb,SIS] tokens is defined XCOMM XCOMM GlxBuiltInXMesa - if defined, build XMesa (Xlib Mesa driver) into libGL XCOMM to enable rendering to displays that lack the GLX extension. XCOMM XCOMM GlxDriverUsesMesa - will be defined if building a DRI driver into XCOMM libGL and it uses Mesa. XCOMM XCOMM GlxUseSGISI - if defined, use the SGI OpenGL Sample Implementation XCOMM to build the GLX server extension (not fully implemented yet). XCOMM XCOMM NormalLibGlx - if defined, build static libGL.a library XCOMM XCOMM SharedLibGlx - if defined, build dynamic libGL.so library XCOMM XCOMM DebugLibGlx - if defined, build libGL with debug info XCOMM XCOMM ProfileLibGlx - if defined, build libGL with profiling info XCOMM XCOMM SharedGlxRev - dynamic library version, currently defined to be "1.2" XCOMM XCOMM GlxSoProf - if defined, build dynamic libGL for profiling with soprof XCOMM XCOMM GlxStubLib - purpose??? XCOMM XCOMM XCOMM Server-side tokens: XCOMM BuildGlxExt XCOMM GlxUseSGISI d12 2 a13 9 /* * Need to build the Mesa + XMesa source in the following cases: * BuildXF86DRI && defined(DriDrivers) * GlxDriverUsesMesa * GlxBuiltInXMesa * BuildOSMesaLib */ #if (BuildXF86DRI && defined(DriDrivers)) || \ GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib a14 7 #endif /* * Only need the OSmesa code in the following case: * BuildOSMesaLib */ #if BuildOSMesaLib a17 4 /* * Need to build the DRI code in the following cases: * BuildXF86DRI */ d19 2 a20 8 DRIDIRS = dri #endif /* * Need to build the DRI drivers in the following cases: * BuildXF86DRI && defined(DriDrivers) */ #if BuildXF86DRI && defined(DriDrivers) a23 5 /* * The build order depends on whether the drivers are loaded into libGL or * built-in to libGL. In the former case, libGL needs to be built before * the drivers, and in the latter case, it needs to be built after the driver. */ @ 1.1.1.15 log @XFree86 4.3.0 merge @ text @d1 1 a1 1 XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.41 2002/11/22 22:55:57 tsi Exp $ a16 1 XCOMM GlxBuiltInR200 - if defined, build r200_dri.so driver into libGL d21 1 a21 2 XCOMM GlxBuiltIn[Gamma,Tdfx,Mga,I810,R128,Radeon,R200,Ffb,SIS] tokens is XCOMM defined d69 2 a70 3 #if BuildOSMesaLib || \ (BuildXF86DRI && \ (defined(DriDrivers) || GlxDriverUsesMesa || GlxBuiltInXMesa)) d103 1 a103 1 #if BuildXF86DRI && GlxUseBuiltInDRIDriver @