@@ -, +, @@ --- graphics/mesa-dri/Makefile | 19 +++- graphics/mesa-dri/Makefile.common | 2 +- .../files/patch-src_intel_vulkan_anv__allocator.c | 101 +++++++++++++++++++++ .../files/patch-src_intel_vulkan_anv__device.c | 42 +++++++++ graphics/mesa-dri/pkg-plist | 5 + 5 files changed, 167 insertions(+), 2 deletions(-) create mode 100644 graphics/mesa-dri/files/patch-src_intel_vulkan_anv__allocator.c create mode 100644 graphics/mesa-dri/files/patch-src_intel_vulkan_anv__device.c --- graphics/mesa-dri/Makefile +++ graphics/mesa-dri/Makefile @@ -31,6 +31,7 @@ VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau 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 "${MESA_LLVM_VER}" != "" @@ -38,12 +39,15 @@ 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 . if "${MESA_LLVM_VER}" != "" # until PPC gets LLVM in base GALLIUM_DRIVERS+= RADEONSI +VULKAN_DRIVERS+= RADEON . endif .endif .if ${ARCH} == amd64 || ${ARCH} == i386 @@ -52,6 +56,10 @@ GALLIUM_DRIVERS+= SVGA . if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 EXTRA_PATCHES+= ${PATCHDIR}/extra-src_mesa_drivers_dri_i965_intel__screen.c . endif +VULKAN_DRIVERS+= INTEL +# --build-id isn't supported by old GNU ld.bfd in base +USE_BINUTILS= yes +LDFLAGS+= -B${LOCALBASE}/bin .elif ${ARCH} == armv6 || ${ARCH} == aarch64 GALLIUM_DRIVERS+= FREEDRENO VC4 . if ${ARCH} == armv6 @@ -60,7 +68,8 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-src_gallium_drivers_vc4_Makefile.in .endif CONFIGURE_ARGS+= --with-dri-drivers="${DRI_DRIVERS:tl}" \ - --with-gallium-drivers="${GALLIUM_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}} @@ -78,6 +87,14 @@ 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: --- graphics/mesa-dri/Makefile.common +++ graphics/mesa-dri/Makefile.common @@ -60,7 +60,7 @@ SHEBANG_FILES= src/gallium/*/*/*.py src/gallium/tools/trace/*.py \ src/mapi/glapi/gen/*.py src/mapi/mapi_abi.py \ src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py \ src/mesa/main/get_*.py src/util/format_srgb.py \ - src/amd/*/*.py src/intel/genxml/gen_pack_header.py + src/intel/genxml/gen_pack_header.py MASTERDIR= ${.CURDIR:H:H}/graphics/mesa-dri PATCHDIR= ${MASTERDIR}/files --- /dev/null +++ graphics/mesa-dri/files/patch-src_intel_vulkan_anv__allocator.c @@ -0,0 +1,101 @@ +- Partially implement sys_futex() via _umtx_op() +- Partially implement memfd_create() via mkostemp() +- Ignore MAP_POPULATE if unsupported + +--- src/intel/vulkan/anv_allocator.c.orig 2017-08-12 16:09:52.000000000 +0000 ++++ src/intel/vulkan/anv_allocator.c 2017-08-15 09:14:09.658565996 +0000 +@@ -26,12 +26,31 @@ + #include + #include + #include ++#ifdef __linux__ + #include + #include ++#endif + #include + #include ++#ifdef __linux__ + #include ++#else ++#include ++#endif + ++#ifdef __FreeBSD__ ++#include ++#include ++#endif ++ ++#ifndef MAP_POPULATE ++#define MAP_POPULATE 0 ++#endif ++ ++#ifndef MFD_CLOEXEC ++#define MFD_CLOEXEC O_CLOEXEC ++#endif ++ + #include "anv_private.h" + + #include "util/hash_table.h" +@@ -112,6 +131,8 @@ struct anv_mmap_cleanup { + + #define ANV_MMAP_CLEANUP_INIT ((struct anv_mmap_cleanup){0}) + ++#if defined(__linux__) ++ + static inline long + sys_futex(void *addr1, int op, int val1, + struct timespec *timeout, void *addr2, int val3) +@@ -131,10 +152,53 @@ futex_wait(uint32_t *addr, int32_t value) + return sys_futex(addr, FUTEX_WAIT, value, NULL, NULL, 0); + } + ++#elif defined(__FreeBSD__) ++ ++/* Based on libxshmfence */ ++ + static inline int ++sys_futex(void *addr, int op, int32_t val) ++{ ++ return _umtx_op(addr, op, (uint32_t)val, NULL, NULL) == -1 ? errno : 0; ++} ++ ++static inline int ++futex_wake(uint32_t *addr, int count) ++{ ++ return sys_futex(addr, UMTX_OP_WAKE, count); ++} ++ ++static inline int ++futex_wait(uint32_t *addr, int32_t value) ++{ ++ return sys_futex(addr, UMTX_OP_WAIT_UINT, value); ++} ++#endif ++ ++static inline int + memfd_create(const char *name, unsigned int flags) + { ++#ifdef __linux__ + return syscall(SYS_memfd_create, name, flags); ++#else ++ char template[] = "/tmp/shmfd-XXXXXX"; ++#ifdef HAVE_MKOSTEMP ++ int fd = mkostemp(template, flags); ++#else ++ int fd = mkstemp(template); ++ if (flags & O_CLOEXEC) { ++ int flags = fcntl(fd, F_GETFD); ++ if (flags != -1) { ++ flags |= FD_CLOEXEC; ++ (void) fcntl(fd, F_SETFD, &flags); ++ } ++ } ++#endif /* HAVE_MKOSTEMP */ ++ if (fd >= 0) ++ unlink(template); ++ ++ return fd; ++#endif /* __linux__ */ + } + + static inline uint32_t --- /dev/null +++ graphics/mesa-dri/files/patch-src_intel_vulkan_anv__device.c @@ -0,0 +1,42 @@ +- Without sysinfo() fall back to sysconf() +- Define ETIME if missing + +--- src/intel/vulkan/anv_device.c.orig 2017-08-12 16:09:52 UTC ++++ src/intel/vulkan/anv_device.c +@@ -25,7 +25,9 @@ + #include + #include + #include ++#ifdef __GLIBC__ + #include ++#endif + #include + #include + #include +@@ -39,6 +41,10 @@ + + #include "genxml/gen7_pack.h" + ++#ifndef ETIME ++#define ETIME ETIMEDOUT ++#endif ++ + static void + compiler_debug_log(void *data, const char *fmt, ...) + { } +@@ -73,10 +79,15 @@ anv_compute_heap_size(int fd, uint64_t *heap_size) + } + + /* Query the total ram from the system */ ++#ifdef __GLIBC__ + struct sysinfo info; + sysinfo(&info); + + uint64_t total_ram = (uint64_t)info.totalram * (uint64_t)info.mem_unit; ++#else ++ uint64_t total_ram = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGE_SIZE); ++#endif ++ + + /* We don't want to burn too much ram with the GPU. If the user has 4GiB + * or less, we use at most half. If they have more than 4GiB, we use 3/4. --- graphics/mesa-dri/pkg-plist +++ graphics/mesa-dri/pkg-plist @@ -23,6 +23,7 @@ include/GL/internal/dri_interface.h @comment include/GLES3/gl3platform.h @comment include/KHR/khrplatform.h @comment include/gbm.h +%%INTEL_VDRIVER%%include/vulkan/vulkan_intel.h %%I915_DRIVER%%lib/dri/i915_dri.so %%I965_DRIVER%%lib/dri/i965_dri.so %%FREEDRENO_GDRIVER%%lib/dri/kgsl_dri.so @@ -80,6 +81,8 @@ include/GL/internal/dri_interface.h %%VDPAU%%%%RADEONSI_GDRIVER%%lib/vdpau/libvdpau_radeonsi.so.1 %%VDPAU%%%%RADEONSI_GDRIVER%%lib/vdpau/libvdpau_radeonsi.so.1.0 %%VDPAU%%%%RADEONSI_GDRIVER%%lib/vdpau/libvdpau_radeonsi.so.1.0.0 +%%INTEL_VDRIVER%%lib/libvulkan_intel.so +%%RADEON_VDRIVER%%lib/libvulkan_radeon.so @comment lib/libwayland-egl.so @comment lib/libwayland-egl.so.1 @comment lib/libwayland-egl.so.1.0.0 @@ -90,3 +93,5 @@ libdata/pkgconfig/dri.pc @comment libdata/pkgconfig/glesv2.pc @comment libdata/pkgconfig/osmesa.pc @comment libdata/pkgconfig/wayland-egl.pc +%%INTEL_VDRIVER%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json +%%RADEON_VDRIVER%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json