Module Name: src
Committed By: mrg
Date: Tue Jun 16 00:26:11 UTC 2009
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/xfont: mi
src/distrib/sets/lists/xserver: md.alpha md.amd64 md.i386 md.macppc
md.sparc md.sparc64
src/external/mit/xorg/lib/dri: Makefile dri.mk
src/external/mit/xorg/lib/libGL: Makefile.mesa
src/external/mit/xorg/lib/libOSMesa: libmesa.mk
Added Files:
src/external/mit/xorg/lib/dri/swrast: Makefile
Log Message:
- build and install swrast_dri.so
- don't force linking dri_util.c into swrast_dri.so
- fix the source lists in libGL/OSmesa makefiles
- unobsolete the symbols/pc keymap and 7x14-KOI8-R.pcf.gz font
XXX the libGL/OSmesa makefiles could use some reorg. there
XXX are a bunch of duplicated items.
To generate a diff of this commit:
cvs rdiff -u -r1.816 -r1.817 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/xfont/mi
cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/xserver/md.alpha
cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/xserver/md.amd64 \
src/distrib/sets/lists/xserver/md.macppc
cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/xserver/md.sparc
cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/xserver/md.sparc64
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/dri/dri.mk
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/dri/swrast/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/lib/libGL/Makefile.mesa
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libOSMesa/libmesa.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.816 src/distrib/sets/lists/base/mi:1.817
--- src/distrib/sets/lists/base/mi:1.816 Thu Jun 11 06:18:12 2009
+++ src/distrib/sets/lists/base/mi Tue Jun 16 00:26:10 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.816 2009/06/11 06:18:12 mrg Exp $
+# $NetBSD: mi,v 1.817 2009/06/16 00:26:10 mrg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -626,7 +626,7 @@
./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr base-x11-root
./usr/X11R7/lib/X11/xkb/symbols/nec -obsolete- obsolete
./usr/X11R7/lib/X11/xkb/symbols/nec_vndr base-x11-root
-./usr/X11R7/lib/X11/xkb/symbols/pc -obsolete- obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc base-x11-root
./usr/X11R7/lib/X11/xkb/symbols/sgi -obsolete- obsolete
./usr/X11R7/lib/X11/xkb/symbols/sgi_vndr base-x11-root
./usr/X11R7/lib/X11/xkb/symbols/sharp -obsolete- obsolete
Index: src/distrib/sets/lists/xfont/mi
diff -u src/distrib/sets/lists/xfont/mi:1.34 src/distrib/sets/lists/xfont/mi:1.35
--- src/distrib/sets/lists/xfont/mi:1.34 Sun Jan 25 23:11:16 2009
+++ src/distrib/sets/lists/xfont/mi Tue Jun 16 00:26:11 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.34 2009/01/25 23:11:16 tron Exp $
+# $NetBSD: mi,v 1.35 2009/06/16 00:26:11 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -8640,7 +8640,7 @@
./usr/X11R7/lib/X11/fonts/misc/7x14-ISO8859-8.pcf.gz xfont share,xorg
./usr/X11R7/lib/X11/fonts/misc/7x14-ISO8859-9.pcf.gz xfont share,xorg
./usr/X11R7/lib/X11/fonts/misc/7x14-JISX0201.1976-0.pcf.gz xfont share,xorg
-./usr/X11R7/lib/X11/fonts/misc/7x14-KOI8-R.pcf.gz xfont-obsolete share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/7x14-KOI8-R.pcf.gz xfont share,xorg
./usr/X11R7/lib/X11/fonts/misc/7x14.pcf.gz xfont share,xorg
./usr/X11R7/lib/X11/fonts/misc/7x14B-ISO8859-1.pcf.gz xfont share,xorg
./usr/X11R7/lib/X11/fonts/misc/7x14B-ISO8859-10.pcf.gz xfont share,xorg
Index: src/distrib/sets/lists/xserver/md.alpha
diff -u src/distrib/sets/lists/xserver/md.alpha:1.18 src/distrib/sets/lists/xserver/md.alpha:1.19
--- src/distrib/sets/lists/xserver/md.alpha:1.18 Fri Jun 12 02:14:42 2009
+++ src/distrib/sets/lists/xserver/md.alpha Tue Jun 16 00:26:11 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.18 2009/06/12 02:14:42 mrg Exp $
+# $NetBSD: md.alpha,v 1.19 2009/06/16 00:26:11 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XalphaNetBSD -unknown- x11
./usr/X11R6/bin/XdecNetBSD -unknown- x11
@@ -33,6 +33,8 @@
./usr/X11R7/lib/modules/dri/savage_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/sis_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/sis_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/swrast_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/swrast_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/tdfx_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/tdfx_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/trident_dri.so -unknown- xorg
Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.47 src/distrib/sets/lists/xserver/md.amd64:1.48
--- src/distrib/sets/lists/xserver/md.amd64:1.47 Fri Jun 12 01:55:59 2009
+++ src/distrib/sets/lists/xserver/md.amd64 Tue Jun 16 00:26:11 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.47 2009/06/12 01:55:59 mrg Exp $
+# $NetBSD: md.amd64,v 1.48 2009/06/16 00:26:11 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -380,6 +380,8 @@
./usr/X11R7/lib/modules/dri/savage_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/sis_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/sis_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/swrast_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/swrast_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/tdfx_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/tdfx_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/trident_dri.so -unknown- xorg
Index: src/distrib/sets/lists/xserver/md.macppc
diff -u src/distrib/sets/lists/xserver/md.macppc:1.47 src/distrib/sets/lists/xserver/md.macppc:1.48
--- src/distrib/sets/lists/xserver/md.macppc:1.47 Fri Jun 12 02:14:42 2009
+++ src/distrib/sets/lists/xserver/md.macppc Tue Jun 16 00:26:11 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.47 2009/06/12 02:14:42 mrg Exp $
+# $NetBSD: md.macppc,v 1.48 2009/06/16 00:26:11 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/Xmacppc -unknown- x11
@@ -331,6 +331,8 @@
./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/radeon_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/swrast_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/swrast_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/tdfx_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/tdfx_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so -unknown- xorg
Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.65 src/distrib/sets/lists/xserver/md.i386:1.66
--- src/distrib/sets/lists/xserver/md.i386:1.65 Fri Jun 12 02:14:42 2009
+++ src/distrib/sets/lists/xserver/md.i386 Tue Jun 16 00:26:11 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.65 2009/06/12 02:14:42 mrg Exp $
+# $NetBSD: md.i386,v 1.66 2009/06/16 00:26:11 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -451,6 +451,8 @@
./usr/X11R7/lib/modules/dri/savage_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/sis_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/sis_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/swrast_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/swrast_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/tdfx_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/tdfx_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/trident_dri.so -unknown- xorg
@@ -586,11 +588,11 @@
./usr/X11R7/lib/modules/extensions/libextmod.so.0 -unknown- xorg
./usr/X11R7/lib/modules/extensions/libextmod_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/extensions/libextmod_pic.a -unknown- xorg
-./usr/X11R7/lib/modules/extensions/libglx.a -unknown- obsolete
-./usr/X11R7/lib/modules/extensions/libglx.so -unknown- obsolete
-./usr/X11R7/lib/modules/extensions/libglx.so.0 -unknown- obsolete
-./usr/X11R7/lib/modules/extensions/libglx_g.a -unknown- obsolete
-./usr/X11R7/lib/modules/extensions/libglx_pic.a -unknown- obsolete
+./usr/X11R7/lib/modules/extensions/libglx.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libglx_pic.a -unknown- xorg
./usr/X11R7/lib/modules/extensions/libmfb.a -unknown- obsolete
./usr/X11R7/lib/modules/extensions/libmfb.so -unknown- obsolete
./usr/X11R7/lib/modules/extensions/libmfb.so.0 -unknown- obsolete
@@ -707,7 +709,7 @@
./usr/X11R7/man/cat4/i128.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/i740.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/imstt.0 -unknown- obsolete
-./usr/X11R7/man/cat4/intel.0 -unknown- obsolete
+./usr/X11R7/man/cat4/intel.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mga.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
Index: src/distrib/sets/lists/xserver/md.sparc
diff -u src/distrib/sets/lists/xserver/md.sparc:1.34 src/distrib/sets/lists/xserver/md.sparc:1.35
--- src/distrib/sets/lists/xserver/md.sparc:1.34 Fri Jun 12 01:55:59 2009
+++ src/distrib/sets/lists/xserver/md.sparc Tue Jun 16 00:26:11 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.34 2009/06/12 01:55:59 mrg Exp $
+# $NetBSD: md.sparc,v 1.35 2009/06/16 00:26:11 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/Xsun -unknown- x11
@@ -300,6 +300,8 @@
./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/radeon_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/swrast_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/swrast_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ag10e_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ag10e_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so -unknown- xorg
Index: src/distrib/sets/lists/xserver/md.sparc64
diff -u src/distrib/sets/lists/xserver/md.sparc64:1.32 src/distrib/sets/lists/xserver/md.sparc64:1.33
--- src/distrib/sets/lists/xserver/md.sparc64:1.32 Fri Jun 12 01:55:59 2009
+++ src/distrib/sets/lists/xserver/md.sparc64 Tue Jun 16 00:26:11 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.32 2009/06/12 01:55:59 mrg Exp $ x11
+# $NetBSD: md.sparc64,v 1.33 2009/06/16 00:26:11 mrg Exp $ x11
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/Xsun -unknown- x11
@@ -299,6 +299,8 @@
./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/radeon_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/swrast_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/swrast_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ag10e_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ag10e_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so -unknown- xorg
Index: src/external/mit/xorg/lib/dri/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.11 src/external/mit/xorg/lib/dri/Makefile:1.12
--- src/external/mit/xorg/lib/dri/Makefile:1.11 Sun Mar 1 02:20:51 2009
+++ src/external/mit/xorg/lib/dri/Makefile Tue Jun 16 00:26:11 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/03/01 02:20:51 macallan Exp $
+# $NetBSD: Makefile,v 1.12 2009/06/16 00:26:11 mrg Exp $
.if ${MACHINE_ARCH} == "alpha"
SUBDIR= libmesa .WAIT
@@ -15,4 +15,8 @@
savage sis tdfx trident unichrome
.endif
+.if !empty(SUBDIR)
+SUBDIR+= swrast
+.endif
+
.include <bsd.subdir.mk>
Index: src/external/mit/xorg/lib/dri/dri.mk
diff -u src/external/mit/xorg/lib/dri/dri.mk:1.5 src/external/mit/xorg/lib/dri/dri.mk:1.6
--- src/external/mit/xorg/lib/dri/dri.mk:1.5 Sun Feb 15 19:00:22 2009
+++ src/external/mit/xorg/lib/dri/dri.mk Tue Jun 16 00:26:11 2009
@@ -1,4 +1,4 @@
-# $NetBSD: dri.mk,v 1.5 2009/02/15 19:00:22 mrg Exp $
+# $NetBSD: dri.mk,v 1.6 2009/06/16 00:26:11 mrg Exp $
# XXX DRI_LIB_DEPS
@@ -29,7 +29,10 @@
# Common sources
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common \
${X11SRCDIR.MesaLib}/src/mesa/drivers/common
-SRCS+= dri_util.c drirenderbuffer.c driverfuncs.c texmem.c utils.c vblank.c \
+.if (${MODULE} != "swrast")
+SRCS+= dri_util.c
+.endif
+SRCS+= drirenderbuffer.c driverfuncs.c texmem.c utils.c vblank.c \
xmlconfig.c
.include <bsd.x11.mk>
Index: src/external/mit/xorg/lib/libGL/Makefile.mesa
diff -u src/external/mit/xorg/lib/libGL/Makefile.mesa:1.1.1.1 src/external/mit/xorg/lib/libGL/Makefile.mesa:1.2
--- src/external/mit/xorg/lib/libGL/Makefile.mesa:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/lib/libGL/Makefile.mesa Tue Jun 16 00:26:11 2009
@@ -1,17 +1,78 @@
-SRCS.mesa= accum.c api_arrayelt.c api_loopback.c api_noop.c \
- api_validate.c attrib.c arrayobj.c blend.c bufferobj.c \
- buffers.c clip.c colortab.c context.c convolve.c \
- debug.c depth.c depthstencil.c dispatch.c dlist.c \
- drawpix.c enable.c enums.c eval.c execmem.c extensions.c \
- fbobject.c feedback.c fog.c framebuffer.c get.c \
- getstring.c hash.c hint.c histogram.c image.c imports.c \
- light.c lines.c matrix.c mipmap.c mm.c occlude.c \
- pixel.c points.c polygon.c rastpos.c rbadaptors.c \
- renderbuffer.c state.c stencil.c texcompress.c \
- texcompress_fxt1.c texcompress_s3tc.c texenvprogram.c \
- texformat.c teximage.c texobj.c texrender.c texstate.c \
- texstore.c varray.c vtxfmt.c
+SRCS.mesa= api_arrayelt.c \
+ api_exec.c \
+ api_loopback.c \
+ api_noop.c \
+ api_validate.c \
+ accum.c \
+ attrib.c \
+ arrayobj.c \
+ blend.c \
+ bufferobj.c \
+ buffers.c \
+ clear.c \
+ clip.c \
+ colortab.c \
+ context.c \
+ convolve.c \
+ debug.c \
+ depth.c \
+ depthstencil.c \
+ dlist.c \
+ dlopen.c \
+ drawpix.c \
+ enable.c \
+ enums.c \
+ MESAeval.c \
+ execmem.c \
+ extensions.c \
+ fbobject.c \
+ feedback.c \
+ ffvertex_prog.c \
+ fog.c \
+ framebuffer.c \
+ get.c \
+ getstring.c \
+ hash.c \
+ hint.c \
+ histogram.c \
+ image.c \
+ imports.c \
+ light.c \
+ lines.c \
+ matrix.c \
+ mipmap.c \
+ mm.c \
+ multisample.c \
+ MESApixel.c \
+ pixelstore.c \
+ points.c \
+ polygon.c \
+ queryobj.c \
+ rastpos.c \
+ rbadaptors.c \
+ readpix.c \
+ renderbuffer.c \
+ scissor.c \
+ shaders.c \
+ state.c \
+ stencil.c \
+ texcompress.c \
+ texcompress_s3tc.c \
+ texcompress_fxt1.c \
+ texenv.c \
+ texenvprogram.c \
+ texformat.c \
+ texgen.c \
+ teximage.c \
+ texobj.c \
+ texparam.c \
+ texrender.c \
+ texstate.c \
+ texstore.c \
+ varray.c \
+ vtxfmt.c
+
# XXX avoid source name clashes with glx
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/main
@@ -22,36 +83,76 @@
# math
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/math
-SRCS.math= m_debug_clip.c m_debug_norm.c m_debug_xform.c m_eval.c \
- m_matrix.c m_translate.c m_vector.c m_xform.c
+SRCS.math= m_debug_clip.c \
+ m_debug_norm.c \
+ m_debug_xform.c \
+ m_eval.c \
+ m_matrix.c \
+ m_translate.c \
+ m_vector.c \
+ m_xform.c
# swrast
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/swrast
-SRCS.swrast= s_aaline.c s_aatriangle.c s_accum.c s_alpha.c \
- s_arbshader.c s_atifragshader.c s_bitmap.c \
- s_blend.c s_blit.c s_buffers.c s_context.c \
- s_copypix.c s_depth.c s_drawpix.c s_feedback.c \
- s_fog.c s_imaging.c s_lines.c s_logic.c \
- s_masking.c s_nvfragprog.c s_points.c s_readpix.c \
- s_span.c s_stencil.c s_texcombine.c s_texfilter.c \
- s_texstore.c s_triangle.c s_zoom.c
+SRCS.swrast= _aaline.c \
+ s_aatriangle.c \
+ s_accum.c \
+ s_alpha.c \
+ s_atifragshader.c \
+ s_bitmap.c \
+ s_blend.c \
+ s_blit.c \
+ s_buffers.c \
+ s_copypix.c \
+ s_context.c \
+ s_depth.c \
+ s_drawpix.c \
+ s_feedback.c \
+ s_fog.c \
+ s_fragprog.c \
+ s_imaging.c \
+ s_lines.c \
+ s_logic.c \
+ s_masking.c \
+ s_points.c \
+ s_readpix.c \
+ s_span.c \
+ s_stencil.c \
+ s_texcombine.c \
+ s_texfilter.c \
+ s_texstore.c \
+ s_triangle.c \
+ s_zoom.c
# swrast_setup
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/swrast_setup
-SRCS.ss= ss_context.c ss_triangle.c
+SRCS.ss= ss_context.c \
+ ss_triangle.c
# tnl
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/tnl
-SRCS.tnl= t_context.c t_pipeline.c t_vb_arbprogram.c \
- t_vb_arbprogram_sse.c t_vb_arbshader.c \
- t_vb_cull.c t_vb_fog.c t_vb_light.c t_vb_normals.c \
- t_vb_points.c t_vb_program.c t_vb_render.c \
- t_vb_texgen.c t_vb_texmat.c t_vb_vertex.c \
- t_vertex.c t_vertex_generic.c t_vertex_sse.c \
- t_vp_build.c
+SRCS.tnl= t_context.c \
+ t_pipeline.c \
+ t_draw.c \
+ t_rasterpos.c \
+ t_vb_program.c \
+ t_vb_render.c \
+ t_vb_texgen.c \
+ t_vb_texmat.c \
+ t_vb_vertex.c \
+ t_vb_cull.c \
+ t_vb_fog.c \
+ t_vb_light.c \
+ t_vb_normals.c
+ t_vb_points.c \
+ t_vp_build.c \
+ t_vertex.c \
+ t_vertex_sse.c \
+ t_vertex_generic.c
+
.for fn in ${SRCS.glx} ${SRCS.dri} ${SRCS.mesa}
CPPFLAGS.${fn}+=-I${X11SRCDIR.xc}/lib/GL/dri \
Index: src/external/mit/xorg/lib/libOSMesa/libmesa.mk
diff -u src/external/mit/xorg/lib/libOSMesa/libmesa.mk:1.3 src/external/mit/xorg/lib/libOSMesa/libmesa.mk:1.4
--- src/external/mit/xorg/lib/libOSMesa/libmesa.mk:1.3 Thu Jun 11 01:47:08 2009
+++ src/external/mit/xorg/lib/libOSMesa/libmesa.mk Tue Jun 16 00:26:11 2009
@@ -1,4 +1,4 @@
-# $NetBSD: libmesa.mk,v 1.3 2009/06/11 01:47:08 mrg Exp $
+# $NetBSD: libmesa.mk,v 1.4 2009/06/16 00:26:11 mrg Exp $
#
# Consumer of this Makefile should set MESA_SRC_MODULES.
@@ -8,78 +8,231 @@
PATHS.main= main
INCLUDES.main= shader
SRCS.main= \
- accum.c api_arrayelt.c api_loopback.c api_noop.c api_validate.c \
- arrayobj.c attrib.c blend.c bufferobj.c buffers.c clip.c colortab.c \
- context.c convolve.c debug.c depth.c depthstencil.c dlist.c drawpix.c \
- enable.c enums.c eval.c execmem.c extensions.c fbobject.c feedback.c \
- fog.c framebuffer.c get.c getstring.c hash.c hint.c histogram.c \
- image.c imports.c light.c lines.c matrix.c mipmap.c mm.c pixel.c \
- points.c polygon.c queryobj.c rastpos.c rbadaptors.c renderbuffer.c \
- shaders.c state.c stencil.c texcompress.c texcompress_fxt1.c \
- texcompress_s3tc.c texenvprogram.c texformat.c teximage.c texobj.c \
- texrender.c texstate.c texstore.c varray.c vtxfmt.c
+ api_arrayelt.c \
+ api_exec.c \
+ api_loopback.c \
+ api_noop.c \
+ api_validate.c \
+ accum.c \
+ attrib.c \
+ arrayobj.c \
+ blend.c \
+ bufferobj.c \
+ buffers.c \
+ clear.c \
+ clip.c \
+ colortab.c \
+ context.c \
+ convolve.c \
+ debug.c \
+ depth.c \
+ depthstencil.c \
+ dlist.c \
+ dlopen.c \
+ drawpix.c \
+ enable.c \
+ enums.c \
+ eval.c \
+ execmem.c \
+ extensions.c \
+ fbobject.c \
+ feedback.c \
+ ffvertex_prog.c \
+ fog.c \
+ framebuffer.c \
+ get.c \
+ getstring.c \
+ hash.c \
+ hint.c \
+ histogram.c \
+ image.c \
+ imports.c \
+ light.c \
+ lines.c \
+ matrix.c \
+ mipmap.c \
+ mm.c \
+ multisample.c \
+ pixel.c \
+ pixelstore.c \
+ points.c \
+ polygon.c \
+ queryobj.c \
+ rastpos.c \
+ rbadaptors.c \
+ readpix.c \
+ renderbuffer.c \
+ scissor.c \
+ shaders.c \
+ state.c \
+ stencil.c \
+ texcompress.c \
+ texcompress_s3tc.c \
+ texcompress_fxt1.c \
+ texenv.c \
+ texenvprogram.c \
+ texformat.c \
+ texgen.c \
+ teximage.c \
+ texobj.c \
+ texparam.c \
+ texrender.c \
+ texstate.c \
+ texstore.c \
+ varray.c \
+ vtxfmt.c
# Math sources
PATHS.math= math
SRCS.math= \
- m_debug_clip.c m_debug_norm.c m_debug_xform.c m_eval.c m_matrix.c \
- m_translate.c m_vector.c m_xform.c
+ m_debug_clip.c \
+ m_debug_norm.c \
+ m_debug_xform.c \
+ m_eval.c \
+ m_matrix.c \
+ m_translate.c \
+ m_vector.c \
+ m_xform.c
-# VBO sources
-PATHS.vbo= vbo
-SRCS.vbo= \
- vbo_context.c vbo_exec.c vbo_exec_api.c vbo_exec_array.c \
- vbo_exec_draw.c vbo_exec_eval.c vbo_rebase.c vbo_split.c \
- vbo_split_copy.c vbo_split_inplace.c vbo_save.c vbo_save_api.c \
- vbo_save_draw.c vbo_save_loopback.c
-
-COPTS.vbo_save_draw.c= -Wno-error
+# Software raster sources
+PATHS.swrast= swrast swrast_setup
+INCLUDES.swrast= shader
+SRCS.swrast= \
+ s_aaline.c \
+ s_aatriangle.c \
+ s_accum.c \
+ s_alpha.c \
+ s_atifragshader.c \
+ s_bitmap.c \
+ s_blend.c \
+ s_blit.c \
+ s_buffers.c \
+ s_copypix.c \
+ s_context.c \
+ s_depth.c \
+ s_drawpix.c \
+ s_feedback.c \
+ s_fog.c \
+ s_fragprog.c \
+ s_imaging.c \
+ s_lines.c \
+ s_logic.c \
+ s_masking.c \
+ s_points.c \
+ s_readpix.c \
+ s_span.c \
+ s_stencil.c \
+ s_texcombine.c \
+ s_texfilter.c \
+ s_texstore.c \
+ s_triangle.c \
+ s_zoom.c
+
+# swrast_setup
+.PATH: ${X11SRCDIR.MesaLib}/src/mesa/swrast_setup
+SRCS.ss= \
+ ss_context.c \
+ ss_triangle.c
# TNL sources
PATHS.tnl= tnl
INCLUDES.tnl= shader
SRCS.tnl= \
- t_context.c t_draw.c t_pipeline.c t_vb_cull.c t_vb_fog.c t_vb_light.c \
- t_vb_normals.c t_vb_points.c t_vb_program.c t_vb_render.c \
- t_vb_texgen.c t_vb_texmat.c t_vb_vertex.c t_vertex.c t_vertex_sse.c \
- t_vertex_generic.c t_vp_build.c
+ t_context.c \
+ t_pipeline.c \
+ t_draw.c \
+ t_rasterpos.c \
+ t_vb_program.c \
+ t_vb_render.c \
+ t_vb_texgen.c \
+ t_vb_texmat.c \
+ t_vb_vertex.c \
+ t_vb_cull.c \
+ t_vb_fog.c \
+ t_vb_light.c \
+ t_vb_normals.c \
+ t_vb_points.c \
+ t_vp_build.c \
+ t_vertex.c \
+ t_vertex_sse.c \
+ t_vertex_generic.c
+
+# VBO sources
+PATHS.vbo= vbo
+SRCS.vbo= \
+ vbo_context.c \
+ vbo_exec.c \
+ vbo_exec_api.c \
+ vbo_exec_array.c \
+ vbo_exec_draw.c \
+ vbo_exec_eval.c \
+ vbo_rebase.c \
+ vbo_split.c \
+ vbo_split_copy.c \
+ vbo_split_inplace.c \
+ vbo_save.c \
+ vbo_save_api.c \
+ vbo_save_draw.c \
+ vbo_save_loopback.c
+
+COPTS.vbo_save_draw.c= -Wno-error
# Shader sources
PATHS.shader= shader shader/grammar
INCLUDES.shader= shader/slang shader/grammar
SRCS.shader= \
- arbprogparse.c arbprogram.c atifragshader.c grammar_mesa.c \
- nvfragparse.c nvprogram.c nvvertparse.c prog_debug.c prog_execute.c \
- prog_instruction.c prog_parameter.c prog_print.c prog_statevars.c \
- program.c programopt.c shader_api.c
-
-# Software raster sources
-PATHS.swrast= swrast swrast_setup
-INCLUDES.swrast= shader
-SRCS.swrast= \
- s_aaline.c s_aatriangle.c s_accum.c s_alpha.c s_atifragshader.c \
- s_bitmap.c s_blend.c s_blit.c s_buffers.c s_copypix.c s_context.c \
- s_depth.c s_drawpix.c s_feedback.c s_fog.c s_fragprog.c s_imaging.c \
- s_lines.c s_logic.c s_masking.c s_points.c s_readpix.c s_span.c \
- s_stencil.c s_texcombine.c s_texfilter.c s_texstore.c s_triangle.c \
- s_zoom.c ss_context.c ss_triangle.c
+ arbprogparse.c \
+ arbprogram.c \
+ atifragshader.c \
+ grammar_mesa.c \
+ nvfragparse.c \
+ nvprogram.c \
+ nvvertparse.c \
+ program.c \
+ prog_cache.c \
+ prog_debug.c \
+ prog_execute.c \
+ prog_instruction.c \
+ prog_noise.c \
+ prog_parameter.c \
+ prog_print.c \
+ prog_statevars.c \
+ prog_uniform.c \
+ programopt.c \
+ shader_api.c \
# Shader language sources
PATHS.slang= shader/slang
INCLUDES.slang= shader shader/grammar
SRCS.slang= \
- slang_builtin.c slang_codegen.c slang_compile.c \
- slang_compile_function.c slang_compile_operation.c \
- slang_compile_struct.c slang_compile_variable.c slang_emit.c \
- slang_ir.c slang_label.c slang_link.c \
- slang_log.c slang_mem.c slang_preprocess.c slang_print.c \
- slang_simplify.c slang_storage.c slang_typeinfo.c slang_vartable.c \
+ slang_builtin.c \
+ slang_codegen.c \
+ slang_compile.c \
+ slang_compile_function.c \
+ slang_compile_operation.c \
+ slang_compile_struct.c \
+ slang_compile_variable.c \
+ slang_emit.c \
+ slang_ir.c \
+ slang_label.c \
+ slang_link.c \
+ slang_log.c \
+ slang_mem.c \
+ slang_preprocess.c \
+ slang_print.c \
+ slang_simplify.c \
+ slang_storage.c \
+ slang_typeinfo.c \
+ slang_vartable.c \
slang_utility.c
# GL API sources
PATHS.glapi= glapi main
SRCS.glapi= \
- dispatch.c glapi.c glthread.c
+ dispatch.c \
+ glapi.c \
+ glapi_getproc.c \
+ glthread.c
# Common driver sources
PATHS.common= drivers/common
@@ -87,6 +240,7 @@
SRCS.common= \
driverfuncs.c
+
# OSMesa driver sources
PATHS.osmesa= drivers/osmesa
INCLUDES.osmesa= shader
Added files:
Index: src/external/mit/xorg/lib/dri/swrast/Makefile
diff -u /dev/null src/external/mit/xorg/lib/dri/swrast/Makefile:1.1
--- /dev/null Tue Jun 16 00:26:12 2009
+++ src/external/mit/xorg/lib/dri/swrast/Makefile Tue Jun 16 00:26:11 2009
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2009/06/16 00:26:11 mrg Exp $
+
+MODULE= swrast
+
+CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/swrast
+
+DRI_EXTRA_PATHS= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/swrast
+SRCS= \
+ swrast.c \
+ swrast_span.c
+
+COPTS.swrast.c= -Wno-error # XXX const
+
+.include "${.CURDIR}/../dri.mk"
