Commit 98281613 authored by Chuck Atkins's avatar Chuck Atkins
Browse files

Bump mesa to 18.0.0-rc4

parent c8006d9a
set(mesa_type_args --disable-gallium-osmesa --enable-glx --with-platforms=x11) set(mesa_type_args --disable-osmesa --disable-gallium-osmesa --enable-glx --with-platforms=x11)
set(mesa_type_deps glproto) set(mesa_type_deps glproto)
include(mesa.common) include(mesa.common)
......
...@@ -8,9 +8,16 @@ endif () ...@@ -8,9 +8,16 @@ endif ()
option(mesa_USE_SWR "Enable the OpenSWR driver" "${mesa_swr_default}") option(mesa_USE_SWR "Enable the OpenSWR driver" "${mesa_swr_default}")
mark_as_advanced(mesa_USE_SWR) mark_as_advanced(mesa_USE_SWR)
set(mesa_SWR_ARCH "avx,avx2"
CACHE STRING "backend architectures to be used by Sthe SWR driver")
mark_as_advanced(mesa_USE_SWR_ARCH)
set_property(CACHE mesa_SWR_ARCH PROPERTY STRINGS
"avx" "avx,avx2" "avx,avx2,knl" "avx,avx2,skx" "avx,avx2,knl,skx")
set(mesa_drivers swrast) set(mesa_drivers swrast)
if (mesa_USE_SWR) if (mesa_USE_SWR)
list(APPEND mesa_drivers swr) list(APPEND mesa_drivers swr)
set(mesa_swr_arch "--with-swr-arch=${mesa_USE_SWR_ARCH}")
endif () endif ()
option(mesa_USE_TEXTURE_FLOAT option(mesa_USE_TEXTURE_FLOAT
...@@ -41,12 +48,13 @@ set(mesa_common_config_args ...@@ -41,12 +48,13 @@ set(mesa_common_config_args
--prefix=<INSTALL_DIR> --prefix=<INSTALL_DIR>
--enable-opengl --disable-gles1 --disable-gles2 --enable-opengl --disable-gles1 --disable-gles2
--disable-va --disable-gbm --disable-xvmc --disable-vdpau --disable-va --disable-gbm --disable-xvmc --disable-vdpau
--enable-shared-glapi --disable-shared-glapi
${mesa_texture_float_args} ${mesa_texture_float_args}
--disable-dri --with-dri-drivers= --disable-dri --with-dri-drivers=
--enable-llvm --enable-llvm-shared-libs --enable-llvm
--with-llvm-prefix=${llvm_dir} --with-llvm-prefix=${llvm_dir}
--with-gallium-drivers=${mesa_drivers} --with-gallium-drivers=${mesa_drivers}
${mesa_swr_arch}
--disable-egl --disable-gbm) --disable-egl --disable-gbm)
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
......
set(mesa_type_args --enable-gallium-osmesa --disable-glx --with-platforms=) set(mesa_type_args --disable-osmesa --enable-gallium-osmesa --disable-glx --with-platforms=)
set(mesa_type_deps) set(mesa_type_deps)
include(mesa.common) include(mesa.common)
......
...@@ -7,8 +7,8 @@ superbuild_set_revision(glproto ...@@ -7,8 +7,8 @@ superbuild_set_revision(glproto
URL_MD5 5565f1b0facf4a59c2778229c1f70d10) URL_MD5 5565f1b0facf4a59c2778229c1f70d10)
superbuild_set_revision(mesa superbuild_set_revision(mesa
URL "http://www.paraview.org/files/dependencies/mesa-17.1.4.tar.xz" URL "http://www.paraview.org/files/dependencies/mesa-18.0.0-rc4.tar.xz"
URL_MD5 be2ef7c9edec23b07f74f6512a6a6fa5) URL_MD5 195889b71ee88785d55b03d99e0034d3)
get_property(mesa_revision GLOBAL PROPERTY mesa_revision) get_property(mesa_revision GLOBAL PROPERTY mesa_revision)
superbuild_set_revision(osmesa ${mesa_revision}) superbuild_set_revision(osmesa ${mesa_revision})
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment