Index: branches/2019Q4/graphics/libosmesa/Makefile =================================================================== --- branches/2019Q4/graphics/libosmesa/Makefile (revision 513776) +++ branches/2019Q4/graphics/libosmesa/Makefile (revision 513777) @@ -1,37 +1,37 @@ # Created by: gahr # $FreeBSD$ PORTNAME= libosmesa PORTVERSION= ${MESAVERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics COMMENT= Off-Screen Mesa implementation of the OpenGL API USE_XORG= xorgproto .include .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common" CONFIGURE_ARGS+= --disable-dri --disable-egl --disable-gbm \ --disable-gles2 --with-gallium-drivers=swrast MESA_BUILD_WRKSRC= src/util src/compiler src/mapi src/mesa LDFLAGS_i386= -Wl,-znotext .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marm*} || ${ARCH} == i386 || ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} CONFIGURE_ARGS+= --enable-osmesa-gallium MESA_BUILD_WRKSRC+= src/gallium MESA_INSTALL_WRKSRC= src/gallium/state_trackers/osmesa src/gallium/targets/osmesa .else CONFIGURE_ARGS+= --enable-osmesa MESA_INSTALL_WRKSRC= src/mesa/drivers/osmesa .endif .include "${MASTERDIR}/Makefile.targets" post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/include/GL ${INSTALL_DATA} ${WRKSRC}/include/GL/osmesa.h \ ${STAGEDIR}${PREFIX}/include/GL .include Index: branches/2019Q4/graphics/mesa-dri/Makefile =================================================================== --- branches/2019Q4/graphics/mesa-dri/Makefile (revision 513776) +++ branches/2019Q4/graphics/mesa-dri/Makefile (revision 513777) @@ -1,115 +1,115 @@ # Created by: Eric Anholt # $FreeBSD$ PORTNAME= mesa-dri PORTVERSION= ${MESAVERSION} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics COMMENT= OpenGL hardware acceleration drivers for DRI2+ USE_XORG= xorgproto x11 xdamage xext xfixes xshmfence xv xvmc OPTIONS_DEFINE= VAAPI VDPAU WAYLAND OPTIONS_DEFAULT=WAYLAND OPTIONS_SUB= yes VAAPI_CONFIGURE_ENABLE= va VAAPI_LIB_DEPENDS= libva.so:multimedia/libva VAAPI_USE= XORG=xcb VDPAU_CONFIGURE_ENABLE= vdpau VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau WAYLAND_DESC= Enable support for the Wayland platform in Vulkan drivers WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.8:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland .include .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common" ALL_DRI_DRIVERS= I915 I965 RADEON R200 SWRAST ALL_GALLIUM_DRIVERS= FREEDRENO R300 R600 RADEONSI SVGA SWRAST VC4 ALL_VULKAN_DRIVERS= INTEL RADEON DRI_DRIVERS= SWRAST # classic swrast .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marm*} || ${ARCH} == i386 || ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} GALLIUM_DRIVERS= SWRAST # llvmpipe .else GALLIUM_DRIVERS= "" .endif VULKAN_DRIVERS= # .if ${ARCH} == amd64 || ${ARCH} == i386 \ || ${ARCH} == powerpc || ${ARCH} == powerpc64 DRI_DRIVERS+= RADEON R200 GALLIUM_DRIVERS+= R300 R600 RADEONSI VULKAN_DRIVERS+= RADEON .endif .if ${ARCH} == amd64 || ${ARCH} == i386 DRI_DRIVERS+= I915 I965 GALLIUM_DRIVERS+= SVGA . if ${OPSYS} == FreeBSD EXTRA_PATCHES+= ${PATCHDIR}/extra-src_mesa_drivers_dri_i965_intel__screen.c . endif VULKAN_DRIVERS+= INTEL .elif ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 GALLIUM_DRIVERS+= FREEDRENO VC4 . if ${ARCH} == armv6 || ${ARCH} == armv7 EXTRA_PATCHES+= ${PATCHDIR}/extra-src_gallium_drivers_vc4_Makefile.in . endif .endif .if ${VULKAN_DRIVERS} BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} USE_XORG+= xcb xrandr .endif LDFLAGS_i386= -Wl,-znotext .if ${DRI_DRIVERS} || ${VULKAN_DRIVERS:MINTEL} . if ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld # --build-id isn't supported by old GNU ld.bfd in base USE_BINUTILS= yes LDFLAGS+= -B${LOCALBASE}/bin . endif .endif # enables VK_KHR_wayland_surface in Vulkan drivers .if ${PORT_OPTIONS:MWAYLAND} && !empty(VULKAN_DRIVERS) CONFIGURE_ARGS+= --with-platforms=x11,surfaceless,drm,wayland .endif CONFIGURE_ARGS+= --with-dri-drivers="${DRI_DRIVERS:tl}" \ --with-gallium-drivers="${GALLIUM_DRIVERS:tl}" \ --with-vulkan-drivers="${VULKAN_DRIVERS:tl}" .for _d in ${ALL_DRI_DRIVERS} . if ${DRI_DRIVERS:M${_d}} PLIST_SUB+= ${_d}_DRIVER="" . else PLIST_SUB+= ${_d}_DRIVER="@comment " . endif .endfor .for _gd in ${ALL_GALLIUM_DRIVERS} . if ${GALLIUM_DRIVERS:M${_gd}} PLIST_SUB+= ${_gd}_GDRIVER="" . else PLIST_SUB+= ${_gd}_GDRIVER="@comment " . endif .endfor .for _vd in ${ALL_VULKAN_DRIVERS} . if ${VULKAN_DRIVERS:M${_vd}} PLIST_SUB+= ${_vd}_VDRIVER="" ARCH="${ARCH}" . else PLIST_SUB+= ${_vd}_VDRIVER="@comment " . endif .endfor .include "${MASTERDIR}/Makefile.targets" post-install: @${RM} -r ${STAGEDIR}/etc/OpenCL .include Index: branches/2019Q4/graphics/mesa-dri/Makefile.common =================================================================== --- branches/2019Q4/graphics/mesa-dri/Makefile.common (revision 513776) +++ branches/2019Q4/graphics/mesa-dri/Makefile.common (revision 513777) @@ -1,99 +1,103 @@ # Makefile.common - shared code between MesaLib ports. # # !!! Here be dragons !!! (they seem to be everywhere these days) # # Remember to upgrade the following ports everytime you bump MESAVERSION: # # - graphics/libosmesa # - graphics/mesa-dri # - graphics/mesa-libs # - lang/clover # # $FreeBSD$ MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} MESABASEVERSION= 18.3.2 # if there is a subversion, don't include the '-' between 7.11-rc2. MESASUBVERSION= MASTER_SITES= https://mesa.freedesktop.org/archive/ \ https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \ ftp://ftp.freedesktop.org/pub/mesa/ \ ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/ DISTFILES= mesa-${MESADISTVERSION}${EXTRACT_SUFX} MAINTAINER= x11@FreeBSD.org COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//} BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs LIB_DEPENDS+= libexpat.so:textproc/expat2 .if ${COMPONENT} != osmesa LIB_DEPENDS+= libdrm.so:graphics/libdrm .endif .if ${COMPONENT} != libs LIB_DEPENDS+= libglapi.so:graphics/mesa-libs .endif .if ${ARCH} == amd64 || ${ARCH} == i386 LIB_DEPENDS+= libunwind.so:devel/libunwind .endif .if ${OPSYS} == DragonFly LIB_DEPENDS+= libelf.so:devel/libelf .endif USES+= compiler:c++11-lib bison gettext-tools gmake libtool \ localbase pathfix pkgconfig python:2.7,build shebangfix tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes # only have one port to check with portscout. .if ${PORTNAME} != mesa-dri PORTSCOUT= ignore:1 .endif python_OLD_CMD= /usr/bin/env[[:space:]]python2 /usr/bin/python2 /bin/env[[:space:]]python SHEBANG_FILES= src/gallium/*/*/*.py src/gallium/tools/trace/*.py \ src/gallium/drivers/svga/svgadump/svga_dump.py \ src/mapi/glapi/gen/*.py src/mapi/mapi_abi.py \ src/util/xmlpool/gen_xmlpool.py \ src/mesa/main/get_*.py src/util/format_srgb.py \ src/amd/*/*.py src/intel/genxml/gen_pack_header.py MASTERDIR= ${.CURDIR:H:H}/graphics/mesa-dri PATCHDIR= ${MASTERDIR}/files WRKSRC= ${WRKDIR}/mesa-${MESADISTVERSION} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist PKGHELP= ${.CURDIR}/pkg-help PKGINSTALL= ${.CURDIR}/pkg-install PKGDEINSTALL= ${.CURDIR}/pkg-deinstall INSTALL_TARGET= install-strip .include +.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 +LLVM_DEFAULT= 80 +.endif + .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marm*} || ${ARCH} == i386 || ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llvm${LLVM_DEFAULT} .if ${COMPONENT} != libs RUN_DEPENDS+= llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llvm${LLVM_DEFAULT} .endif CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib CONFIGURE_ARGS+= --enable-llvm .else CONFIGURE_ARGS+= --disable-llvm .endif # There are issues that need to be fixed to use TLS model "initial-exec" # So stick with "global-dynamic"'s model for now. kan@ is working on a # patch for rtld. We might want to backport global-dynamic or # pthread_setspecific which it uses now by default. But since this # configure switch is going away ... # https://lists.freebsd.org/pipermail/freebsd-arch/2016-February/017699.html CONFIGURE_ARGS+= --disable-glx-tls # we don't care about GLes v1 CONFIGURE_ARGS+= --disable-gles1 Index: branches/2019Q4/graphics/mesa-dri/files/patch-648dc52 =================================================================== --- branches/2019Q4/graphics/mesa-dri/files/patch-648dc52 (revision 513776) +++ branches/2019Q4/graphics/mesa-dri/files/patch-648dc52 (nonexistent) @@ -1,94 +0,0 @@ -https://gitlab.freedesktop.org/mesa/mesa/commit/648dc52367c6 - ---- src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c.orig 2019-01-17 11:26:22 UTC -+++ src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c -@@ -698,17 +698,25 @@ static void store_emit( - } - - if (target == TGSI_TEXTURE_BUFFER) { -- LLVMValueRef buf_args[] = { -+ LLVMValueRef buf_args[6] = { - value, - args.resource, - vindex, - ctx->i32_0, /* voffset */ -- LLVMConstInt(ctx->i1, !!(args.cache_policy & ac_glc), 0), -- LLVMConstInt(ctx->i1, !!(args.cache_policy & ac_slc), 0), - }; - -+ if (HAVE_LLVM >= 0x0800) { -+ buf_args[4] = ctx->i32_0; /* soffset */ -+ buf_args[5] = LLVMConstInt(ctx->i1, args.cache_policy, 0); -+ } else { -+ buf_args[4] = LLVMConstInt(ctx->i1, !!(args.cache_policy & ac_glc), 0); -+ buf_args[5] = LLVMConstInt(ctx->i1, !!(args.cache_policy & ac_slc), 0); -+ } -+ - emit_data->output[emit_data->chan] = ac_build_intrinsic( -- &ctx->ac, "llvm.amdgcn.buffer.store.format.v4f32", -+ &ctx->ac, -+ HAVE_LLVM >= 0x0800 ? "llvm.amdgcn.struct.buffer.store.format.v4f32" : -+ "llvm.amdgcn.buffer.store.format.v4f32", - ctx->voidt, buf_args, 6, - ac_get_store_intr_attribs(writeonly_memory)); - } else { -@@ -830,8 +838,35 @@ static void atomic_emit( - vindex = args.coords[0]; /* for buffers only */ - } - -- if (inst->Src[0].Register.File == TGSI_FILE_BUFFER || -+ if (HAVE_LLVM >= 0x0800 && -+ inst->Src[0].Register.File != TGSI_FILE_BUFFER && - inst->Memory.Texture == TGSI_TEXTURE_BUFFER) { -+ LLVMValueRef buf_args[7]; -+ unsigned num_args = 0; -+ -+ buf_args[num_args++] = args.data[0]; -+ if (inst->Instruction.Opcode == TGSI_OPCODE_ATOMCAS) -+ buf_args[num_args++] = args.data[1]; -+ -+ buf_args[num_args++] = args.resource; -+ buf_args[num_args++] = vindex; -+ buf_args[num_args++] = voffset; -+ buf_args[num_args++] = ctx->i32_0; /* soffset */ -+ buf_args[num_args++] = LLVMConstInt(ctx->i32, args.cache_policy & ac_slc, 0); -+ -+ char intrinsic_name[64]; -+ snprintf(intrinsic_name, sizeof(intrinsic_name), -+ "llvm.amdgcn.struct.buffer.atomic.%s", action->intr_name); -+ emit_data->output[emit_data->chan] = -+ ac_to_float(&ctx->ac, -+ ac_build_intrinsic(&ctx->ac, intrinsic_name, -+ ctx->i32, buf_args, num_args, 0)); -+ return; -+ } -+ -+ if (inst->Src[0].Register.File == TGSI_FILE_BUFFER || -+ (HAVE_LLVM < 0x0800 && -+ inst->Memory.Texture == TGSI_TEXTURE_BUFFER)) { - LLVMValueRef buf_args[7]; - unsigned num_args = 0; - - src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c | 45 ++++++++++++++++++++--- - src/gallium/drivers/radeonsi/si_state.c | 7 +--- - 2 files changed, 42 insertions(+), 10 deletions(-) - ---- src/gallium/drivers/radeonsi/si_state.c.orig 2019-01-17 11:26:22 UTC -+++ src/gallium/drivers/radeonsi/si_state.c -@@ -3613,14 +3613,11 @@ si_make_buffer_descriptor(struct si_screen *screen, st - * - For VMEM and inst.IDXEN == 0 or STRIDE == 0, it's in byte units. - * - For VMEM and inst.IDXEN == 1 and STRIDE != 0, it's in units of STRIDE. - */ -- if (screen->info.chip_class >= GFX9) -- /* When vindex == 0, LLVM sets IDXEN = 0, thus changing units -+ if (screen->info.chip_class >= GFX9 && HAVE_LLVM < 0x0800) -+ /* When vindex == 0, LLVM < 8.0 sets IDXEN = 0, thus changing units - * from STRIDE to bytes. This works around it by setting - * NUM_RECORDS to at least the size of one element, so that - * the first element is readable when IDXEN == 0. -- * -- * TODO: Fix this in LLVM, but do we need a new intrinsic where -- * IDXEN is enforced? - */ - num_records = num_records ? MAX2(num_records, stride) : 0; - else if (screen->info.chip_class == VI) Property changes on: branches/2019Q4/graphics/mesa-dri/files/patch-648dc52 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q4/graphics/mesa-dri/files/patch-3e249b8 =================================================================== --- branches/2019Q4/graphics/mesa-dri/files/patch-3e249b8 (revision 513776) +++ branches/2019Q4/graphics/mesa-dri/files/patch-3e249b8 (nonexistent) @@ -1,13 +0,0 @@ -https://gitlab.freedesktop.org/mesa/mesa/commit/3e249b853ebb - ---- src/amd/common/ac_llvm_util.c.orig 2019-01-17 11:26:22 UTC -+++ src/amd/common/ac_llvm_util.c -@@ -136,7 +136,7 @@ const char *ac_get_llvm_processor_name(enum radeon_fam - case CHIP_VEGA20: - return HAVE_LLVM >= 0x0700 ? "gfx906" : "gfx902"; - case CHIP_RAVEN2: -- return "gfx902"; /* TODO: use gfx909 when it's available */ -+ return HAVE_LLVM >= 0x0800 ? "gfx909" : "gfx902"; - default: - return ""; - } Property changes on: branches/2019Q4/graphics/mesa-dri/files/patch-3e249b8 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q4/graphics/mesa-dri/files/patch-e4803ab =================================================================== --- branches/2019Q4/graphics/mesa-dri/files/patch-e4803ab (revision 513776) +++ branches/2019Q4/graphics/mesa-dri/files/patch-e4803ab (nonexistent) @@ -1,24 +0,0 @@ -https://gitlab.freedesktop.org/mesa/mesa/commit/e4803ab7d2b6 - ---- src/amd/common/ac_llvm_build.c.orig 2019-01-17 11:26:22 UTC -+++ src/amd/common/ac_llvm_build.c -@@ -1191,11 +1191,15 @@ ac_build_buffer_load(struct ac_llvm_context *ctx, - offset = LLVMBuildAdd(ctx->builder, offset, - LLVMConstInt(ctx->i32, 4, 0), ""); - } -- LLVMValueRef args[2] = {rsrc, offset}; -- result[i] = ac_build_intrinsic(ctx, "llvm.SI.load.const.v4i32", -- ctx->f32, args, 2, -+ const char *intrname = -+ HAVE_LLVM >= 0x0800 ? "llvm.amdgcn.s.buffer.load.f32" -+ : "llvm.SI.load.const.v4i32"; -+ unsigned num_args = HAVE_LLVM >= 0x0800 ? 3 : 2; -+ LLVMValueRef args[3] = {rsrc, offset, ctx->i32_0}; -+ result[i] = ac_build_intrinsic(ctx, intrname, -+ ctx->f32, args, num_args, - AC_FUNC_ATTR_READNONE | -- AC_FUNC_ATTR_LEGACY); -+ (HAVE_LLVM < 0x0800 ? AC_FUNC_ATTR_LEGACY : 0)); - } - if (num_channels == 1) - return result[0]; Property changes on: branches/2019Q4/graphics/mesa-dri/files/patch-e4803ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q4/graphics/mesa-dri/files/patch-dded2ed =================================================================== --- branches/2019Q4/graphics/mesa-dri/files/patch-dded2ed (revision 513776) +++ branches/2019Q4/graphics/mesa-dri/files/patch-dded2ed (nonexistent) @@ -1,46 +0,0 @@ -https://gitlab.freedesktop.org/mesa/mesa/commit/dded2edf8bed - ---- src/gallium/auxiliary/gallivm/lp_bld_arit.c.orig 2019-01-17 11:26:22 UTC -+++ src/gallium/auxiliary/gallivm/lp_bld_arit.c -@@ -555,6 +555,12 @@ lp_build_add(struct lp_build_context *bld, - return bld->one; - - if (!type.floating && !type.fixed) { -+ if (HAVE_LLVM >= 0x0900) { -+ char intrin[32]; -+ intrinsic = type.sign ? "llvm.sadd.sat" : "llvm.uadd.sat"; -+ lp_format_intrinsic(intrin, sizeof intrin, intrinsic, bld->vec_type); -+ return lp_build_intrinsic_binary(builder, intrin, bld->vec_type, a, b); -+ } - if (type.width * type.length == 128) { - if (util_cpu_caps.has_sse2) { - if (type.width == 8) -@@ -625,6 +631,7 @@ lp_build_add(struct lp_build_context *bld, - * NOTE: cmp/select does sext/trunc of the mask. Does not seem to - * interfere with llvm's ability to recognize the pattern but seems - * a bit brittle. -+ * NOTE: llvm 9+ always uses (non arch specific) intrinsic. - */ - LLVMValueRef overflowed = lp_build_cmp(bld, PIPE_FUNC_GREATER, a, res); - res = lp_build_select(bld, overflowed, -@@ -876,6 +883,12 @@ lp_build_sub(struct lp_build_context *bld, - return bld->zero; - - if (!type.floating && !type.fixed) { -+ if (HAVE_LLVM >= 0x0900) { -+ char intrin[32]; -+ intrinsic = type.sign ? "llvm.ssub.sat" : "llvm.usub.sat"; -+ lp_format_intrinsic(intrin, sizeof intrin, intrinsic, bld->vec_type); -+ return lp_build_intrinsic_binary(builder, intrin, bld->vec_type, a, b); -+ } - if (type.width * type.length == 128) { - if (util_cpu_caps.has_sse2) { - if (type.width == 8) -@@ -925,6 +938,7 @@ lp_build_sub(struct lp_build_context *bld, - * NOTE: cmp/select does sext/trunc of the mask. Does not seem to - * interfere with llvm's ability to recognize the pattern but seems - * a bit brittle. -+ * NOTE: llvm 9+ always uses (non arch specific) intrinsic. - */ - LLVMValueRef no_ov = lp_build_cmp(bld, PIPE_FUNC_GREATER, a, b); - a = lp_build_select(bld, no_ov, a, b); Property changes on: branches/2019Q4/graphics/mesa-dri/files/patch-dded2ed ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q4/graphics/mesa-dri/files/patch-0a7e767 =================================================================== --- branches/2019Q4/graphics/mesa-dri/files/patch-0a7e767 (revision 513776) +++ branches/2019Q4/graphics/mesa-dri/files/patch-0a7e767 (nonexistent) @@ -1,23 +0,0 @@ -https://gitlab.freedesktop.org/mesa/mesa/commit/0a7e767e5869 - ---- src/amd/vulkan/radv_shader.c.orig 2019-01-17 11:26:22 UTC -+++ src/amd/vulkan/radv_shader.c -@@ -548,9 +548,15 @@ static void radv_init_llvm_target() - * - * "mesa" is the prefix for error messages. - */ -- const char *argv[3] = { "mesa", "-simplifycfg-sink-common=false", -- "-amdgpu-skip-threshold=1" }; -- LLVMParseCommandLineOptions(3, argv, NULL); -+ if (HAVE_LLVM >= 0x0800) { -+ const char *argv[2] = { "mesa", "-simplifycfg-sink-common=false" }; -+ LLVMParseCommandLineOptions(2, argv, NULL); -+ -+ } else { -+ const char *argv[3] = { "mesa", "-simplifycfg-sink-common=false", -+ "-amdgpu-skip-threshold=1" }; -+ LLVMParseCommandLineOptions(3, argv, NULL); -+ } - } - - static once_flag radv_init_llvm_target_once_flag = ONCE_FLAG_INIT; Property changes on: branches/2019Q4/graphics/mesa-dri/files/patch-0a7e767 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q4/graphics/mesa-dri/files/patch-39d0c68 =================================================================== --- branches/2019Q4/graphics/mesa-dri/files/patch-39d0c68 (revision 513776) +++ branches/2019Q4/graphics/mesa-dri/files/patch-39d0c68 (nonexistent) @@ -1,16 +0,0 @@ -https://gitlab.freedesktop.org/mesa/mesa/commit/39d0c68321df - ---- src/amd/common/ac_llvm_build.c.orig 2019-01-17 11:26:22 UTC -+++ src/amd/common/ac_llvm_build.c -@@ -401,8 +401,9 @@ ac_build_optimization_barrier(struct ac_llvm_context * - LLVMValueRef - ac_build_shader_clock(struct ac_llvm_context *ctx) - { -- LLVMValueRef tmp = ac_build_intrinsic(ctx, "llvm.readcyclecounter", -- ctx->i64, NULL, 0, 0); -+ const char *intr = HAVE_LLVM >= 0x0900 && ctx->chip_class >= VI ? -+ "llvm.amdgcn.s.memrealtime" : "llvm.readcyclecounter"; -+ LLVMValueRef tmp = ac_build_intrinsic(ctx, intr, ctx->i64, NULL, 0, 0); - return LLVMBuildBitCast(ctx->builder, tmp, ctx->v2i32, ""); - } - Property changes on: branches/2019Q4/graphics/mesa-dri/files/patch-39d0c68 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q4/graphics/mesa-dri/files/patch-b5012a0 =================================================================== --- branches/2019Q4/graphics/mesa-dri/files/patch-b5012a0 (revision 513776) +++ branches/2019Q4/graphics/mesa-dri/files/patch-b5012a0 (nonexistent) @@ -1,13 +0,0 @@ -https://gitlab.freedesktop.org/mesa/mesa/commit/b5012a05185c - ---- src/amd/common/ac_llvm_build.c.orig 2019-01-17 11:26:22 UTC -+++ src/amd/common/ac_llvm_build.c -@@ -424,7 +424,7 @@ ac_build_ballot(struct ac_llvm_context *ctx, - args[0] = ac_to_integer(ctx, args[0]); - - return ac_build_intrinsic(ctx, -- "llvm.amdgcn.icmp.i32", -+ HAVE_LLVM >= 0x900 ? "llvm.amdgcn.icmp.i64.i32" : "llvm.amdgcn.icmp.i32", - ctx->i64, args, 3, - AC_FUNC_ATTR_NOUNWIND | - AC_FUNC_ATTR_READNONE | Property changes on: branches/2019Q4/graphics/mesa-dri/files/patch-b5012a0 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q4/lang/clover/Makefile =================================================================== --- branches/2019Q4/lang/clover/Makefile (revision 513776) +++ branches/2019Q4/lang/clover/Makefile (revision 513777) @@ -1,46 +1,40 @@ # $FreeBSD$ PORTNAME= clover PORTVERSION= ${MESAVERSION} PORTREVISION= 3 CATEGORIES= lang COMMENT= Mesa "Clover" OpenCL library BUILD_DEPENDS= libclc>=0.3.0:devel/libclc \ opencl>=0:devel/opencl LIB_DEPENDS= libOpenCL.so:devel/ocl-icd RUN_DEPENDS= libclc>=0.3.0:devel/libclc \ opencl>=0:devel/opencl ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= Clover needs a GPU supported by the Radeon KMS driver .include - -# Keep in sync with devel/libclc -.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 -LLVM_DEFAULT= 80 -.endif - .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common" CONFIGURE_ARGS+= --enable-opencl --enable-opencl-icd --disable-dri \ --disable-egl --disable-gbm --disable-gles2 --disable-glx \ --disable-va --disable-vdpau --disable-xvmc \ --with-gallium-drivers=r600,radeonsi # only supported GPUs LDFLAGS_i386= -Wl,-znotext #MESA_BUILD_WRKSRC= src/util src/compiler src/mesa src/gallium MESA_INSTALL_WRKSRC= src/gallium/targets/opencl src/gallium/targets/pipe-loader .include "${MASTERDIR}/Makefile.targets" pre-configure: @if [ -e ${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} ] && \ ! [ -e ${LOCALBASE}/bin/clang${LLVM_DEFAULT} ]; then \ ${ECHO_MSG} "Your llvm${LLVM_DEFAULT} is not built with clang support, which is required."; \ ${FALSE}; \ fi .include Index: branches/2019Q4 =================================================================== --- branches/2019Q4 (revision 513776) +++ branches/2019Q4 (revision 513777) Property changes on: branches/2019Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r513776