Module Name: src
Committed By: mrg
Date: Mon Jan 5 03:45:32 UTC 2015
Modified Files:
src/distrib/sets: sets.subr
src/distrib/sets/lists/xdebug: md.amd64 md.i386 shl.mi
src/distrib/sets/lists/xserver: md.amd64 md.i386 mi
src/external/mit/xorg/lib: Makefile
src/share/mk: bsd.own.mk
Added Files:
src/external/mit/xorg/lib/dri7: Makefile dri.mk libglsl7.mk libmesa7.mk
src/external/mit/xorg/lib/dri7/libmesa: Makefile
src/external/mit/xorg/lib/dri7/r300: Makefile
Log Message:
sets.subr:
support machine=<xxx>, machine_arch=<xxx>, machine_cpu=<xxx> tags.
dri7: build Mesa 7 r300_dri.so for x86 platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/distrib/sets/sets.subr
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.74 -r1.75 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.93 -r1.94 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/xserver/mi
cvs rdiff -u -r1.30 -r1.31 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/dri7/Makefile \
src/external/mit/xorg/lib/dri7/dri.mk \
src/external/mit/xorg/lib/dri7/libglsl7.mk \
src/external/mit/xorg/lib/dri7/libmesa7.mk
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/dri7/libmesa/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/dri7/r300/Makefile
cvs rdiff -u -r1.840 -r1.841 src/share/mk/bsd.own.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/sets.subr
diff -u src/distrib/sets/sets.subr:1.161 src/distrib/sets/sets.subr:1.162
--- src/distrib/sets/sets.subr:1.161 Wed Nov 12 03:49:26 2014
+++ src/distrib/sets/sets.subr Mon Jan 5 03:45:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.161 2014/11/12 03:49:26 enami Exp $
+# $NetBSD: sets.subr,v 1.162 2015/01/05 03:45:31 mrg Exp $
#
#
@@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.161 2014/11/12 03:49:26 enami Exp $
+# # $NetBSD: sets.subr,v 1.162 2015/01/05 03:45:31 mrg Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -319,6 +319,12 @@ list_set_files()
wanted[".man"] = 1
if ("endian" in wanted)
wanted["endian=" "'"${TARGET_ENDIANNESS}"'"] = 1
+ if ("machine" in wanted)
+ wanted["machine=" "'"${MACHINE}"'"] = 1
+ if ("machine_arch" in wanted)
+ wanted["machine_arch=" "'"${MACHINE_ARCH}"'"] = 1
+ if ("machine_cpu" in wanted)
+ wanted["machine_cpu=" "'"${MACHINE_CPU}"'"] = 1
}
/^#/ {
Index: src/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.9 src/distrib/sets/lists/xdebug/md.amd64:1.10
--- src/distrib/sets/lists/xdebug/md.amd64:1.9 Fri Dec 26 14:19:20 2014
+++ src/distrib/sets/lists/xdebug/md.amd64 Mon Jan 5 03:45:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.9 2014/12/26 14:19:20 christos Exp $
+# $NetBSD: md.amd64,v 1.10 2015/01/05 03:45:31 mrg Exp $
./usr/X11R7/lib/libI810XvMC_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg
@@ -70,7 +70,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/dri/mga_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/r128_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/r200_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug -unknown- obsolete,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/r600_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/s3v_dri.so.0.debug -unknown- obsolete
Index: src/distrib/sets/lists/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.10 src/distrib/sets/lists/xdebug/md.i386:1.11
--- src/distrib/sets/lists/xdebug/md.i386:1.10 Fri Dec 26 14:19:20 2014
+++ src/distrib/sets/lists/xdebug/md.i386 Mon Jan 5 03:45:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.10 2014/12/26 14:19:20 christos Exp $
+# $NetBSD: md.i386,v 1.11 2015/01/05 03:45:31 mrg Exp $
./usr/X11R6/lib/modules/extensions/libGLcore_g.a -unknown- debuglib,x11
./usr/X11R6/lib/modules/extensions/libdbe_g.a -unknown- debuglib,x11
./usr/X11R6/lib/modules/extensions/libextmod_g.a -unknown- debuglib,x11
@@ -116,7 +116,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/dri/mga_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/r128_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/r200_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug -unknown- obsolete,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/r600_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/s3v_dri.so.0.debug -unknown- obsolete
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.17 src/distrib/sets/lists/xdebug/shl.mi:1.18
--- src/distrib/sets/lists/xdebug/shl.mi:1.17 Fri Dec 26 14:19:20 2014
+++ src/distrib/sets/lists/xdebug/shl.mi Mon Jan 5 03:45:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.17 2014/12/26 14:19:20 christos Exp $
+# $NetBSD: shl.mi,v 1.18 2015/01/05 03:45:31 mrg Exp $
./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug
@@ -146,6 +146,8 @@
./usr/libdata/debug/usr/X11R7/lib/libxkbui.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug obsolete obsolete,xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug -unknown- xorg,debug,machine=i386
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug -unknown- xorg,debug,machine=amd64
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug obsolete obsolete,xorg,debug,!machine=i386,!machine=amd64
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libswrast_dri.so.0.debug obsolete obsolete,xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/swrast_dri.so.0.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.74 src/distrib/sets/lists/xserver/md.amd64:1.75
--- src/distrib/sets/lists/xserver/md.amd64:1.74 Thu Dec 18 06:24:28 2014
+++ src/distrib/sets/lists/xserver/md.amd64 Mon Jan 5 03:45:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.74 2014/12/18 06:24:28 mrg Exp $
+# $NetBSD: md.amd64,v 1.75 2015/01/05 03:45:31 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -371,8 +371,8 @@
./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/r200_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/r200_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- obsolete
-./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/r600_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/r600_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- xorg
Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.93 src/distrib/sets/lists/xserver/md.i386:1.94
--- src/distrib/sets/lists/xserver/md.i386:1.93 Thu Dec 18 06:24:28 2014
+++ src/distrib/sets/lists/xserver/md.i386 Mon Jan 5 03:45:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.93 2014/12/18 06:24:28 mrg Exp $
+# $NetBSD: md.i386,v 1.94 2015/01/05 03:45:31 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -405,8 +405,8 @@
./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/r200_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/r200_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- obsolete
-./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/r300_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/r600_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/r600_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- xorg
Index: src/distrib/sets/lists/xserver/mi
diff -u src/distrib/sets/lists/xserver/mi:1.34 src/distrib/sets/lists/xserver/mi:1.35
--- src/distrib/sets/lists/xserver/mi:1.34 Thu Dec 18 06:24:28 2014
+++ src/distrib/sets/lists/xserver/mi Mon Jan 5 03:45:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.34 2014/12/18 06:24:28 mrg Exp $
+# $NetBSD: mi,v 1.35 2015/01/05 03:45:31 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -54,8 +54,12 @@
./usr/X11R6/man/man1/xvidtune.1 -unknown- .man,x11
./usr/X11R7/bin/Xnest -unknown- xorg
./usr/X11R7/bin/Xvfb -unknown- xorg
-./usr/X11R7/lib/modules/dri/libmesa_dri.so -unknown- obsolete
-./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/libmesa_dri.so -unknown- xorg,machine=i386
+./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 -unknown- xorg,machine=i386
+./usr/X11R7/lib/modules/dri/libmesa_dri.so -unknown- xorg,machine=amd64
+./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 -unknown- xorg,machine=amd64
+./usr/X11R7/lib/modules/dri/libmesa_dri.so -unknown- obsolete,xorg,!machine=amd64,!machine=i386
+./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 -unknown- obsolete,xorg,!machine=amd64,!machine=i386
./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/gallium_dri.so -unknown- xorg
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.30 src/external/mit/xorg/lib/Makefile:1.31
--- src/external/mit/xorg/lib/Makefile:1.30 Thu Dec 18 06:24:28 2014
+++ src/external/mit/xorg/lib/Makefile Mon Jan 5 03:45:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2014/12/18 06:24:28 mrg Exp $
+# $NetBSD: Makefile,v 1.31 2015/01/05 03:45:31 mrg Exp $
# build libraries for xorg
@@ -9,7 +9,7 @@ SUBDIR+=libdrm_intel
.endif
SUBDIR+=libdrm_radeon pixman xkeyboard-config libxcb \
.WAIT
-SUBDIR+=dri gallium fontconfig libSM libX11 \
+SUBDIR+=dri7 dri gallium fontconfig libSM libX11 \
.WAIT \
libXcomposite libXdamage libXext libXfixes libXt \
libxkbfile \
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.840 src/share/mk/bsd.own.mk:1.841
--- src/share/mk/bsd.own.mk:1.840 Mon Jan 5 01:52:23 2015
+++ src/share/mk/bsd.own.mk Mon Jan 5 03:45:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.840 2015/01/05 01:52:23 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.841 2015/01/05 03:45:31 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1274,7 +1274,7 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRM
xkbcomp xorg-cf-files imake xorg-server xbiff xkbdata xkeyboard-config \
xbitmaps appres xeyes xev xedit sessreg pixman \
beforelight bitmap editres makedepend fonttosfnt fslsfonts fstobdf \
- glu glw mesa-demos MesaDemos MesaGLUT MesaLib \
+ glu glw mesa-demos MesaDemos MesaGLUT MesaLib MesaLib7 \
ico iceauth lbxproxy listres lndir \
luit xproxymanagementprotocol mkfontdir oclock proxymngr rgb \
setxkbmap smproxy twm viewres x11perf xauth xcalc xclipboard \
Added files:
Index: src/external/mit/xorg/lib/dri7/Makefile
diff -u /dev/null src/external/mit/xorg/lib/dri7/Makefile:1.1
--- /dev/null Mon Jan 5 03:45:32 2015
+++ src/external/mit/xorg/lib/dri7/Makefile Mon Jan 5 03:45:31 2015
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2015/01/05 03:45:31 mrg Exp $
+
+# Build MesaLib 7.x r300 driver, which requires LLVM in Mesa 10.x
+
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+SUBDIR= libmesa .WAIT r300
+.endif
+
+.include <bsd.subdir.mk>
Index: src/external/mit/xorg/lib/dri7/dri.mk
diff -u /dev/null src/external/mit/xorg/lib/dri7/dri.mk:1.1
--- /dev/null Mon Jan 5 03:45:32 2015
+++ src/external/mit/xorg/lib/dri7/dri.mk Mon Jan 5 03:45:31 2015
@@ -0,0 +1,49 @@
+# $NetBSD: dri.mk,v 1.1 2015/01/05 03:45:31 mrg Exp $
+
+# XXX DRI_LIB_DEPS
+
+LIBISMODULE= yes
+
+.include <bsd.own.mk>
+
+SHLIB_MAJOR= 0
+
+CPPFLAGS+= \
+ -I${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/common \
+ -I${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/${MODULE}/server \
+ -I${X11SRCDIR.MesaLib7}/include \
+ -I${X11SRCDIR.MesaLib7}/src/mapi \
+ -I${X11SRCDIR.MesaLib7}/src/mesa \
+ -I${DESTDIR}${X11INCDIR}/libdrm
+
+CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 \
+ -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING \
+ -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
+
+CPPFLAGS+= -Wno-stack-protector
+
+.PATH: ${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/${MODULE} ${DRI_EXTRA_PATHS}
+
+# Common sources
+.PATH: ${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/common \
+ ${X11SRCDIR.MesaLib7}/src/mesa/drivers/common
+.if (${MODULE} == "swrast")
+SRCS+= drisw_util.c driverfuncs.c utils.c
+.else
+SRCS+= dri_util.c drirenderbuffer.c driverfuncs.c texmem.c
+SRCS+= utils.c vblank.c xmlconfig.c
+.endif
+
+.include <bsd.x11.mk>
+
+LIB= ${MODULE}_dri
+LIBDIR= ${X11USRLIBDIR}/modules/dri
+
+LIBDPLIBS+= drm ${.CURDIR}/../../libdrm
+LIBDPLIBS+= expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat
+LIBDPLIBS+= m ${NETBSDSRCDIR}/lib/libm
+LIBDPLIBS+= mesa_dri ${.CURDIR}/../libmesa
+# to find mesa_dri.so
+LDFLAGS+= -Wl,-rpath,${LIBDIR}
+
+.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/dri7/libglsl7.mk
diff -u /dev/null src/external/mit/xorg/lib/dri7/libglsl7.mk:1.1
--- /dev/null Mon Jan 5 03:45:32 2015
+++ src/external/mit/xorg/lib/dri7/libglsl7.mk Mon Jan 5 03:45:31 2015
@@ -0,0 +1,102 @@
+# $NetBSD: libglsl7.mk,v 1.1 2015/01/05 03:45:31 mrg Exp $
+
+# This copy for MesaLib7 old drivers.
+
+# Derived loosely from src/glsl/Makefile.
+
+# XXX Now that we don't need glsl-compile as a tool, this should just
+# be made into a library instead.
+
+.PATH: ${X11SRCDIR.MesaLib7}/src/glsl
+.PATH: ${X11SRCDIR.MesaLib7}/src/glsl/glcpp
+
+CPPFLAGS+= -I${X11SRCDIR.MesaLib7}/include
+CPPFLAGS+= -I${X11SRCDIR.MesaLib7}/src/glsl
+CPPFLAGS+= -I${X11SRCDIR.MesaLib7}/src/mapi
+CPPFLAGS+= -I${X11SRCDIR.MesaLib7}/src/mesa
+
+SRCS.glsl.libglcpp= \
+ glcpp-lex.c \
+ glcpp-parse.c \
+ pp.c
+
+SRCS.glsl.glcpp= \
+ ${SRCS.glsl.libglcpp} \
+ strtod.c \
+ glcpp.c
+
+SRCS.glsl.c= \
+ strtod.c \
+ ralloc.c \
+ ${SRCS.glsl.libglcpp}
+
+SRCS.glsl.cxx= \
+ ast_expr.cpp \
+ ast_function.cpp \
+ ast_to_hir.cpp \
+ ast_type.cpp \
+ glsl_lexer.cpp \
+ glsl_parser.cpp \
+ glsl_parser_extras.cpp \
+ glsl_types.cpp \
+ glsl_symbol_table.cpp \
+ hir_field_selection.cpp \
+ ir_basic_block.cpp \
+ ir_clone.cpp \
+ ir_constant_expression.cpp \
+ ir.cpp \
+ ir_expression_flattening.cpp \
+ ir_function_can_inline.cpp \
+ ir_function_detect_recursion.cpp \
+ ir_function.cpp \
+ ir_hierarchical_visitor.cpp \
+ ir_hv_accept.cpp \
+ ir_import_prototypes.cpp \
+ ir_print_visitor.cpp \
+ ir_reader.cpp \
+ ir_rvalue_visitor.cpp \
+ ir_set_program_inouts.cpp \
+ ir_validate.cpp \
+ ir_variable.cpp \
+ ir_variable_refcount.cpp \
+ linker.cpp \
+ link_functions.cpp \
+ loop_analysis.cpp \
+ loop_controls.cpp \
+ loop_unroll.cpp \
+ lower_discard.cpp \
+ lower_if_to_cond_assign.cpp \
+ lower_instructions.cpp \
+ lower_jumps.cpp \
+ lower_mat_op_to_vec.cpp \
+ lower_noise.cpp \
+ lower_texture_projection.cpp \
+ lower_variable_index_to_cond_assign.cpp \
+ lower_vec_index_to_cond_assign.cpp \
+ lower_vec_index_to_swizzle.cpp \
+ lower_vector.cpp \
+ opt_algebraic.cpp \
+ opt_constant_folding.cpp \
+ opt_constant_propagation.cpp \
+ opt_constant_variable.cpp \
+ opt_copy_propagation.cpp \
+ opt_copy_propagation_elements.cpp \
+ opt_dead_code.cpp \
+ opt_dead_code_local.cpp \
+ opt_dead_functions.cpp \
+ opt_discard_simplification.cpp \
+ opt_function_inlining.cpp \
+ opt_if_simplification.cpp \
+ opt_noop_swizzle.cpp \
+ opt_redundant_jumps.cpp \
+ opt_structure_splitting.cpp \
+ opt_swizzle_swizzle.cpp \
+ opt_tree_grafting.cpp \
+ s_expression.cpp
+
+SRCS.glsl= \
+ ${SRCS.glsl.c} \
+ ${SRCS.glsl.cxx}
+
+SRCS.glsl+= \
+ builtin_function.cpp
Index: src/external/mit/xorg/lib/dri7/libmesa7.mk
diff -u /dev/null src/external/mit/xorg/lib/dri7/libmesa7.mk:1.1
--- /dev/null Mon Jan 5 03:45:32 2015
+++ src/external/mit/xorg/lib/dri7/libmesa7.mk Mon Jan 5 03:45:31 2015
@@ -0,0 +1,351 @@
+# $NetBSD: libmesa7.mk,v 1.1 2015/01/05 03:45:31 mrg Exp $
+
+# This copy for old MesaLib 7.x drivers only.
+
+#
+# Consumer of this Makefile should set MESA_SRC_MODULES.
+
+INCLUDES.all= mapi mesa mesa/main
+
+# The source file lists derived from src/mesa/sources.mak and
+# src/mapi/glapi/sources.mak. Please keep the organization in line
+# with those files.
+
+# Main sources
+PATHS.main= mesa/main
+INCLUDES.main= glsl
+SRCS.main= \
+ api_exec_es1.c \
+ api_exec_es2.c
+
+SRCS.main+= \
+ api_arrayelt.c \
+ api_exec.c \
+ api_loopback.c \
+ api_noop.c \
+ api_validate.c \
+ accum.c \
+ arbprogram.c \
+ atifragshader.c \
+ attrib.c \
+ arrayobj.c \
+ blend.c \
+ bufferobj.c \
+ buffers.c \
+ clear.c \
+ clip.c \
+ colortab.c \
+ condrender.c \
+ context.c \
+ convolve.c \
+ cpuinfo.c \
+ debug.c \
+ depth.c \
+ depthstencil.c \
+ dlist.c \
+ dlopen.c \
+ drawpix.c \
+ drawtex.c \
+ enable.c \
+ enums.c \
+ MESAeval.c \
+ execmem.c \
+ extensions.c \
+ fbobject.c \
+ feedback.c \
+ ffvertex_prog.c \
+ fog.c \
+ formats.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 \
+ nvprogram.c \
+ pack.c \
+ pbo.c \
+ MESApixel.c \
+ MESApixelstore.c \
+ pixeltransfer.c \
+ points.c \
+ polygon.c \
+ queryobj.c \
+ querymatrix.c \
+ rastpos.c \
+ readpix.c \
+ remap.c \
+ renderbuffer.c \
+ samplerobj.c \
+ scissor.c \
+ shaderapi.c \
+ shaderobj.c \
+ shared.c \
+ state.c \
+ stencil.c \
+ syncobj.c \
+ texcompress.c \
+ texcompress_rgtc.c \
+ texcompress_s3tc.c \
+ texcompress_fxt1.c \
+ texenv.c \
+ texfetch.c \
+ texformat.c \
+ texgen.c \
+ texgetimage.c \
+ teximage.c \
+ texobj.c \
+ texpal.c \
+ texparam.c \
+ texstate.c \
+ texstore.c \
+ texturebarrier.c \
+ transformfeedback.c \
+ uniforms.c \
+ varray.c \
+ version.c \
+ viewport.c \
+ vtxfmt.c
+
+SRCS.main+= \
+ ff_fragment_shader.cpp
+
+# XXX avoid source name clashes with glx
+.PATH: ${X11SRCDIR.MesaLib7}/src/mesa/main
+BUILDSYMLINKS= ${X11SRCDIR.MesaLib7}/src/mesa/main/pixel.c MESApixel.c \
+ ${X11SRCDIR.MesaLib7}/src/mesa/main/pixelstore.c MESApixelstore.c \
+ ${X11SRCDIR.MesaLib7}/src/mesa/main/eval.c MESAeval.c
+
+# Math sources
+PATHS.math= 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
+
+SRCS.math+= \
+ m_xform.c
+
+# Software raster sources
+PATHS.swrast= mesa/swrast
+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_clear.c \
+ s_copypix.c \
+ s_context.c \
+ s_depth.c \
+ s_drawpix.c \
+ s_feedback.c \
+ s_fog.c \
+ s_fragprog.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_texrender.c \
+ s_triangle.c \
+ s_zoom.c
+
+# swrast_setup
+PATHS.ss= mesa/swrast_setup
+SRCS.ss= \
+ ss_context.c \
+ ss_triangle.c
+
+# TNL sources
+PATHS.tnl= mesa/tnl
+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_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= mesa/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
+
+# statetracker
+
+# Program sources
+PATHS.program= mesa/program
+SRCS.program= \
+ arbprogparse.c \
+ hash_table.c \
+ lex.yy.c \
+ nvfragparse.c \
+ nvvertparse.c \
+ program.c \
+ program_parse.tab.c \
+ program_parse_extra.c \
+ prog_cache.c \
+ prog_execute.c \
+ prog_instruction.c \
+ prog_noise.c \
+ prog_optimize.c \
+ prog_parameter.c \
+ prog_parameter_layout.c \
+ prog_print.c \
+ prog_statevars.c \
+ prog_uniform.c \
+ programopt.c \
+ register_allocate.c \
+ symbol_table.c
+
+SRCS.program+= \
+ ir_to_mesa.cpp \
+ sampler.cpp
+
+# Unused parts of mesa/sources.mak.
+.if 0
+ASM_C_SOURCES = \
+ x86/common_x86.c \
+ x86/x86_xform.c \
+ x86/3dnow.c \
+ x86/sse.c \
+ x86/rtasm/x86sse.c \
+ sparc/sparc.c \
+ ppc/common_ppc.c \
+ x86-64/x86-64.c
+
+X86_SOURCES = \
+ x86/common_x86_asm.S \
+ x86/x86_xform2.S \
+ x86/x86_xform3.S \
+ x86/x86_xform4.S \
+ x86/x86_cliptest.S \
+ x86/mmx_blend.S \
+ x86/3dnow_xform1.S \
+ x86/3dnow_xform2.S \
+ x86/3dnow_xform3.S \
+ x86/3dnow_xform4.S \
+ x86/3dnow_normal.S \
+ x86/sse_xform1.S \
+ x86/sse_xform2.S \
+ x86/sse_xform3.S \
+ x86/sse_xform4.S \
+ x86/sse_normal.S \
+ x86/read_rgba_span_x86.S
+
+X86-64_SOURCES = \
+ x86-64/xform4.S
+
+SPARC_SOURCES = \
+ sparc/clip.S \
+ sparc/norm.S \
+ sparc/xform.S
+.endif
+
+# Common driver sources
+PATHS.common= mesa/drivers/common
+SRCS.common= \
+ driverfuncs.c \
+ meta.c
+
+# OSMesa driver sources
+PATHS.osmesa= mesa/drivers/osmesa
+SRCS.osmesa= \
+ osmesa.c
+
+# GLAPI sources
+PATHS.glapi= mapi/glapi
+SRCS.glapi = \
+ glapi_dispatch.c \
+ glapi_entrypoint.c \
+ glapi_gentable.c \
+ glapi_getproc.c \
+ glapi_nop.c \
+ glthread.c \
+ glapi.c
+
+# Unused parts of mapi/glapi/sources.mak.
+.if 0
+X86_API = \
+ glapi_x86.S
+
+X86-64_API = \
+ glapi_x86-64.S
+
+SPARC_API = \
+ glapi_sparc.S
+.endif
+
+.for _mod_ in ${MESA_SRC_MODULES}
+
+SRCS+= ${SRCS.${_mod_}}
+
+. for _path_ in ${PATHS.${_mod_}}
+.PATH: ${X11SRCDIR.MesaLib7}/src/${_path_}
+. endfor
+
+. for _path_ in ${INCLUDES.${_mod_}}
+CPPFLAGS+= -I${X11SRCDIR.MesaLib7}/src/${_path_}
+. endfor
+
+.endfor
+
+.for _path_ in ${INCLUDES.all}
+CPPFLAGS+= -I${X11SRCDIR.MesaLib7}/src/${_path_}
+.endfor
+
+LIBDPLIBS= m ${NETBSDSRCDIR}/lib/libm
+
+# build the shader headers
+.include "../libglsl7.mk"
+
+CPPFLAGS+= -I.
+CPPFLAGS+= -I${X11SRCDIR.MesaLib7}/include
+
+cleandir: cleanmesa
+cleanmesa: .PHONY
+ -@if [ -d library ]; then rmdir library; fi
Index: src/external/mit/xorg/lib/dri7/libmesa/Makefile
diff -u /dev/null src/external/mit/xorg/lib/dri7/libmesa/Makefile:1.1
--- /dev/null Mon Jan 5 03:45:32 2015
+++ src/external/mit/xorg/lib/dri7/libmesa/Makefile Mon Jan 5 03:45:31 2015
@@ -0,0 +1,40 @@
+# $NetBSD: Makefile,v 1.1 2015/01/05 03:45:31 mrg Exp $
+
+.include <bsd.own.mk>
+
+_LIB_PREFIX= lib
+LIB= mesa_dri
+LIBISMODULE= yes
+LIBISCXX= yes
+
+SHLIB_MAJOR= 0
+
+MESA_SRC_MODULES= main math vbo tnl program swrast ss common
+
+CPPFLAGS+= \
+ -I${X11SRCDIR.MesaLib7}/include \
+ -I${X11SRCDIR.MesaLib7}/src/glsl \
+ -I${X11SRCDIR.MesaLib7}/src/mesa \
+ -I${X11SRCDIR.MesaLib7}/src/mapi
+
+CPPFLAGS+= ${X11FLAGS.THREADLIB} \
+ -DPTHREADS -D_NETBSD_SOURCE -DUSE_EXTERNAL_DXTN_LIB=1 \
+ -DHAVE_ALIAS -DIN_DRI_DRIVER
+#CPPFLAGS+= -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_POSIX_MEMALIGN
+CFLAGS+= -pthread
+
+.include "../libmesa7.mk"
+.include "../libglsl7.mk"
+
+SRCS+= ${SRCS.glsl}
+
+.include <bsd.x11.mk>
+
+LIBDIR= ${X11USRLIBDIR}/modules/dri
+
+#LIBDPLIBS+= GL ${.CURDIR}/../../libGL
+
+CWARNFLAGS.clang+= -Wno-format -Wno-constant-conversion \
+ -Wno-tautological-compare
+
+.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/dri7/r300/Makefile
diff -u /dev/null src/external/mit/xorg/lib/dri7/r300/Makefile:1.1
--- /dev/null Mon Jan 5 03:45:32 2015
+++ src/external/mit/xorg/lib/dri7/r300/Makefile Mon Jan 5 03:45:31 2015
@@ -0,0 +1,111 @@
+# $NetBSD: Makefile,v 1.1 2015/01/05 03:45:31 mrg Exp $
+
+MODULE= r300
+
+CPPFLAGS+= -DCOMPILE_R300 -DR200_MERGED=0 \
+ -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300 \
+ -DRADEON_R300
+CPPFLAGS+= -DHAVE_LIBDRM_RADEON
+
+CPPFLAGS+= -I${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/r300 \
+ -I${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/r300/compiler \
+ -I${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/radeon \
+ -I${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/radeon/server \
+ -I${X11SRCDIR.MesaLib7}/src/glsl
+
+DRI_EXTRA_PATHS= ${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/radeon \
+ ${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/r300/compiler \
+ ${X11SRCDIR.MesaLib7}/src/glsl \
+ ${X11SRCDIR.MesaLib7}/src/mesa/program
+
+SRCS= \
+ radeon_bo_legacy.c \
+ radeon_buffer_objects.c \
+ radeon_common_context.c \
+ radeon_common.c \
+ radeon_cs_legacy.c \
+ radeon_dma.c \
+ radeon_debug.c \
+ radeon_fbo.c \
+ radeon_lock.c \
+ radeon_mipmap_tree.c \
+ radeon_pixel_read.c \
+ radeon_queryobj.c \
+ radeon_span.c \
+ radeon_texture.c \
+ radeon_tex_copy.c \
+ radeon_tex_getimage.c \
+ radeon_tile.c
+
+SRCS+= \
+ radeon_screen.c \
+ r300_blit.c \
+ r300_context.c \
+ r300_draw.c \
+ r300_cmdbuf.c \
+ r300_state.c \
+ r300_render.c \
+ r300_tex.c \
+ r300_texstate.c \
+ r300_vertprog.c \
+ r300_fragprog_common.c \
+ r300_shader.c \
+ radeon_mesa_to_rc.c \
+ r300_emit.c \
+ r300_swtcl.c
+
+SRCS+= \
+ radeon_cs_space_drm.c \
+ radeon_bo.c \
+ radeon_cs.c
+
+# r300/compiler
+SRCS+= \
+ radeon_code.c \
+ radeon_compiler.c \
+ radeon_compiler_util.c \
+ radeon_emulate_branches.c \
+ radeon_emulate_loops.c \
+ radeon_program.c \
+ radeon_program_print.c \
+ radeon_opcodes.c \
+ radeon_program_alu.c \
+ radeon_program_pair.c \
+ radeon_program_tex.c \
+ radeon_pair_translate.c \
+ radeon_pair_schedule.c \
+ radeon_pair_regalloc.c \
+ radeon_pair_dead_sources.c \
+ radeon_dataflow.c \
+ radeon_dataflow_deadcode.c \
+ radeon_dataflow_swizzles.c \
+ radeon_list.c \
+ radeon_optimize.c \
+ radeon_remove_constants.c \
+ radeon_rename_regs.c \
+ radeon_variable.c \
+ r3xx_fragprog.c \
+ r300_fragprog.c \
+ r300_fragprog_swizzle.c \
+ r300_fragprog_emit.c \
+ r500_fragprog.c \
+ r500_fragprog_emit.c \
+ r3xx_vertprog.c \
+ r3xx_vertprog_dump.c \
+ memory_pool.c
+
+# glsl
+SRCS+= ralloc.c
+
+# mesa/program
+SRCS+= register_allocate.c
+
+LIBDPLIBS+= drm_radeon ${.CURDIR}/../../libdrm_radeon
+
+# uses C99 variable decl scoping
+CFLAGS+= -std=c99
+
+CWARNFLAGS.clang+= -Wno-empty-body -Wno-format -Wno-constant-conversion \
+ -Wno-constant-logical-operand
+
+.include "${.CURDIR}/../dri.mk"
