Module Name:    src
Committed By:   mrg
Date:           Thu May 27 01:20:14 UTC 2010

Modified Files:
        src/external/mit/xorg/lib/dri/r300: Makefile

Log Message:
new Mesa r300_dri driver has a "compiler" subdir of objects needed.
mostly dieter roelants in PR#43367.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/dri/r300/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/dri/r300/Makefile
diff -u src/external/mit/xorg/lib/dri/r300/Makefile:1.5 src/external/mit/xorg/lib/dri/r300/Makefile:1.6
--- src/external/mit/xorg/lib/dri/r300/Makefile:1.5	Sun May 23 23:21:30 2010
+++ src/external/mit/xorg/lib/dri/r300/Makefile	Thu May 27 01:20:14 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/05/23 23:21:30 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2010/05/27 01:20:14 mrg Exp $
 
 MODULE=	r300
 
@@ -8,10 +8,12 @@
 CPPFLAGS+=	-DHAVE_LIBDRM_RADEON
 
 CPPFLAGS+=	-I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r300 \
+		-I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r300/compiler \
 		-I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon \
 		-I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon/server
 
-DRI_EXTRA_PATHS=	${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon
+DRI_EXTRA_PATHS=	${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon \
+			${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r300/compiler
 SRCS=	\
 	radeon_bo_legacy.c \
 	radeon_buffer_objects.c \
@@ -47,6 +49,31 @@
 	radeon_bo.c \
 	radeon_cs.c
 
+# r300/compiler
+SRCS+= \
+	radeon_code.c \
+	radeon_compiler.c \
+	radeon_program.c \
+	radeon_program_print.c \
+	radeon_opcodes.c \
+	radeon_program_alu.c \
+	radeon_program_pair.c \
+	radeon_pair_translate.c \
+	radeon_pair_schedule.c \
+	radeon_pair_regalloc.c \
+	radeon_dataflow.c \
+	radeon_dataflow_deadcode.c \
+	radeon_dataflow_swizzles.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
+
 LIBDPLIBS+=	drm_radeon	${.CURDIR}/../../libdrm_radeon
 
 #	../common/mm.c \
@@ -56,4 +83,7 @@
 
 COPTS.radeon_screen.c=  -Wno-error	# XXX const
 
+# uses C99 variable decl scoping
+CFLAGS+=	-std=c99	
+
 .include "${.CURDIR}/../dri.mk"

Reply via email to