CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: christos
Date: Wed May 1 21:34:48 UTC 2024
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Allow c99 array designators
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.54 src/external/mit/xorg/lib/gallium/Makefile:1.55
--- src/external/mit/xorg/lib/gallium/Makefile:1.54 Fri Apr 26 12:34:17 2024
+++ src/external/mit/xorg/lib/gallium/Makefile Wed May 1 17:34:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2024/04/26 16:34:17 rillig Exp $
+# $NetBSD: Makefile,v 1.55 2024/05/01 21:34:48 christos Exp $
# Link the gallium mega driver.
@@ -19,7 +19,7 @@ DRIDEBUGDIR= ${DEBUGDIR}${X11USRLIBDIR}/
LLVM_INCLUDE_OBJDIR!= cd ${NETBSDSRCDIR}/external/apache2/llvm/include && ${PRINTOBJDIR}
-CWARNFLAGS.clang += -Wno-atomic-alignment -Wno-unknown-warning-option -Wno-implicit-int-float-conversion
+CWARNFLAGS.clang += -Wno-atomic-alignment -Wno-unknown-warning-option -Wno-implicit-int-float-conversion -Wno-c99-designator
CXXFLAGS+= -std=c++14
CFLAGS+= -std=gnu11
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: christos Date: Wed May 1 21:34:48 UTC 2024 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Allow c99 array designators To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: rillig Date: Fri Apr 26 16:34:18 UTC 2024 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: gallium: disable lint To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/external/mit/xorg/lib/gallium/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/gallium/Makefile diff -u src/external/mit/xorg/lib/gallium/Makefile:1.53 src/external/mit/xorg/lib/gallium/Makefile:1.54 --- src/external/mit/xorg/lib/gallium/Makefile:1.53 Sat Nov 25 20:00:25 2023 +++ src/external/mit/xorg/lib/gallium/Makefile Fri Apr 26 16:34:17 2024 @@ -1,10 +1,12 @@ -# $NetBSD: Makefile,v 1.53 2023/11/25 20:00:25 rjs Exp $ +# $NetBSD: Makefile,v 1.54 2024/04/26 16:34:17 rillig Exp $ # Link the gallium mega driver. LIBISMODULE= yes LIBISCXX= yes +NOLINT= # Lots of "Unsupported platform" due to undefined __GNUC__ + .include .include "../mesa-which.mk"
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: rillig Date: Fri Apr 26 16:34:18 UTC 2024 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: gallium: disable lint To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: rjs Date: Sat Nov 25 20:00:25 UTC 2023 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Make building of more files conditional on MKLLVMRT. Make r300_state_derived.c compile with gcc 12. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: rjs
Date: Sat Nov 25 20:00:25 UTC 2023
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Make building of more files conditional on MKLLVMRT.
Make r300_state_derived.c compile with gcc 12.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.52 src/external/mit/xorg/lib/gallium/Makefile:1.53
--- src/external/mit/xorg/lib/gallium/Makefile:1.52 Wed Nov 22 17:48:35 2023
+++ src/external/mit/xorg/lib/gallium/Makefile Sat Nov 25 20:00:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2023/11/22 17:48:35 rjs Exp $
+# $NetBSD: Makefile,v 1.53 2023/11/25 20:00:25 rjs Exp $
# Link the gallium mega driver.
@@ -343,8 +343,12 @@ GALLIUM_SOURCES.auxiliary/util= \
GALLIUM_SOURCES.auxiliary/nir = \
nir_draw_helpers.c \
nir_to_tgsi.c \
- nir_to_tgsi_info.c \
tgsi_to_nir.c
+
+.if ${MKLLVMRT} != "no"
+GALLIUM_SOURCES.auxiliary/nir+= nir_to_tgsi_info.c
+.endif
+
GALLIUM_SOURCES.auxiliary/vl= \
vl_bicubic_filter.c \
vl_compositor.c \
@@ -384,6 +388,7 @@ CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/sr
GALLIUM_SOURCES.auxiliary/renderonly= \
renderonly.c
+.if ${MKLLVMRT} != "no"
GALLIUM_SOURCES.auxiliary/gallivm= \
lp_bld_arit.c \
lp_bld_arit_overflow.c \
@@ -422,8 +427,9 @@ GALLIUM_SOURCES.auxiliary/gallivm= \
lp_bld_tgsi.c \
lp_bld_tgsi_info.c \
lp_bld_tgsi_soa.c \
- lp_bld_type.c
- #lp_bld_debug.cpp
+ lp_bld_type.c \
+ lp_bld_debug.cpp
+.endif
.for _f in ${GALLIUM_SOURCES.auxiliary/gallivm}
CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/gallium/auxiliary/util
@@ -736,6 +742,8 @@ GALLIUM_SOURCES.drivers/r300 = \
r300_vs.c \
r300_vs_draw.c
+CPPFLAGS.r300_state_derived.c = ${CC_WNO_STRINGOP_OVERREAD}
+
GALLIUM_SOURCES.drivers/r300/compiler = \
memory_pool.c \
r300_fragprog.c \
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: joerg
Date: Tue Feb 23 15:16:43 UTC 2021
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Don't hard-code LLVM version, but pick it up from build glue.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.44 src/external/mit/xorg/lib/gallium/Makefile:1.45
--- src/external/mit/xorg/lib/gallium/Makefile:1.44 Sat Apr 4 03:04:58 2020
+++ src/external/mit/xorg/lib/gallium/Makefile Tue Feb 23 15:16:43 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2020/04/04 03:04:58 christos Exp $
+# $NetBSD: Makefile,v 1.45 2021/02/23 15:16:43 joerg Exp $
# Link the gallium mega driver.
@@ -1114,8 +1114,8 @@ CPPFLAGS.streaming-load-memcpy.c+= -msse
CPPFLAGS.i386+= -march=i586
CPPFLAGS+= ${CPPFLAGS.${XORG_MACHINE_ARCH:U${MACHINE_ARCH}}}
-CPPFLAGS.r600_pipe_common.c+= -DMESA_LLVM_VERSION_STRING=\"9.0.0\"
-CPPFLAGS.si_get.c+= -DMESA_LLVM_VERSION_STRING=\"9.0.0\"
+CPPFLAGS.r600_pipe_common.c+= -DMESA_LLVM_VERSION_STRING=\"${LLVM_VERSION}\"
+CPPFLAGS.si_get.c+= -DMESA_LLVM_VERSION_STRING=\"${LLVM_VERSION}\"
.include "../driver.mk"
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: joerg Date: Tue Feb 23 15:16:43 UTC 2021 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Don't hard-code LLVM version, but pick it up from build glue. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: christos Date: Sat Apr 4 03:04:58 UTC 2020 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Add all the dependent libraries and sort To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: christos
Date: Sat Apr 4 03:04:58 UTC 2020
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Add all the dependent libraries and sort
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.43 src/external/mit/xorg/lib/gallium/Makefile:1.44
--- src/external/mit/xorg/lib/gallium/Makefile:1.43 Fri Jan 31 16:13:40 2020
+++ src/external/mit/xorg/lib/gallium/Makefile Fri Apr 3 23:04:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2020/01/31 21:13:40 jmcneill Exp $
+# $NetBSD: Makefile,v 1.44 2020/04/04 03:04:58 christos Exp $
# Link the gallium mega driver.
@@ -25,7 +25,6 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libd
CFLAGS+= -pthread
LDFLAGS+= -pthread
-LIBDPLIBS+= pthread ${.CURDIR}/../../../../../lib/libpthread
GALLIUM_SUBDIRS= \
auxiliary \
@@ -953,10 +952,11 @@ CPPFLAGS.${_s}+= -I${X11SRCDIR.Mesa}/src
.if ${BUILD_RADEON} == 1
CFLAGS+= -pthread
LDFLAGS+= -pthread
-LIBDPLIBS+= pthread ${.CURDIR}/../../../../../lib/libpthread
.endif
-LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
+LIBDPLIBS+= X11-xcb ${.CURDIR}/../libX11/libX11-xcb
+LIBDPLIBS+= xcb-dri2${.CURDIR}/../libxcb/dri2
+LIBDPLIBS+= xcb ${.CURDIR}/../libxcb/libxcb
.if ${BUILD_RADEON} == 1 || ${BUILD_NOUVEAU} == 1
LIBDPLIBS+= drm ${.CURDIR}/../libdrm
.if ${BUILD_I915} == 1
@@ -973,10 +973,11 @@ LIBDPLIBS+= drm_nouveau ${.CURDIR}/../l
LIBDPLIBS+= glapi ${.CURDIR}/../libglapi
LIBDPLIBS+= expat ${.CURDIR}/../../../../../external/mit/expat/lib/libexpat
LIBDPLIBS+= terminfo ${.CURDIR}/../../../../../lib/libterminfo
-LIBDPLIBS+= z ${.CURDIR}/../../../../../lib/libz
LIBDPLIBS+= execinfo ${.CURDIR}/../../../../../lib/libexecinfo
-LIBDPLIBS+= X11-xcb ${.CURDIR}/../libX11/libX11-xcb
-LIBDPLIBS+= xcb-dri2${.CURDIR}/../libxcb/dri2
+
+LIBDPLIBS+= elf ${NETBSDSRCDIR}/external/bsd/elftoolchain/lib/libelf
+LIBDPLIBS+= z ${.CURDIR}/../../../../../lib/libz
+LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
# gallium drivers requiring LLVM
.if ${BUILD_LLVMPIPE} == 1 || ${BUILD_RADEON} == 1
Re: CVS commit: src/external/mit/xorg/lib/gallium
On Fri, Jan 31, 2020 at 09:13:40PM +, Jared D. McNeill wrote:
> Module Name: src
> Committed By: jmcneill
> Date: Fri Jan 31 21:13:40 UTC 2020
>
> Modified Files:
> src/external/mit/xorg/lib/gallium: Makefile
>
> Log Message:
> Bump MESA_LLVM_VERSION_STRING
Directly use ${LLVM_VERSION}?
Joerg
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: jmcneill Date: Fri Jan 31 21:13:40 UTC 2020 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Bump MESA_LLVM_VERSION_STRING To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: jmcneill
Date: Fri Jan 31 21:13:40 UTC 2020
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Bump MESA_LLVM_VERSION_STRING
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.42 src/external/mit/xorg/lib/gallium/Makefile:1.43
--- src/external/mit/xorg/lib/gallium/Makefile:1.42 Fri Jan 31 20:56:03 2020
+++ src/external/mit/xorg/lib/gallium/Makefile Fri Jan 31 21:13:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2020/01/31 20:56:03 jmcneill Exp $
+# $NetBSD: Makefile,v 1.43 2020/01/31 21:13:40 jmcneill Exp $
# Link the gallium mega driver.
@@ -1113,8 +1113,8 @@ CPPFLAGS.streaming-load-memcpy.c+= -msse
CPPFLAGS.i386+= -march=i586
CPPFLAGS+= ${CPPFLAGS.${XORG_MACHINE_ARCH:U${MACHINE_ARCH}}}
-CPPFLAGS.r600_pipe_common.c+= -DMESA_LLVM_VERSION_STRING=\"7.0.0\"
-CPPFLAGS.si_get.c+= -DMESA_LLVM_VERSION_STRING=\"7.0.0\"
+CPPFLAGS.r600_pipe_common.c+= -DMESA_LLVM_VERSION_STRING=\"9.0.0\"
+CPPFLAGS.si_get.c+= -DMESA_LLVM_VERSION_STRING=\"9.0.0\"
.include "../driver.mk"
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: martin Date: Wed Nov 20 06:23:31 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Restrict -Wl,-z,defs to x86 and aarch64 for now to avoid global build lossage. Suggested by mrg. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: martin
Date: Wed Nov 20 06:23:31 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Restrict -Wl,-z,defs to x86 and aarch64 for now to avoid global build
lossage. Suggested by mrg.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.39 src/external/mit/xorg/lib/gallium/Makefile:1.40
--- src/external/mit/xorg/lib/gallium/Makefile:1.39 Tue Nov 19 08:59:18 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Wed Nov 20 06:23:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/11/19 08:59:18 martin Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/20 06:23:31 martin Exp $
# Link the gallium mega driver.
@@ -1086,7 +1086,10 @@ LLVMRT_LIBS+= \
.endif # ${BUILD_LLVM_PIPE} == 1 || ${BUILD_RADEON} == 1
-LDFLAGS+= -Wl,--version-script=${X11SRCDIR.Mesa}/src/gallium/targets/dri/dri.sym -Wl,-z,defs
+LDFLAGS+= -Wl,--version-script=${X11SRCDIR.Mesa}/src/gallium/targets/dri/dri.sym
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE_CPU} == "aarch64"
+LDFLAGS+= -Wl,-z,defs
+.endif
## build mesagallium parts
MESA_SRC_MODULES= main math vbo state_tracker program asm_s
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: martin
Date: Tue Nov 19 08:59:18 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Looks like this requires pthread.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.38 src/external/mit/xorg/lib/gallium/Makefile:1.39
--- src/external/mit/xorg/lib/gallium/Makefile:1.38 Mon Nov 18 22:26:15 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Tue Nov 19 08:59:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2019/11/18 22:26:15 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2019/11/19 08:59:18 martin Exp $
# Link the gallium mega driver.
@@ -23,6 +23,10 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libd
-I${NETBSDSRCDIR}/external/apache2/llvm/dist/llvm/include \
-I${LLVM_INCLUDE_OBJDIR} -I${NETBSDSRCDIR}/external/apache2/llvm/config
+CFLAGS+= -pthread
+LDFLAGS+= -pthread
+LIBDPLIBS+= pthread ${.CURDIR}/../../../../../lib/libpthread
+
GALLIUM_SUBDIRS= \
auxiliary \
auxiliary/cso_cache \
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: martin Date: Tue Nov 19 08:59:18 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Looks like this requires pthread. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: christos Date: Mon Oct 28 18:38:54 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: another vax optimizer hack. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: christos
Date: Mon Oct 28 18:38:54 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
another vax optimizer hack.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.35 src/external/mit/xorg/lib/gallium/Makefile:1.36
--- src/external/mit/xorg/lib/gallium/Makefile:1.35 Tue Sep 24 15:29:41 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Mon Oct 28 14:38:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2019/09/24 19:29:41 maya Exp $
+# $NetBSD: Makefile,v 1.36 2019/10/28 18:38:54 christos Exp $
# Link the gallium mega driver.
@@ -1186,6 +1186,9 @@ SYMLINKS+= gallium_dri.so.${SHLIB_MAJOR}
COPTS+= ${${ACTIVE_CC} == "clang":? -Wa,-Av8plus :}
.endif
+.if ${MACHINE_ARCH} == "vax"
+COPTS.nir.c += -O1
+.endif
.include
# Don't regenerate c files
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: mrg
Date: Sun Jul 7 17:50:34 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
re-add arm64 to the list of llvm-ok platforms. fixes gallium_dri.so:
swrast_dri.so: Undefined symbol "lp_native_vector_width" (symnum = 388))
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.33 src/external/mit/xorg/lib/gallium/Makefile:1.34
--- src/external/mit/xorg/lib/gallium/Makefile:1.33 Wed Jun 19 05:17:05 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Sun Jul 7 17:50:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2019/06/19 05:17:05 mrg Exp $
+# $NetBSD: Makefile,v 1.34 2019/07/07 17:50:34 mrg Exp $
# Link the gallium mega driver.
@@ -103,6 +103,7 @@ BUILD_VDPAU=1
${MACHINE_ARCH} == "x86_64" || \
${MACHINE_ARCH} == "powerpc" || \
${MACHINE_ARCH} == "powerpc64" || \
+!empty(MACHINE_ARCH:Maarch64*) || \
!empty(MACHINE_ARCH:Mmips*) || \
!empty(MACHINE_ARCH:Mearm*) || \
!empty(MACHINE_ARCH:Marm*)
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: mrg Date: Sun Jul 7 17:50:34 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: re-add arm64 to the list of llvm-ok platforms. fixes gallium_dri.so: swrast_dri.so: Undefined symbol "lp_native_vector_width" (symnum = 388)) To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: mrg Date: Wed Jun 19 05:17:05 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: allow all arm platforms, not just evbarm, to build with MKLLVMRT. allow mips and powerpc platforms as well. amusingly, this allows my shark to finally have functional if not usable GL :-) glxgears gets 1fps. status: - arm32 and ppc have llvm dynamic linker patches. - ppc is not yet working. - mips untested. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: mrg
Date: Wed Jun 19 05:17:05 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
allow all arm platforms, not just evbarm, to build with MKLLVMRT.
allow mips and powerpc platforms as well.
amusingly, this allows my shark to finally have functional
if not usable GL :-) glxgears gets 1fps.
status:
- arm32 and ppc have llvm dynamic linker patches.
- ppc is not yet working.
- mips untested.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.32 src/external/mit/xorg/lib/gallium/Makefile:1.33
--- src/external/mit/xorg/lib/gallium/Makefile:1.32 Sun Jun 9 01:56:49 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Wed Jun 19 05:17:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2019/06/09 01:56:49 mrg Exp $
+# $NetBSD: Makefile,v 1.33 2019/06/19 05:17:05 mrg Exp $
# Link the gallium mega driver.
@@ -97,6 +97,15 @@ BUILD_RADEON=1
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
BUILD_NOUVEAU=1
BUILD_VDPAU=1
+.endif
+
+.if ${MACHINE_ARCH} == "i386" || \
+${MACHINE_ARCH} == "x86_64" || \
+${MACHINE_ARCH} == "powerpc" || \
+${MACHINE_ARCH} == "powerpc64" || \
+!empty(MACHINE_ARCH:Mmips*) || \
+!empty(MACHINE_ARCH:Mearm*) || \
+!empty(MACHINE_ARCH:Marm*)
. if ${MKLLVMRT} != "no"
BUILD_LLVMPIPE=1
. endif
@@ -998,7 +1007,6 @@ LLVMRT_LIBS+= \
.endif
.if ${MACHINE_CPU} == "aarch64"
-# XXX duplicates
LLVMRT_LIBS+= \
AArch64AsmParser \
AArch64CodeGen \
@@ -1010,7 +1018,6 @@ LLVMRT_LIBS+= \
.endif
.if ${MACHINE_CPU} == "arm"
-# XXX duplicates
LLVMRT_LIBS+= \
ARMCodeGen \
ARMDisassembler \
@@ -1021,6 +1028,26 @@ LLVMRT_LIBS+= \
ARMUtils
.endif
+.if ${MACHINE_CPU} == "mips"
+LLVMRT_LIBS+= \
+ MipsCodeGen \
+ MipsDisassembler \
+ MipsAsmParser \
+ MipsMCTargetDesc \
+ MipsAsmPrinter \
+ MipsTargetInfo
+.endif
+
+.if ${MACHINE_CPU} == "powerpc"
+LLVMRT_LIBS+= \
+ PowerPCCodeGen \
+ PowerPCDisassembler \
+ PowerPCTargetInfo \
+ PowerPCMCTargetDesc \
+ PowerPCAsmParser \
+ PowerPCAsmPrinter
+.endif
+
LLVMRT_LIBS+= \
GlobalISel \
MCDisassembler \
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: mrg
Date: Sun Jun 9 01:56:49 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
add ARMDisassembler for the arm section. fixes linkage issue.
unfortunately, this doesn't work. something generates code
with an R_ARM_REL32 relocation and the
llvm::RuntimeDyldELF::resolveARMRelocation() function doesn not
support this and boom:
500 switch (Type) {
501 default:
502 llvm_unreachable("Not implemented relocation type!");
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.31 src/external/mit/xorg/lib/gallium/Makefile:1.32
--- src/external/mit/xorg/lib/gallium/Makefile:1.31 Fri Jun 7 12:11:43 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Sun Jun 9 01:56:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/06/07 12:11:43 mrg Exp $
+# $NetBSD: Makefile,v 1.32 2019/06/09 01:56:49 mrg Exp $
# Link the gallium mega driver.
@@ -1013,6 +1013,7 @@ LLVMRT_LIBS+= \
# XXX duplicates
LLVMRT_LIBS+= \
ARMCodeGen \
+ ARMDisassembler \
ARMTargetInfo \
ARMMCTargetDesc \
ARMAsmParser \
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: mrg Date: Fri Jun 7 12:11:43 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: allow building arm llvmpipe. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: mrg
Date: Fri Jun 7 12:11:43 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
allow building arm llvmpipe.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.30 src/external/mit/xorg/lib/gallium/Makefile:1.31
--- src/external/mit/xorg/lib/gallium/Makefile:1.30 Fri Jun 7 06:00:05 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Fri Jun 7 12:11:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2019/06/07 06:00:05 mrg Exp $
+# $NetBSD: Makefile,v 1.31 2019/06/07 12:11:43 mrg Exp $
# Link the gallium mega driver.
@@ -1009,6 +1009,17 @@ LLVMRT_LIBS+= \
AArch64TargetInfo
.endif
+.if ${MACHINE_CPU} == "arm"
+# XXX duplicates
+LLVMRT_LIBS+= \
+ ARMCodeGen \
+ ARMTargetInfo \
+ ARMMCTargetDesc \
+ ARMAsmParser \
+ ARMAsmPrinter \
+ ARMUtils
+.endif
+
LLVMRT_LIBS+= \
GlobalISel \
MCDisassembler \
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: mrg
Date: Fri Jun 7 06:00:05 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
put BUILD_LLVMPIPE and it's MKLLVMRT conditional inside the x86 + evbarm
section, so that arm* can build llvmpipe.
the default for arm* and MKLLVMRT remains "no", and for arm64 it does not
actually work yet (faults in "dc cvau", but i don't know why yet).
NFCI.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.29 src/external/mit/xorg/lib/gallium/Makefile:1.30
--- src/external/mit/xorg/lib/gallium/Makefile:1.29 Sun Jun 2 11:35:55 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Fri Jun 7 06:00:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/06/02 11:35:55 mrg Exp $
+# $NetBSD: Makefile,v 1.30 2019/06/07 06:00:05 mrg Exp $
# Link the gallium mega driver.
@@ -90,14 +90,16 @@ BUILD_LLVMPIPE=0
BUILD_I915=0
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
BUILD_I915=1
-.if ${MKLLVMRT} != "no"
+. if ${MKLLVMRT} != "no"
BUILD_RADEON=1
-BUILD_LLVMPIPE=1
-.endif
+. endif
.endif
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
BUILD_NOUVEAU=1
BUILD_VDPAU=1
+. if ${MKLLVMRT} != "no"
+BUILD_LLVMPIPE=1
+. endif
.endif
DRIVERS= kms_swrast swrast
@@ -994,6 +996,19 @@ LLVMRT_LIBS+= \
X86TargetInfo \
X86Utils
.endif
+
+.if ${MACHINE_CPU} == "aarch64"
+# XXX duplicates
+LLVMRT_LIBS+= \
+ AArch64AsmParser \
+ AArch64CodeGen \
+ AArch64MCTargetDesc \
+ AArch64Utils \
+ AArch64AsmPrinter \
+ AArch64Disassembler \
+ AArch64TargetInfo
+.endif
+
LLVMRT_LIBS+= \
GlobalISel \
MCDisassembler \
@@ -1076,11 +1091,13 @@ CPPFLAGS.target.c += \
CPPFLAGS.target.c += \
-DGALLIUM_LLVMPIPE
.endif #${BUILD_LLVMPIPE} == 1
+
.if ${BUILD_I915} == 1
CPPFLAGS.target.c += \
-DGALLIUM_I915 \
-DGALLIUM_ILO
.endif
+
.if ${BUILD_RADEON} == 1
CPPFLAGS.target.c += \
-DGALLIUM_R200 \
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: mrg Date: Fri Jun 7 06:00:05 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: put BUILD_LLVMPIPE and it's MKLLVMRT conditional inside the x86 + evbarm section, so that arm* can build llvmpipe. the default for arm* and MKLLVMRT remains "no", and for arm64 it does not actually work yet (faults in "dc cvau", but i don't know why yet). NFCI. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: maya
Date: Thu May 30 23:15:46 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Add libraries to resolve missing xcb symbols
Fixes executing 'emulators/nestopia' on r600, reported by nia, thanks!
XXX we might want to get rid of the references instead.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.27 src/external/mit/xorg/lib/gallium/Makefile:1.28
--- src/external/mit/xorg/lib/gallium/Makefile:1.27 Thu May 16 01:22:35 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Thu May 30 23:15:46 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/05/16 01:22:35 christos Exp $
+# $NetBSD: Makefile,v 1.28 2019/05/30 23:15:46 maya Exp $
# Link the gallium mega driver.
@@ -959,6 +959,8 @@ LIBDPLIBS+= expat ${.CURDIR}/../../../.
LIBDPLIBS+= terminfo ${.CURDIR}/../../../../../lib/libterminfo
LIBDPLIBS+= z ${.CURDIR}/../../../../../lib/libz
LIBDPLIBS+= execinfo ${.CURDIR}/../../../../../lib/libexecinfo
+LIBDPLIBS+= X11-xcb ${.CURDIR}/../libX11/libX11-xcb
+LIBDPLIBS+= xcb-dri2${.CURDIR}/../libxcb/dri2
# gallium drivers requiring LLVM
.if ${BUILD_LLVMPIPE} == 1 || ${BUILD_RADEON} == 1
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: maya Date: Thu May 30 23:15:46 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Add libraries to resolve missing xcb symbols Fixes executing 'emulators/nestopia' on r600, reported by nia, thanks! XXX we might want to get rid of the references instead. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: christos
Date: Sat May 11 17:44:16 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
elide clang warnings
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.25 src/external/mit/xorg/lib/gallium/Makefile:1.26
--- src/external/mit/xorg/lib/gallium/Makefile:1.25 Tue Apr 16 13:29:09 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Sat May 11 13:44:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/04/16 17:29:09 christos Exp $
+# $NetBSD: Makefile,v 1.26 2019/05/11 17:44:16 christos Exp $
# Link the gallium mega driver.
@@ -15,6 +15,8 @@ DRIDEBUGDIR= ${DEBUGDIR}${X11USRLIBDIR}/
LLVM_INCLUDE_OBJDIR!= cd ${NETBSDSRCDIR}/external/bsd/llvm/include && ${PRINTOBJDIR}
+CWARNFLAGS.clang += -Wno-atomic-alignment -Wno-unknown-warning-option
+
CXXFLAGS+= -std=c++11
CFLAGS+= -std=gnu11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm \
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: christos Date: Sat May 11 17:44:16 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: elide clang warnings To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: christos
Date: Tue Apr 16 17:29:09 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Ran out of patience playing stack protector bingo.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.24 src/external/mit/xorg/lib/gallium/Makefile:1.25
--- src/external/mit/xorg/lib/gallium/Makefile:1.24 Fri Apr 12 13:43:25 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Tue Apr 16 13:29:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/04/12 17:43:25 christos Exp $
+# $NetBSD: Makefile,v 1.25 2019/04/16 17:29:09 christos Exp $
# Link the gallium mega driver.
@@ -1104,6 +1104,8 @@ CWARNFLAGS.clang+= -Wno-error=constant-c
-Wno-error=typedef-redefinition \
-Wno-error=enum-conversion # https://bugs.freedesktop.org/show_bug.cgi?id=109761
+CWARNFLAGS+= -Wno-error=stack-protector
+
.include
LIBDIR= ${X11USRLIBDIR}/modules/dri
@@ -1119,24 +1121,6 @@ SYMLINKS+= gallium_dri.so.${SHLIB_MAJOR}
COPTS+= ${${ACTIVE_CC} == "clang":? -Wa,-Av8plus :}
.endif
-.for f in \
- decode.c \
- dd_context.c \
- draw.c \
- nir_from_ssa.c \
- nir_inline_functions.c \
- nir_instr_set.c \
- nir_instr_set.c \
- nir_liveness.c \
- nir_lower_registers_to_ssa.c \
- nir_lower_regs_to_ssa.c \
- nir_lower_vars_to_ssa.c \
- nir_phi_builder.c \
- shaderapi.c \
- spirv_to_nir.c \
- vtn_cfg.c
-COPTS.${f}+=-Wno-error=stack-protector
-.endfor
.include
# Don't regenerate c files
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: christos Date: Tue Apr 16 17:29:09 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Ran out of patience playing stack protector bingo. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: christos
Date: Fri Apr 12 17:43:25 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
more stack protector (arm32)
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.23 src/external/mit/xorg/lib/gallium/Makefile:1.24
--- src/external/mit/xorg/lib/gallium/Makefile:1.23 Wed Apr 10 16:32:56 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Fri Apr 12 13:43:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/04/10 20:32:56 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2019/04/12 17:43:25 christos Exp $
# Link the gallium mega driver.
@@ -1120,6 +1120,7 @@ COPTS+= ${${ACTIVE_CC} == "clang":? -Wa,
.endif
.for f in \
+ decode.c \
dd_context.c \
draw.c \
nir_from_ssa.c \
@@ -1129,6 +1130,7 @@ COPTS+= ${${ACTIVE_CC} == "clang":? -Wa,
nir_liveness.c \
nir_lower_registers_to_ssa.c \
nir_lower_regs_to_ssa.c \
+ nir_lower_vars_to_ssa.c \
nir_phi_builder.c \
shaderapi.c \
spirv_to_nir.c \
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: christos Date: Fri Apr 12 17:43:25 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: more stack protector (arm32) To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: christos
Date: Sun Apr 7 17:31:32 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Fix stack protector build.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.21 src/external/mit/xorg/lib/gallium/Makefile:1.22
--- src/external/mit/xorg/lib/gallium/Makefile:1.21 Sun Apr 7 01:28:09 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Sun Apr 7 13:31:32 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/04/07 05:28:09 rin Exp $
+# $NetBSD: Makefile,v 1.22 2019/04/07 17:31:32 christos Exp $
# Link the gallium mega driver.
@@ -1126,6 +1126,23 @@ SYMLINKS+= gallium_dri.so.${SHLIB_MAJOR}
COPTS+= ${${ACTIVE_CC} == "clang":? -Wa,-Av8plus :}
.endif
+.for f in \
+ dd_context.c \
+ draw.c \
+ nir_from_ssa.c \
+ nir_inline_functions.c \
+ nir_instr_set.c \
+ nir_instr_set.c \
+ nir_liveness.c \
+ nir_lower_registers_to_ssa.c \
+ nir_lower_regs_to_ssa.c \
+ nir_phi_builder.c \
+ shaderapi.c \
+ spirv_to_nir.c \
+ vtn_cfg.c
+COPTS.${f}+=-Wno-error=stack-protector
+.endfor
+
.include
# Don't regenerate c files
.y.c:
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: christos Date: Sun Apr 7 17:31:32 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Fix stack protector build. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: rin Date: Sun Apr 7 05:28:09 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Handle objdir correctly. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: rin
Date: Sun Apr 7 05:28:09 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Handle objdir correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.20 src/external/mit/xorg/lib/gallium/Makefile:1.21
--- src/external/mit/xorg/lib/gallium/Makefile:1.20 Wed Apr 3 15:26:34 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Sun Apr 7 05:28:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/04/03 15:26:34 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2019/04/07 05:28:09 rin Exp $
# Link the gallium mega driver.
@@ -1021,8 +1021,10 @@ LLVM_LIBS+= \
Support
.for llvm_library in ${LLVM_LIBS}
-DPADD+= ${LLVM_LIB_DIR}/libLLVM${llvm_library}/libLLVM${llvm_library}_pic.a
-LDADD+= ${LLVM_LIB_DIR}/libLLVM${llvm_library}/libLLVM${llvm_library}_pic.a
+dir!= cd ${LLVM_LIB_DIR}/libLLVM${llvm_library}; ${PRINTOBJDIR}
+lib= ${dir}/libLLVM${llvm_library}_pic.a
+DPADD+= ${lib}
+LDADD+= ${lib}
.endfor
.endif # ${BUILD_LLVM_PIPE} == 1 || ${BUILD_RADEON} == 1
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: dholland
Date: Tue Nov 29 23:17:22 UTC 2016
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Build gallium with -pthread if we're building the radeon driver. It uses a
thread, so without this the driver doesn't load and nothing works. ok mrg
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.16 src/external/mit/xorg/lib/gallium/Makefile:1.17
--- src/external/mit/xorg/lib/gallium/Makefile:1.16 Tue Sep 27 19:18:42 2016
+++ src/external/mit/xorg/lib/gallium/Makefile Tue Nov 29 23:17:22 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2016/09/27 19:18:42 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2016/11/29 23:17:22 dholland Exp $
# Link the gallium mega driver.
@@ -548,6 +548,11 @@ SRCS+= ${GALLIUM_SOURCES.${_d}}
.include "../libloader.mk"
+.if ${BUILD_RADEON} == 1
+CFLAGS+= -pthread
+LDFLAGS+= -pthread
+LIBDPLIBS+= pthread ${.CURDIR}/../../../../../lib/libpthread
+.endif
LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
.if ${BUILD_RADEON} == 1 || ${BUILD_NOUVEAU} == 1
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: dholland Date: Tue Nov 29 23:17:22 UTC 2016 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Build gallium with -pthread if we're building the radeon driver. It uses a thread, so without this the driver doesn't load and nothing works. ok mrg To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: mrg
Date: Tue Aug 16 21:05:14 UTC 2016
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
only build the radeon and nouveau drivers on i386/amd64/evbarm,
where they're useful. this saves almost 2MB in text/data on shark.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.14 src/external/mit/xorg/lib/gallium/Makefile:1.15
--- src/external/mit/xorg/lib/gallium/Makefile:1.14 Sun Feb 28 22:55:21 2016
+++ src/external/mit/xorg/lib/gallium/Makefile Tue Aug 16 21:05:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/02/28 22:55:21 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2016/08/16 21:05:14 mrg Exp $
# Link the gallium mega driver.
@@ -13,20 +13,8 @@ LIB= gallium_dri
DRIDIR= ${X11USRLIBDIR}/modules/dri
DRIDEBUGDIR= ${DEBUGDIR}${X11USRLIBDIR}/modules/dri
-DRIVERS= kms_swrast swrast
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-DRIVERS+= r600
-.endif
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
-DRIVERS+= nouveau
-.endif
-
CXXFLAGS+= -std=c++11
-CPPFLAGS+= \
- -I${DESTDIR}${X11INCDIR}/libdrm
-
-# cargo culted.
-#CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
GALLIUM_SUBDIRS= \
auxiliary \
@@ -48,21 +36,44 @@ GALLIUM_SUBDIRS= \
drivers/noop \
drivers/trace \
drivers/rbug \
+ drivers/softpipe \
+ winsys/sw/null \
+ winsys/sw/dri \
+ winsys/sw/kms-dri \
+ state_trackers/dri
+
+GALLIUM_SUBDIRS_ATI= \
drivers/radeon \
drivers/r600 \
drivers/r600/sb \
+ winsys/radeon/drm
+
+GALLIUM_SUBDIRS_NOUVEAU= \
drivers/nouveau \
drivers/nouveau/nv30 \
drivers/nouveau/nv50 \
drivers/nouveau/codegen \
drivers/nouveau/nvc0 \
- drivers/softpipe \
- winsys/radeon/drm \
- winsys/nouveau/drm \
- winsys/sw/null \
- winsys/sw/dri \
- winsys/sw/kms-dri \
- state_trackers/dri
+ winsys/nouveau/drm
+
+BUILD_RADEON=0
+BUILD_NOUVEAU=0
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+BUILD_RADEON=1
+.endif
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
+BUILD_NOUVEAU=1
+.endif
+
+DRIVERS= kms_swrast swrast
+.if ${BUILD_RADEON} == 1
+DRIVERS+= r600
+GALLIUM_SUBDIRS+= ${GALLIUM_SUBDIRS_ATI}
+.endif
+.if ${BUILD_NOUVEAU} == 1
+DRIVERS+= nouveau
+GALLIUM_SUBDIRS+= ${GALLIUM_SUBDIRS_NOUVEAU}
+.endif
GALLIUM_SOURCES.auxiliary/cso_cache= \
cso_cache.c \
@@ -537,12 +548,17 @@ SRCS+= ${GALLIUM_SOURCES.${_d}}
.include "../libloader.mk"
+
LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
+.if ${BUILD_RADEON} == 1 || ${BUILD_NOUVEAU} == 1
LIBDPLIBS+= drm ${.CURDIR}/../libdrm
+.if ${BUILD_RADEON} == 1
LIBDPLIBS+= drm_radeon ${.CURDIR}/../libdrm_radeon
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
+.endif # ${BUILD_RADEON} == 1
+.if ${BUILD_NOUVEAU} == 1
LIBDPLIBS+= drm_nouveau ${.CURDIR}/../libdrm_nouveau
-.endif
+.endif # ${BUILD_NOUVEAU} == 1
+.endif # ${BUILD_RADEON} == 1 || ${BUILD_NOUVEAU} == 1
LIBDPLIBS+= glapi ${.CURDIR}/../libglapi
LIBDPLIBS+= expat ${.CURDIR}/../../../../../external/mit/expat/lib/libexpat
@@ -580,14 +596,22 @@ CPPFLAGS.target.c += \
-DGALLIUM_NOOP \
-DGALLIUM_RBUG \
-DGALLIUM_TRACE \
- -DGALLIUM_R200 \
- -DGALLIUM_R600 \
- -DGALLIUM_NOUVEAU \
-DGALLIUM_SOFTPIPE \
-I${X11SRCDIR.MesaLib}/src/gallium/state_trackers/dri \
-I${X11SRCDIR.MesaLib}/src/loader \
-I${X11SRCDIR.MesaLib}/src/gallium/winsys
+.if ${BUILD_RADEON} == 1
+CPPFLAGS.target.c += \
+ -DGALLIUM_R200 \
+ -DGALLIUM_R600
+.endif # ${BUILD_RADEON} == 1
+
+.if ${BUILD_NOUVEAU} == 1
+CPPFLAGS.target.c += \
+ -DGALLIUM_NOUVEAU
+.endif # ${BUILD_NOUVEAU} == 1
+
CWARNFLAGS.clang+= -Wno-error=constant-conversion \
-Wno-error=tautological-constant-out-of-range-compare \
-Wno-error=pointer-sign \
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: mrg Date: Tue Aug 16 21:05:14 UTC 2016 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: only build the radeon and nouveau drivers on i386/amd64/evbarm, where they're useful. this saves almost 2MB in text/data on shark. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: joerg
Date: Sun Feb 28 22:55:21 UTC 2016
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Make using ! on the LHS of a compare non-fatal, even if it is not
cosher. It is currently not clear what the code is actually trying to
do.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.13 src/external/mit/xorg/lib/gallium/Makefile:1.14
--- src/external/mit/xorg/lib/gallium/Makefile:1.13 Fri Feb 26 18:29:55 2016
+++ src/external/mit/xorg/lib/gallium/Makefile Sun Feb 28 22:55:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/02/26 18:29:55 riastradh Exp $
+# $NetBSD: Makefile,v 1.14 2016/02/28 22:55:21 joerg Exp $
# Link the gallium mega driver.
@@ -594,7 +594,8 @@ CWARNFLAGS.clang+= -Wno-error=constant-c
-Wno-error=switch \
-Wno-error=absolute-value \
-Wno-error=tautological-compare \
- -Wno-error=static-in-inline
+ -Wno-error=static-in-inline \
+ -Wno-error=logical-not-parentheses
.include
LIBDIR= ${X11USRLIBDIR}/modules/dri
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: joerg Date: Sun Feb 28 22:55:21 UTC 2016 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Make using ! on the LHS of a compare non-fatal, even if it is not cosher. It is currently not clear what the code is actually trying to do. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: riastradh
Date: Fri Feb 26 18:29:55 UTC 2016
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Use -std=c++11 unordered_set, not TR1 unordered_set.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.12 src/external/mit/xorg/lib/gallium/Makefile:1.13
--- src/external/mit/xorg/lib/gallium/Makefile:1.12 Tue Nov 3 10:43:31 2015
+++ src/external/mit/xorg/lib/gallium/Makefile Fri Feb 26 18:29:55 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2015/11/03 10:43:31 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.13 2016/02/26 18:29:55 riastradh Exp $
# Link the gallium mega driver.
@@ -21,6 +21,7 @@ DRIVERS+= r600
DRIVERS+= nouveau
.endif
+CXXFLAGS+= -std=c++11
CPPFLAGS+= \
-I${DESTDIR}${X11INCDIR}/libdrm
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: riastradh Date: Fri Feb 26 18:29:55 UTC 2016 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Use -std=c++11 unordered_set, not TR1 unordered_set. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: szptvlfn Date: Tue Nov 3 10:43:31 UTC 2015 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: remove redundant \ To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: szptvlfn
Date: Tue Nov 3 10:43:31 UTC 2015
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
remove redundant \
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.11 src/external/mit/xorg/lib/gallium/Makefile:1.12
--- src/external/mit/xorg/lib/gallium/Makefile:1.11 Sat Oct 31 20:13:45 2015
+++ src/external/mit/xorg/lib/gallium/Makefile Tue Nov 3 10:43:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/10/31 20:13:45 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2015/11/03 10:43:31 szptvlfn Exp $
# Link the gallium mega driver.
@@ -523,7 +523,7 @@ CPPFLAGS.${_f} += -I${X11SRCDIR.MesaLib}
CPPFLAGS+= \
-DGALLIUM_SOFTPIPE \
-DGALLIUM_STATIC_TARGETS=1 \
- -DMESA_EGL_NO_X11_HEADERS \
+ -DMESA_EGL_NO_X11_HEADERS
.for _d in ${GALLIUM_SUBDIRS}
SRCS+= ${GALLIUM_SOURCES.${_d}}
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: mrg Date: Sat Oct 31 20:13:45 UTC 2015 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: don't look for libdrm_nouveau unless we've built it. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: mrg
Date: Sat Oct 31 20:13:45 UTC 2015
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
don't look for libdrm_nouveau unless we've built it.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.10 src/external/mit/xorg/lib/gallium/Makefile:1.11
--- src/external/mit/xorg/lib/gallium/Makefile:1.10 Thu Oct 29 10:10:09 2015
+++ src/external/mit/xorg/lib/gallium/Makefile Sat Oct 31 20:13:45 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/10/29 10:10:09 jmcneill Exp $
+# $NetBSD: Makefile,v 1.11 2015/10/31 20:13:45 mrg Exp $
# Link the gallium mega driver.
@@ -539,7 +539,9 @@ SRCS+= ${GALLIUM_SOURCES.${_d}}
LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
LIBDPLIBS+= drm ${.CURDIR}/../libdrm
LIBDPLIBS+= drm_radeon ${.CURDIR}/../libdrm_radeon
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
LIBDPLIBS+= drm_nouveau ${.CURDIR}/../libdrm_nouveau
+.endif
LIBDPLIBS+= glapi ${.CURDIR}/../libglapi
LIBDPLIBS+= expat ${.CURDIR}/../../../../../external/mit/expat/lib/libexpat
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: mrg
Date: Thu Oct 29 08:09:55 UTC 2015
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
properly link and enable all the nouveau parts.
with this, hw GL seems to work!
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.8 src/external/mit/xorg/lib/gallium/Makefile:1.9
--- src/external/mit/xorg/lib/gallium/Makefile:1.8 Mon Oct 26 07:15:36 2015
+++ src/external/mit/xorg/lib/gallium/Makefile Thu Oct 29 08:09:55 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/10/26 07:15:36 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2015/10/29 08:09:55 mrg Exp $
# Link the gallium mega driver.
@@ -54,6 +54,7 @@ GALLIUM_SUBDIRS= \
drivers/nouveau/nvc0 \
drivers/softpipe \
winsys/radeon/drm \
+ winsys/nouveau/drm \
winsys/sw/null \
winsys/sw/dri \
winsys/sw/kms-dri \
@@ -461,6 +462,9 @@ GALLIUM_SOURCES.winsys/radeon/drm = \
radeon_drm_cs_dump.c \
radeon_drm_winsys.c
+GALLIUM_SOURCES.winsys/nouveau/drm = \
+nouveau_drm_winsys.c
+
GALLIUM_SOURCES.drivers/softpipe = \
sp_fs_exec.c \
sp_clear.c \
@@ -532,6 +536,7 @@ SRCS+= ${GALLIUM_SOURCES.${_d}}
LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
LIBDPLIBS+= drm ${.CURDIR}/../libdrm
LIBDPLIBS+= drm_radeon ${.CURDIR}/../libdrm_radeon
+LIBDPLIBS+= drm_nouveau ${.CURDIR}/../libdrm_nouveau
LIBDPLIBS+= glapi ${.CURDIR}/../libglapi
LIBDPLIBS+= expat ${.CURDIR}/../../../../../external/mit/expat/lib/libexpat
@@ -571,6 +576,7 @@ CPPFLAGS.target.c += \
-DGALLIUM_TRACE \
-DGALLIUM_R200 \
-DGALLIUM_R600 \
+ -DGALLIUM_NOUVEAU \
-DGALLIUM_SOFTPIPE \
-I${X11SRCDIR.MesaLib}/src/gallium/state_trackers/dri \
-I${X11SRCDIR.MesaLib}/src/loader \
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: mrg Date: Thu Oct 29 08:09:55 UTC 2015 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: properly link and enable all the nouveau parts. with this, hw GL seems to work! To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: jmcneill Date: Thu Oct 29 10:10:09 UTC 2015 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: build nouveau on evbarm, too To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: jmcneill
Date: Thu Oct 29 10:10:09 UTC 2015
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
build nouveau on evbarm, too
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.9 src/external/mit/xorg/lib/gallium/Makefile:1.10
--- src/external/mit/xorg/lib/gallium/Makefile:1.9 Thu Oct 29 08:09:55 2015
+++ src/external/mit/xorg/lib/gallium/Makefile Thu Oct 29 10:10:09 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/10/29 08:09:55 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2015/10/29 10:10:09 jmcneill Exp $
# Link the gallium mega driver.
@@ -15,7 +15,10 @@ DRIDEBUGDIR= ${DEBUGDIR}${X11USRLIBDIR}/
DRIVERS= kms_swrast swrast
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-DRIVERS+= r600 nouveau
+DRIVERS+= r600
+.endif
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
+DRIVERS+= nouveau
.endif
CPPFLAGS+= \
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: mrg Date: Wed Sep 23 05:28:14 UTC 2015 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: remove unused GALLIUM_NAMES variable. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: mrg Date: Wed Sep 23 05:28:14 UTC 2015 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: remove unused GALLIUM_NAMES variable. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/gallium/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/gallium/Makefile diff -u src/external/mit/xorg/lib/gallium/Makefile:1.6 src/external/mit/xorg/lib/gallium/Makefile:1.7 --- src/external/mit/xorg/lib/gallium/Makefile:1.6 Mon Jan 5 20:06:06 2015 +++ src/external/mit/xorg/lib/gallium/Makefile Wed Sep 23 05:28:14 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2015/01/05 20:06:06 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2015/09/23 05:28:14 mrg Exp $ # Link the gallium mega driver. @@ -54,8 +54,6 @@ GALLIUM_SUBDIRS= \ winsys/sw/kms-dri \ state_trackers/dri -GALLIUM_NAMES= kms_swrast r600 swrant - GALLIUM_SOURCES.auxiliary/cso_cache= \ cso_cache.c \ cso_context.c \
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: joerg Date: Mon Jan 5 20:06:06 UTC 2015 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Don't bail out on the broken inline functions that use static variables. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: joerg
Date: Mon Jan 5 20:06:06 UTC 2015
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Don't bail out on the broken inline functions that use static variables.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.5 src/external/mit/xorg/lib/gallium/Makefile:1.6
--- src/external/mit/xorg/lib/gallium/Makefile:1.5 Mon Jan 5 18:51:10 2015
+++ src/external/mit/xorg/lib/gallium/Makefile Mon Jan 5 20:06:06 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/01/05 18:51:10 gson Exp $
+# $NetBSD: Makefile,v 1.6 2015/01/05 20:06:06 joerg Exp $
# Link the gallium mega driver.
@@ -468,7 +468,8 @@ CWARNFLAGS.clang+= -Wno-error=constant-c
-Wno-error=pointer-sign \
-Wno-error=switch \
-Wno-error=absolute-value \
- -Wno-error=tautological-compare
+ -Wno-error=tautological-compare \
+ -Wno-error=static-in-inline
.include bsd.x11.mk
LIBDIR= ${X11USRLIBDIR}/modules/dri
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: christos
Date: Sun Jan 4 01:26:31 UTC 2015
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
don't regenerate y-
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.2 src/external/mit/xorg/lib/gallium/Makefile:1.3
--- src/external/mit/xorg/lib/gallium/Makefile:1.2 Tue Dec 23 12:49:59 2014
+++ src/external/mit/xorg/lib/gallium/Makefile Sat Jan 3 20:26:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/12/23 17:49:59 christos Exp $
+# $NetBSD: Makefile,v 1.3 2015/01/04 01:26:31 christos Exp $
# Link the gallium mega driver.
@@ -475,3 +475,5 @@ SYMLINKS+= gallium_dri.so.${SHLIB_MAJOR}
.endfor
.include bsd.lib.mk
+# Don't regenerate c files
+.y.c:
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: christos Date: Sun Jan 4 01:26:31 UTC 2015 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: don't regenerate y- To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: christos
Date: Tue Dec 23 17:49:59 UTC 2014
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
- Don't install absolute symlinks
- Add missing debug symlinks
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.1 src/external/mit/xorg/lib/gallium/Makefile:1.2
--- src/external/mit/xorg/lib/gallium/Makefile:1.1 Thu Dec 18 01:24:30 2014
+++ src/external/mit/xorg/lib/gallium/Makefile Tue Dec 23 12:49:59 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/12/18 06:24:30 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/23 17:49:59 christos Exp $
# Link the gallium mega driver.
@@ -11,6 +11,7 @@ SHLIB_MAJOR=0
LIB= gallium_dri
DRIDIR= ${X11USRLIBDIR}/modules/dri
+DRIDEBUGDIR= ${DEBUGDIR}${X11USRLIBDIR}/modules/dri
DRIVERS= kms_swrast swrast
.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
@@ -466,8 +467,11 @@ CPPFLAGS.target.c += \
LIBDIR= ${X11USRLIBDIR}/modules/dri
.for _d in ${DRIVERS}
-SYMLINKS+= ${DRIDIR}/gallium_dri.so ${DRIDIR}/${_d}_dri.so
-SYMLINKS+= ${DRIDIR}/gallium_dri.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so.${SHLIB_MAJOR}
+SYMLINKS+= gallium_dri.so ${DRIDIR}/${_d}_dri.so
+SYMLINKS+= gallium_dri.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so.${SHLIB_MAJOR}
+.if ${MKDEBUG:Uno} == yes
+SYMLINKS+= gallium_dri.so.${SHLIB_MAJOR}.debug ${DRIDEBUGDIR}/${_d}_dri.so.${SHLIB_MAJOR}.debug
+.endif
.endfor
.include bsd.lib.mk
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: christos Date: Tue Dec 23 17:49:59 UTC 2014 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: - Don't install absolute symlinks - Add missing debug symlinks To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
