CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: christos
Date: Tue Jun 7 23:21:58 UTC 2016
Modified Files:
src/external/mit/xorg/lib/dri: Makefile
Log Message:
sprinke -Wno-stack-protector
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/mit/xorg/lib/dri/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/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.27 src/external/mit/xorg/lib/dri/Makefile:1.28
--- src/external/mit/xorg/lib/dri/Makefile:1.27 Tue Nov 3 05:26:06 2015
+++ src/external/mit/xorg/lib/dri/Makefile Tue Jun 7 19:21:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2015/11/03 10:26:06 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.28 2016/06/07 23:21:58 christos Exp $
# Link the mesa_dri_drivers mega driver.
@@ -401,6 +401,18 @@ LIBDIR= ${X11USRLIBDIR}/modules/dri
CWARNFLAGS.clang+= -Wno-error=initializer-overrides -Wno-error=switch \
-Wno-error=tautological-constant-out-of-range-compare
+COPTS.brw_state_batch.c += -Wno-stack-protector
+COPTS.brw_eu_compact.c += -Wno-stack-protector
+COPTS.brw_fs.cpp += -Wno-stack-protector
+COPTS.brw_fs_copy_propagation.cpp += -Wno-stack-protector
+COPTS.brw_fs_reg_allocate.cpp += -Wno-stack-protector
+COPTS.brw_program.c += -Wno-stack-protector
+COPTS.brw_schedule_instructions.cpp += -Wno-stack-protector
+COPTS.brw_vec4.cpp += -Wno-stack-protector
+COPTS.brw_vec4_copy_propagation.cpp += -Wno-stack-protector
+COPTS.brw_vec4_reg_allocate.cpp += -Wno-stack-protector
+COPTS.brw_vec4_visitor.cpp += -Wno-stack-protector
+
.include
.else
.include
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: christos
Date: Sat Jan 25 19:05:08 UTC 2020
Modified Files:
src/external/mit/xorg/lib/dri: Makefile
Log Message:
try to fix the clang build
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/external/mit/xorg/lib/dri/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/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.35 src/external/mit/xorg/lib/dri/Makefile:1.36
--- src/external/mit/xorg/lib/dri/Makefile:1.35 Sat Jan 18 19:58:14 2020
+++ src/external/mit/xorg/lib/dri/Makefile Sat Jan 25 14:05:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2020/01/19 00:58:14 jmcneill Exp $
+# $NetBSD: Makefile,v 1.36 2020/01/25 19:05:08 christos Exp $
# Link the mesa_dri_drivers mega driver.
@@ -421,6 +421,7 @@ SRCS+= ${DRI_SOURCES.${_d}}
.PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/${_d}
.endfor
+
LIBDPLIBS+= expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat
LIBDPLIBS+= m ${NETBSDSRCDIR}/lib/libm
LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
@@ -441,6 +442,8 @@ CPPFLAGS.streaming-load-memcpy.c+= -msse
CPPFLAGS.isl_tiled_memcpy_sse41.c+= -msse4.1
.endif
+CFLAGS+= ${${ACTIVE_CC} == "clang":? -Wno-error=atomic-alignment :}
+
.include "../driver.mk"
.for _d in ${DRIVERS}
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: maya
Date: Tue Apr 9 14:47:15 UTC 2019
Modified Files:
src/external/mit/xorg/lib/dri: Makefile
Log Message:
Need pthread for all the mtx_lock.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/external/mit/xorg/lib/dri/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/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.30 src/external/mit/xorg/lib/dri/Makefile:1.31
--- src/external/mit/xorg/lib/dri/Makefile:1.30 Sun Mar 10 10:51:58 2019
+++ src/external/mit/xorg/lib/dri/Makefile Tue Apr 9 14:47:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2019/03/10 10:51:58 mrg Exp $
+# $NetBSD: Makefile,v 1.31 2019/04/09 14:47:14 maya Exp $
# Link the mesa_dri_drivers mega driver.
@@ -410,6 +410,7 @@ SRCS+= ${DRI_SOURCES.${_d}}
LIBDPLIBS+= expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat
LIBDPLIBS+= m ${NETBSDSRCDIR}/lib/libm
+LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
LIBDPLIBS+= glapi ${.CURDIR}/../libglapi
LIBDPLIBS+= drm ${.CURDIR}/../libdrm
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src Committed By: christos Date: Fri Apr 26 18:49:35 UTC 2019 Modified Files: src/external/mit/xorg/lib/dri: Makefile Log Message: Amputate stack protector warnings, instead of trying more band-aids. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/external/mit/xorg/lib/dri/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/Makefile diff -u src/external/mit/xorg/lib/dri/Makefile:1.31 src/external/mit/xorg/lib/dri/Makefile:1.32 --- src/external/mit/xorg/lib/dri/Makefile:1.31 Tue Apr 9 10:47:14 2019 +++ src/external/mit/xorg/lib/dri/Makefile Fri Apr 26 14:49:35 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2019/04/09 14:47:14 maya Exp $ +# $NetBSD: Makefile,v 1.32 2019/04/26 18:49:35 christos Exp $ # Link the mesa_dri_drivers mega driver. @@ -465,17 +465,7 @@ CWARNFLAGS.clang+= -Wno-error=initialize -Wno-error=tautological-constant-out-of-range-compare \ -Wno-error=enum-conversion -COPTS.brw_state_batch.c += -Wno-stack-protector -COPTS.brw_eu_compact.c += -Wno-stack-protector -COPTS.brw_fs.cpp += -Wno-stack-protector -COPTS.brw_fs_copy_propagation.cpp += -Wno-stack-protector -COPTS.brw_fs_reg_allocate.cpp += -Wno-stack-protector -COPTS.brw_program.c += -Wno-stack-protector -COPTS.brw_schedule_instructions.cpp += -Wno-stack-protector -COPTS.brw_vec4.cpp += -Wno-stack-protector -COPTS.brw_vec4_copy_propagation.cpp += -Wno-stack-protector -COPTS.brw_vec4_reg_allocate.cpp += -Wno-stack-protector -COPTS.brw_vec4_visitor.cpp += -Wno-stack-protector +COPTS+= -Wno-error=stack-protector .include .else
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: tron
Date: Sat Mar 10 20:52:30 UTC 2012
Modified Files:
src/external/mit/xorg/lib/dri: dri.mk
Log Message:
Link with "libexpat" again. This should fix the problems with X11 server
reported by Gary Duzan on the "current-users" mailing list.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/dri/dri.mk
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/dri.mk
diff -u src/external/mit/xorg/lib/dri/dri.mk:1.11 src/external/mit/xorg/lib/dri/dri.mk:1.12
--- src/external/mit/xorg/lib/dri/dri.mk:1.11 Wed Feb 29 20:07:56 2012
+++ src/external/mit/xorg/lib/dri/dri.mk Sat Mar 10 20:52:30 2012
@@ -1,4 +1,4 @@
-# $NetBSD: dri.mk,v 1.11 2012/02/29 20:07:56 tron Exp $
+# $NetBSD: dri.mk,v 1.12 2012/03/10 20:52:30 tron Exp $
# XXX DRI_LIB_DEPS
@@ -43,6 +43,7 @@ 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
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: mrg
Date: Thu Aug 27 04:36:14 UTC 2009
Modified Files:
src/external/mit/xorg/lib/dri: dri.mk
Log Message:
fix the SRCS list for swrast.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri/dri.mk
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/dri.mk
diff -u src/external/mit/xorg/lib/dri/dri.mk:1.6 src/external/mit/xorg/lib/dri/dri.mk:1.7
--- src/external/mit/xorg/lib/dri/dri.mk:1.6 Tue Jun 16 00:26:11 2009
+++ src/external/mit/xorg/lib/dri/dri.mk Thu Aug 27 04:36:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: dri.mk,v 1.6 2009/06/16 00:26:11 mrg Exp $
+# $NetBSD: dri.mk,v 1.7 2009/08/27 04:36:13 mrg Exp $
# XXX DRI_LIB_DEPS
@@ -29,11 +29,12 @@
# Common sources
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common \
${X11SRCDIR.MesaLib}/src/mesa/drivers/common
-.if (${MODULE} != "swrast")
-SRCS+= dri_util.c
+.if (${MODULE} == "swrast")
+SRCS+= driverfuncs.c utils.c
+.else
+SRCS+= dri_util.c drirenderbuffer.c driverfuncs.c texmem.c
+SRCS+= utils.c vblank.c xmlconfig.c
.endif
-SRCS+= drirenderbuffer.c driverfuncs.c texmem.c utils.c vblank.c \
- xmlconfig.c
.include
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: mrg
Date: Thu Aug 27 04:36:40 UTC 2009
Modified Files:
src/external/mit/xorg/lib/dri: Makefile
Log Message:
build libmesa and swrast on all platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/dri/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/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.12 src/external/mit/xorg/lib/dri/Makefile:1.13
--- src/external/mit/xorg/lib/dri/Makefile:1.12 Tue Jun 16 00:26:11 2009
+++ src/external/mit/xorg/lib/dri/Makefile Thu Aug 27 04:36:40 2009
@@ -1,22 +1,18 @@
-# $NetBSD: Makefile,v 1.12 2009/06/16 00:26:11 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2009/08/27 04:36:40 mrg Exp $
-.if ${MACHINE_ARCH} == "alpha"
SUBDIR= libmesa .WAIT
+
+.if ${MACHINE_ARCH} == "alpha"
SUBDIR+= mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident
.elif ${MACHINE} == "macppc"
-SUBDIR= libmesa .WAIT
SUBDIR+= mach64 mga r128 r200 r300 radeon tdfx
.elif ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "sparc"
-SUBDIR= libmesa .WAIT
SUBDIR+= mach64 mga r128 r200 r300 radeon
.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-SUBDIR= libmesa .WAIT
SUBDIR+= i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
savage sis tdfx trident unichrome
.endif
-.if !empty(SUBDIR)
SUBDIR+= swrast
-.endif
.include
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: mrg
Date: Mon Nov 9 02:38:25 UTC 2009
Modified Files:
src/external/mit/xorg/lib/dri/i915: Makefile
src/external/mit/xorg/lib/dri/i965: Makefile
Log Message:
link in -ldrm_intel on i915 and i965 drivers.
build i915 driver with -DI915 -DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP.
should fix errors reported by jak@ and probably many others.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/dri/i965/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/i915/Makefile
diff -u src/external/mit/xorg/lib/dri/i915/Makefile:1.3 src/external/mit/xorg/lib/dri/i915/Makefile:1.4
--- src/external/mit/xorg/lib/dri/i915/Makefile:1.3 Thu Jun 11 01:47:08 2009
+++ src/external/mit/xorg/lib/dri/i915/Makefile Mon Nov 9 02:38:24 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/06/11 01:47:08 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2009/11/09 02:38:24 mrg Exp $
MODULE= i915
@@ -56,4 +56,8 @@
intel_fbo.c \
intel_depthstencil.c
+CPPFLAGS+= -DI915 -DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP
+
+LIBS+= -ldrm_intel
+
.include "${.CURDIR}/../dri.mk"
Index: src/external/mit/xorg/lib/dri/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.4 src/external/mit/xorg/lib/dri/i965/Makefile:1.5
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.4 Thu Jun 11 01:47:08 2009
+++ src/external/mit/xorg/lib/dri/i965/Makefile Mon Nov 9 02:38:24 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/11 01:47:08 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2009/11/09 02:38:24 mrg Exp $
MODULE= i965
@@ -90,4 +90,6 @@
COPTS.brw_draw_upload.c= -Wno-error
+LIBS+= -ldrm_intel
+
.include "${.CURDIR}/../dri.mk"
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: mrg
Date: Sat May 22 22:44:16 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri/i915: Makefile
src/external/mit/xorg/lib/dri/i965: Makefile
Log Message:
sprinkle some more -Wno-error ...
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/dri/i965/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/i915/Makefile
diff -u src/external/mit/xorg/lib/dri/i915/Makefile:1.7 src/external/mit/xorg/lib/dri/i915/Makefile:1.8
--- src/external/mit/xorg/lib/dri/i915/Makefile:1.7 Wed Apr 7 19:56:01 2010
+++ src/external/mit/xorg/lib/dri/i915/Makefile Sat May 22 22:44:16 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/04/07 19:56:01 yhardy Exp $
+# $NetBSD: Makefile,v 1.8 2010/05/22 22:44:16 mrg Exp $
MODULE= i915
@@ -60,4 +60,7 @@
LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
+COPTS.intel_context.c+= -Wno-error # XXX
+COPTS.intel_swapbuffers.c+= -Wno-error # XXX
+
.include "${.CURDIR}/../dri.mk"
Index: src/external/mit/xorg/lib/dri/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.9 src/external/mit/xorg/lib/dri/i965/Makefile:1.10
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.9 Wed Apr 7 19:56:01 2010
+++ src/external/mit/xorg/lib/dri/i965/Makefile Sat May 22 22:44:16 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/04/07 19:56:01 yhardy Exp $
+# $NetBSD: Makefile,v 1.10 2010/05/22 22:44:16 mrg Exp $
MODULE= i965
@@ -91,4 +91,7 @@
LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
+COPTS.intel_context.c+= -Wno-error # XXX
+COPTS.intel_swapbuffers.c+= -Wno-error # XXX
+
.include "${.CURDIR}/../dri.mk"
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: mrg
Date: Sun May 23 23:21:31 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri/r200: Makefile
src/external/mit/xorg/lib/dri/r300: Makefile
src/external/mit/xorg/lib/dri/r600: Makefile
src/external/mit/xorg/lib/dri/radeon: Makefile
Log Message:
these depend upon libdrm_radeon now.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/dri/r200/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/dri/r300/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/dri/r600/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/dri/radeon/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/r200/Makefile
diff -u src/external/mit/xorg/lib/dri/r200/Makefile:1.5 src/external/mit/xorg/lib/dri/r200/Makefile:1.6
--- src/external/mit/xorg/lib/dri/r200/Makefile:1.5 Sun May 23 21:31:53 2010
+++ src/external/mit/xorg/lib/dri/r200/Makefile Sun May 23 23:21:30 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/05/23 21:31:53 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2010/05/23 23:21:30 mrg Exp $
MODULE= r200
@@ -44,6 +44,8 @@
radeon_bo.c \
radeon_cs.c
+LIBDPLIBS+= drm_radeon ${.CURDIR}/../../libdrm_radeon
+
# XXX
.if ${MACHINE_ARCH} == "sparc64"
COPTS.r200_tcl.c= -Wno-error
Index: src/external/mit/xorg/lib/dri/r300/Makefile
diff -u src/external/mit/xorg/lib/dri/r300/Makefile:1.4 src/external/mit/xorg/lib/dri/r300/Makefile:1.5
--- src/external/mit/xorg/lib/dri/r300/Makefile:1.4 Sun May 23 21:31:53 2010
+++ src/external/mit/xorg/lib/dri/r300/Makefile Sun May 23 23:21:30 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/05/23 21:31:53 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/05/23 23:21:30 mrg Exp $
MODULE= r300
@@ -47,6 +47,8 @@
radeon_bo.c \
radeon_cs.c
+LIBDPLIBS+= drm_radeon ${.CURDIR}/../../libdrm_radeon
+
# ../common/mm.c \
# ../common/vblank.c \
# ../common/xmlconfig.c \
Index: src/external/mit/xorg/lib/dri/r600/Makefile
diff -u src/external/mit/xorg/lib/dri/r600/Makefile:1.1 src/external/mit/xorg/lib/dri/r600/Makefile:1.2
--- src/external/mit/xorg/lib/dri/r600/Makefile:1.1 Sun May 23 21:31:53 2010
+++ src/external/mit/xorg/lib/dri/r600/Makefile Sun May 23 23:21:31 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/05/23 21:31:53 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2010/05/23 23:21:31 mrg Exp $
MODULE= r600
@@ -48,6 +48,8 @@
radeon_bo.c \
radeon_cs.c
+LIBDPLIBS+= drm_radeon ${.CURDIR}/../../libdrm_radeon
+
COPTS.radeon_screen.c= -Wno-error # XXX const
.include "${.CURDIR}/../dri.mk"
Index: src/external/mit/xorg/lib/dri/radeon/Makefile
diff -u src/external/mit/xorg/lib/dri/radeon/Makefile:1.5 src/external/mit/xorg/lib/dri/radeon/Makefile:1.6
--- src/external/mit/xorg/lib/dri/radeon/Makefile:1.5 Sun May 23 21:31:53 2010
+++ src/external/mit/xorg/lib/dri/radeon/Makefile Sun May 23 23:21:31 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/05/23 21:31:53 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2010/05/23 23:21:31 mrg Exp $
MODULE= radeon
@@ -37,6 +37,8 @@
radeon_bo.c \
radeon_cs.c
+LIBDPLIBS+= drm_radeon ${.CURDIR}/../../libdrm_radeon
+
# XXX
.if ${MACHINE_ARCH} == "sparc64"
COPTS.radeon_tcl.c= -Wno-error
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: mrg
Date: Tue Jan 12 00:57:45 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri/i915: Makefile
src/external/mit/xorg/lib/dri/i965: Makefile
Log Message:
replace LIBS with LIBDPLIBS. makes these actually link against drm_intel.
should fix a problem reported by s...@.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri/i965/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/i915/Makefile
diff -u src/external/mit/xorg/lib/dri/i915/Makefile:1.4 src/external/mit/xorg/lib/dri/i915/Makefile:1.5
--- src/external/mit/xorg/lib/dri/i915/Makefile:1.4 Mon Nov 9 02:38:24 2009
+++ src/external/mit/xorg/lib/dri/i915/Makefile Tue Jan 12 00:57:45 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/11/09 02:38:24 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/01/12 00:57:45 mrg Exp $
MODULE= i915
@@ -58,6 +58,6 @@
CPPFLAGS+= -DI915 -DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP
-LIBS+= -ldrm_intel
+LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
.include "${.CURDIR}/../dri.mk"
Index: src/external/mit/xorg/lib/dri/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.6 src/external/mit/xorg/lib/dri/i965/Makefile:1.7
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.6 Sun Jan 10 17:35:33 2010
+++ src/external/mit/xorg/lib/dri/i965/Makefile Tue Jan 12 00:57:45 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/01/10 17:35:33 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2010/01/12 00:57:45 mrg Exp $
MODULE= i965
@@ -89,6 +89,6 @@
COPTS.brw_draw_upload.c= -Wno-error
-LIBS+= -ldrm_intel
+LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
.include "${.CURDIR}/../dri.mk"
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: mrg
Date: Tue Jan 12 03:56:17 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri/i915: Makefile
src/external/mit/xorg/lib/dri/i965: Makefile
Log Message:
link in libOSMesa as well.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/dri/i965/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/i915/Makefile
diff -u src/external/mit/xorg/lib/dri/i915/Makefile:1.5 src/external/mit/xorg/lib/dri/i915/Makefile:1.6
--- src/external/mit/xorg/lib/dri/i915/Makefile:1.5 Tue Jan 12 00:57:45 2010
+++ src/external/mit/xorg/lib/dri/i915/Makefile Tue Jan 12 03:56:17 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/01/12 00:57:45 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2010/01/12 03:56:17 mrg Exp $
MODULE= i915
@@ -59,5 +59,6 @@
CPPFLAGS+= -DI915 -DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP
LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
+LIBDPLIBS+= OSMesa ${.CURDIR}/../../libOSMesa
.include "${.CURDIR}/../dri.mk"
Index: src/external/mit/xorg/lib/dri/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.7 src/external/mit/xorg/lib/dri/i965/Makefile:1.8
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.7 Tue Jan 12 00:57:45 2010
+++ src/external/mit/xorg/lib/dri/i965/Makefile Tue Jan 12 03:56:17 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/01/12 00:57:45 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2010/01/12 03:56:17 mrg Exp $
MODULE= i965
@@ -90,5 +90,6 @@
COPTS.brw_draw_upload.c= -Wno-error
LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
+LIBDPLIBS+= OSMesa ${.CURDIR}/../../libOSMesa
.include "${.CURDIR}/../dri.mk"
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: yhardy
Date: Wed Apr 7 19:56:01 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri/i915: Makefile
src/external/mit/xorg/lib/dri/i965: Makefile
Log Message:
Don't link libOSMesa, this functionality is provided by mesa_dri.so.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/dri/i965/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/i915/Makefile
diff -u src/external/mit/xorg/lib/dri/i915/Makefile:1.6 src/external/mit/xorg/lib/dri/i915/Makefile:1.7
--- src/external/mit/xorg/lib/dri/i915/Makefile:1.6 Tue Jan 12 03:56:17 2010
+++ src/external/mit/xorg/lib/dri/i915/Makefile Wed Apr 7 19:56:01 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/01/12 03:56:17 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2010/04/07 19:56:01 yhardy Exp $
MODULE= i915
@@ -59,6 +59,5 @@
CPPFLAGS+= -DI915 -DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP
LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
-LIBDPLIBS+= OSMesa ${.CURDIR}/../../libOSMesa
.include "${.CURDIR}/../dri.mk"
Index: src/external/mit/xorg/lib/dri/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.8 src/external/mit/xorg/lib/dri/i965/Makefile:1.9
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.8 Tue Jan 12 03:56:17 2010
+++ src/external/mit/xorg/lib/dri/i965/Makefile Wed Apr 7 19:56:01 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/01/12 03:56:17 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2010/04/07 19:56:01 yhardy Exp $
MODULE= i965
@@ -90,6 +90,5 @@
COPTS.brw_draw_upload.c= -Wno-error
LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
-LIBDPLIBS+= OSMesa ${.CURDIR}/../../libOSMesa
.include "${.CURDIR}/../dri.mk"
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: mrg
Date: Thu Nov 18 08:41:54 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri: Makefile
Log Message:
build the dri libraries on ofppc, same as macppc.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/lib/dri/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/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.16 src/external/mit/xorg/lib/dri/Makefile:1.17
--- src/external/mit/xorg/lib/dri/Makefile:1.16 Sun Aug 1 06:24:30 2010
+++ src/external/mit/xorg/lib/dri/Makefile Thu Nov 18 08:41:54 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2010/08/01 06:24:30 kiyohara Exp $
+# $NetBSD: Makefile,v 1.17 2010/11/18 08:41:54 mrg Exp $
SUBDIR= libmesa .WAIT
.if ${MACHINE_ARCH} == "alpha"
SUBDIR+= mach64 mga r128 r200 r300 r600 radeon savage sis tdfx
-.elif ${MACHINE} == "macppc"
+.elif ${MACHINE} == "macppc" || ${MACHINE} == "ofppc"
SUBDIR+= mach64 mga r128 r200 r300 r600 radeon tdfx
.elif ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "sparc"
SUBDIR+= mach64 mga r128 r200 r300 r600 radeon
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: mrg
Date: Thu Dec 18 10:08:52 UTC 2014
Modified Files:
src/external/mit/xorg/lib/dri: Makefile
Log Message:
fix build problem with radeon_*.c files.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/mit/xorg/lib/dri/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/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.19 src/external/mit/xorg/lib/dri/Makefile:1.20
--- src/external/mit/xorg/lib/dri/Makefile:1.19 Thu Dec 18 06:24:28 2014
+++ src/external/mit/xorg/lib/dri/Makefile Thu Dec 18 10:08:52 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/12/18 06:24:28 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2014/12/18 10:08:52 mrg Exp $
# Link the mesa_dri_drivers mega driver.
@@ -295,13 +295,15 @@ R200_RADEON_FILES= \
radeon_screen.c
.for _f in ${R200_RADEON_FILES}
-BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r200/${_f} r200_${_f}
+BUILDSYMLINKS+= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon/${_f} r200_${_f}
DRI_SOURCES.r200+= r200_${_f}
.endfor
.for _f in ${DRI_SOURCES.r200}
CPPFLAGS.${_f} += -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r200/server \
-I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r200 \
+ -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon/server \
+ -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon \
-DRADEON_R200
.endfor
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: christos
Date: Fri Dec 19 05:03:30 UTC 2014
Modified Files:
src/external/mit/xorg/lib/dri: Makefile
Log Message:
- Explain what's going on a bit better
- Fix a conditional
- Don't include bsd.lib.mk if we are not building libraries
(otherwise we end up with an empty library name that installed
bogus library files lib.a etc.)
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/lib/dri/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/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.20 src/external/mit/xorg/lib/dri/Makefile:1.21
--- src/external/mit/xorg/lib/dri/Makefile:1.20 Thu Dec 18 05:08:52 2014
+++ src/external/mit/xorg/lib/dri/Makefile Fri Dec 19 00:03:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2014/12/18 10:08:52 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2014/12/19 05:03:30 christos Exp $
# Link the mesa_dri_drivers mega driver.
@@ -25,6 +25,8 @@ CPPFLAGS+= \
#CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS
# We don't actually build this on non-x86 at all, currently.
+# The following if statements are not effective since we only
+# get here for x86
.if ${MACHINE_ARCH} == "alpha"
DRIVERS= r200 radeon
.elif ${MACHINE} == "macppc" || ${MACHINE} == "ofppc"
@@ -359,7 +361,7 @@ MESA_SRC_MODULES= main math math_xform
.include "../libmesa.mk"
.include "../libglsl.mk"
-.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SRCS+= streaming-load-memcpy.c
CPPFLAGS.streaming-load-memcpy.c+= -msse4.1
.endif
@@ -389,6 +391,8 @@ FILES= drirc
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common
.include
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
LIBDIR= ${X11USRLIBDIR}/modules/dri
.include
+.endif
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: christos
Date: Fri Dec 19 05:21:51 UTC 2014
Modified Files:
src/external/mit/xorg/lib/dri: Makefile
Log Message:
we need to handle make includes
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/external/mit/xorg/lib/dri/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/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.21 src/external/mit/xorg/lib/dri/Makefile:1.22
--- src/external/mit/xorg/lib/dri/Makefile:1.21 Fri Dec 19 00:03:30 2014
+++ src/external/mit/xorg/lib/dri/Makefile Fri Dec 19 00:21:51 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2014/12/19 05:03:30 christos Exp $
+# $NetBSD: Makefile,v 1.22 2014/12/19 05:21:51 christos Exp $
# Link the mesa_dri_drivers mega driver.
@@ -395,4 +395,6 @@ FILES= drirc
LIBDIR= ${X11USRLIBDIR}/modules/dri
.include
+.else
+.include
.endif
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: christos
Date: Tue Dec 23 17:50:43 UTC 2014
Modified Files:
src/external/mit/xorg/lib/dri: Makefile
Log Message:
- consistently install symlinks (like we do for everything else)
- add missing debug libs
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/mit/xorg/lib/dri/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/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.22 src/external/mit/xorg/lib/dri/Makefile:1.23
--- src/external/mit/xorg/lib/dri/Makefile:1.22 Fri Dec 19 00:21:51 2014
+++ src/external/mit/xorg/lib/dri/Makefile Tue Dec 23 12:50:42 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/12/19 05:21:51 christos Exp $
+# $NetBSD: Makefile,v 1.23 2014/12/23 17:50:42 christos Exp $
# Link the mesa_dri_drivers mega driver.
@@ -13,6 +13,7 @@ SHLIB_MAJOR= 0
LIB= mesa_dri_drivers
DRIDIR= ${X11USRLIBDIR}/modules/dri
+DRIDEBUGDIR= ${DEBUGDIR}${X11USRLIBDIR}/modules/dri
# -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/${MODULE}/server \
@@ -369,8 +370,11 @@ CPPFLAGS.streaming-load-memcpy.c+= -msse
.include "../driver.mk"
.for _d in ${DRIVERS}
-LINKS+= ${DRIDIR}/mesa_dri_drivers.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so.${SHLIB_MAJOR}
+SYMLINKS+= mesa_dri_drivers.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so.${SHLIB_MAJOR}
SYMLINKS+= ${_d}_dri.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so
+.if ${MKDEBUG:Uno} == "yes"
+SYMLINKS+= mesa_dri_drivers.so.${SHLIB_MAJOR}.debug ${DRIDEBUGDIR}/${_d}_dri.so.${SHLIB_MAJOR}.debug
+.endif
.endfor
.endif
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src Committed By: christos Date: Mon Jan 5 16:26:48 UTC 2015 Modified Files: src/external/mit/xorg/lib/dri: Makefile Log Message: Prevent .y.c from regenerating c files from yacc. XXX: Why are we compiling glcpp-parse.c both here and in the gallium subdirectory? To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/external/mit/xorg/lib/dri/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/Makefile diff -u src/external/mit/xorg/lib/dri/Makefile:1.24 src/external/mit/xorg/lib/dri/Makefile:1.25 --- src/external/mit/xorg/lib/dri/Makefile:1.24 Sun Jan 4 20:34:42 2015 +++ src/external/mit/xorg/lib/dri/Makefile Mon Jan 5 11:26:48 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2015/01/05 01:34:42 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2015/01/05 16:26:48 christos Exp $ # Link the mesa_dri_drivers mega driver. @@ -405,3 +405,5 @@ CWARNFLAGS.clang+= -Wno-error=initialize .else .include .endif +# Don't re-build .c files when .y files change +.y.c:
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: riastradh
Date: Tue Jul 22 18:14:25 UTC 2014
Modified Files:
src/external/mit/xorg/lib/dri/r200: Makefile
src/external/mit/xorg/lib/dri/r300: Makefile
src/external/mit/xorg/lib/dri/r600: Makefile
Log Message:
Fix source lists for radeon dri modules.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/dri/r200/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/dri/r300/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri/r600/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/r200/Makefile
diff -u src/external/mit/xorg/lib/dri/r200/Makefile:1.9 src/external/mit/xorg/lib/dri/r200/Makefile:1.10
--- src/external/mit/xorg/lib/dri/r200/Makefile:1.9 Wed Jul 9 20:22:55 2014
+++ src/external/mit/xorg/lib/dri/r200/Makefile Tue Jul 22 18:14:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/07/09 20:22:55 riastradh Exp $
+# $NetBSD: Makefile,v 1.10 2014/07/22 18:14:25 riastradh Exp $
MODULE= r200
@@ -12,6 +12,7 @@ CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/me
DRI_EXTRA_PATHS= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon
SRCS= \
radeon_bo_legacy.c \
+ radeon_buffer_objects.c \
radeon_common_context.c \
radeon_common.c \
radeon_cs_legacy.c \
@@ -20,25 +21,30 @@ SRCS= \
radeon_fbo.c \
radeon_lock.c \
radeon_mipmap_tree.c \
+ radeon_pixel_read.c \
radeon_queryobj.c \
radeon_span.c \
- radeon_tex_copy.c \
radeon_texture.c \
- r200_blit.c \
- r200_context.c \
- r200_ioctl.c \
- r200_state.c \
- r200_state_init.c \
- r200_cmdbuf.c \
- r200_tex.c \
- r200_texstate.c \
- r200_tcl.c \
- r200_swtcl.c \
- r200_maos.c \
- r200_sanity.c \
- r200_fragshader.c \
- r200_vertprog.c \
- radeon_screen.c
+ radeon_tex_copy.c \
+ radeon_tex_getimage.c \
+ radeon_tile.c
+
+SRCS+= \
+ r200_context.c \
+ r200_ioctl.c \
+ r200_state.c \
+ r200_state_init.c \
+ r200_cmdbuf.c \
+ r200_tex.c \
+ r200_texstate.c \
+ r200_tcl.c \
+ r200_swtcl.c \
+ r200_maos.c \
+ r200_sanity.c \
+ r200_fragshader.c \
+ r200_vertprog.c \
+ r200_blit.c \
+ radeon_screen.c
SRCS+= \
radeon_cs_space_drm.c \
Index: src/external/mit/xorg/lib/dri/r300/Makefile
diff -u src/external/mit/xorg/lib/dri/r300/Makefile:1.9 src/external/mit/xorg/lib/dri/r300/Makefile:1.10
--- src/external/mit/xorg/lib/dri/r300/Makefile:1.9 Wed Jul 9 20:22:55 2014
+++ src/external/mit/xorg/lib/dri/r300/Makefile Tue Jul 22 18:14:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/07/09 20:22:55 riastradh Exp $
+# $NetBSD: Makefile,v 1.10 2014/07/22 18:14:25 riastradh Exp $
MODULE= r300
@@ -14,7 +14,10 @@ CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/me
-I${X11SRCDIR.MesaLib}/src/glsl
DRI_EXTRA_PATHS= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon \
- ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r300/compiler
+ ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r300/compiler \
+ ${X11SRCDIR.MesaLib}/src/glsl \
+ ${X11SRCDIR.MesaLib}/src/mesa/program
+
SRCS= \
radeon_bo_legacy.c \
radeon_buffer_objects.c \
@@ -26,25 +29,30 @@ SRCS= \
radeon_fbo.c \
radeon_lock.c \
radeon_mipmap_tree.c \
- radeon_span.c \
+ radeon_pixel_read.c \
radeon_queryobj.c \
- radeon_tex_copy.c \
+ radeon_span.c \
radeon_texture.c \
- 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
+ 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 \
@@ -53,28 +61,44 @@ SRCS+= \
# 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
+ 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
CVS commit: src/external/mit/xorg/lib/dri/libmesa
Module Name:src Committed By: christos Date: Sat Feb 9 17:18:01 UTC 2013 Modified Files: src/external/mit/xorg/lib/dri/libmesa: Makefile Log Message: explicitly set the prefix here. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/dri/libmesa/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/libmesa/Makefile diff -u src/external/mit/xorg/lib/dri/libmesa/Makefile:1.10 src/external/mit/xorg/lib/dri/libmesa/Makefile:1.11 --- src/external/mit/xorg/lib/dri/libmesa/Makefile:1.10 Thu Mar 22 19:46:27 2012 +++ src/external/mit/xorg/lib/dri/libmesa/Makefile Sat Feb 9 12:18:01 2013 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2012/03/22 23:46:27 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2013/02/09 17:18:01 christos Exp $ .include +_LIB_PREFIX= lib LIB= mesa_dri LIBISMODULE= yes
CVS commit: src/external/mit/xorg/lib/dri/libmesa
Module Name:src
Committed By: mrg
Date: Tue Jun 16 05:16:13 UTC 2009
Modified Files:
src/external/mit/xorg/lib/dri/libmesa: Makefile
Log Message:
be sure to link in the swrast_setup code, too
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/dri/libmesa/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/libmesa/Makefile
diff -u src/external/mit/xorg/lib/dri/libmesa/Makefile:1.2 src/external/mit/xorg/lib/dri/libmesa/Makefile:1.3
--- src/external/mit/xorg/lib/dri/libmesa/Makefile:1.2 Sun Feb 15 19:00:22 2009
+++ src/external/mit/xorg/lib/dri/libmesa/Makefile Tue Jun 16 05:16:12 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/02/15 19:00:22 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2009/06/16 05:16:12 mrg Exp $
.include
@@ -7,7 +7,7 @@
SHLIB_MAJOR= 0
-MESA_SRC_MODULES= main math vbo tnl shader swrast slang
+MESA_SRC_MODULES= main math vbo tnl shader swrast slang ss
CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/main \
-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
CVS commit: src/external/mit/xorg/lib/dri/r300
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"
CVS commit: src/external/mit/xorg/lib/dri/i965
Module Name:src
Committed By: mrg
Date: Sun Jan 10 17:35:33 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri/i965: Makefile
Log Message:
fix a problem reported by jmorse:
- fix a line continuation that stopped SRCS= from working
- don't include intel_dri.c here
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/dri/i965/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/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.5 src/external/mit/xorg/lib/dri/i965/Makefile:1.6
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.5 Mon Nov 9 02:38:24 2009
+++ src/external/mit/xorg/lib/dri/i965/Makefile Sun Jan 10 17:35:33 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/11/09 02:38:24 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2010/01/10 17:35:33 mrg Exp $
MODULE= i965
@@ -7,7 +7,7 @@
-I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel/server
DRI_EXTRA_PATHS= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel \
- ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel/server \
+ ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel/server
SRCS= \
intel_batchbuffer.c \
intel_blit.c \
@@ -85,8 +85,7 @@
brw_wm_pass2.c \
brw_wm_sampler_state.c \
brw_wm_state.c \
- brw_wm_surface_state.c \
- intel_dri.c
+ brw_wm_surface_state.c
COPTS.brw_draw_upload.c= -Wno-error
CVS commit: src/external/mit/xorg/lib/dri/libmesa
Module Name:src
Committed By: yhardy
Date: Wed Apr 7 20:04:16 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri/libmesa: Makefile
Log Message:
i915 and i965 dri modules need glapi.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/dri/libmesa/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/libmesa/Makefile
diff -u src/external/mit/xorg/lib/dri/libmesa/Makefile:1.4 src/external/mit/xorg/lib/dri/libmesa/Makefile:1.5
--- src/external/mit/xorg/lib/dri/libmesa/Makefile:1.4 Thu Oct 8 19:06:50 2009
+++ src/external/mit/xorg/lib/dri/libmesa/Makefile Wed Apr 7 20:04:16 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/10/08 19:06:50 snj Exp $
+# $NetBSD: Makefile,v 1.5 2010/04/07 20:04:16 yhardy Exp $
.include
@@ -7,7 +7,7 @@
SHLIB_MAJOR= 0
-MESA_SRC_MODULES= main math vbo tnl shader swrast slang ss
+MESA_SRC_MODULES= glapi main math vbo tnl shader swrast slang ss
CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/main \
-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
