Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Timur Kristóf
mesa
Commits
89a74678
Commit
89a74678
authored
Jan 21, 2019
by
Eric Engestrom
Browse files
gitlab-ci: add a make vulkan build
Signed-off-by:
Eric Engestrom
<
eric.engestrom@intel.com
>
parent
46d23c0a
Changes
2
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
89a74678
...
...
@@ -87,6 +87,30 @@ containers:ubuntu:
-
ninja
-
ninja test
.make-build
:
extends
:
.build
variables
:
MAKEFLAGS
:
"
-j4"
before_script
:
-
if test -n "$LLVM_VERSION"; then
export LLVM_CONFIG="llvm-config-${LLVM_VERSION}";
fi
-
mkdir build
-
cd build
-
../autogen.sh
--enable-autotools
--enable-debug
$LIBUNWIND_FLAGS
$DRI_LOADERS
--with-dri-drivers=$DRI_DRIVERS
$GALLIUM_ST
--with-gallium-drivers=$GALLIUM_DRIVERS
--with-vulkan-drivers=$VULKAN_DRIVERS
--disable-llvm-shared-libs
script
:
-
make
-
eval $MAKE_CHECK_COMMAND
build:meson-vulkan:
extends
:
.meson-build
variables
:
...
...
@@ -108,3 +132,28 @@ build:meson-vulkan:
-D gallium-opencl=disabled
VULKAN_DRIVERS
:
intel,amd
LLVM_VERSION
:
"
7"
build:make-vulkan:
extends
:
.make-build
variables
:
MAKE_CHECK_COMMAND
:
"
make
-C
src/gtest
check
&&
make
-C
src/intel
check"
LLVM_VERSION
:
"
7"
DRI_LOADERS
:
>
--disable-glx
--disable-gbm
--disable-egl
--with-platforms=x11,wayland,drm
DRI_DRIVERS
:
"
"
GALLIUM_ST
:
>
--enable-dri
--enable-dri3
--disable-opencl
--disable-xa
--disable-nine
--disable-xvmc
--disable-vdpau
--disable-va
--disable-omx-bellagio
--disable-gallium-osmesa
VULKAN_DRIVERS
:
intel,radeon
LIBUNWIND_FLAGS
:
--disable-libunwind
.travis.yml
View file @
89a74678
...
...
@@ -530,34 +530,6 @@ matrix:
-
libunwind8-dev
-
python3-pip
-
python3-setuptools
-
env
:
-
LABEL="make Vulkan"
-
BUILD=make
-
MAKEFLAGS="-j4"
-
MAKE_CHECK_COMMAND="make -C src/gtest check && make -C src/intel check"
-
LLVM_VERSION=7
-
LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-
DRI_LOADERS="--disable-glx --disable-gbm --disable-egl --with-platforms=x11,wayland"
-
DRI_DRIVERS=""
-
GALLIUM_ST="--enable-dri --enable-dri3 --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa"
-
GALLIUM_DRIVERS=""
-
VULKAN_DRIVERS="intel,radeon"
-
LIBUNWIND_FLAGS="--disable-libunwind"
addons
:
apt
:
sources
:
-
sourceline
:
'
deb
http://apt.llvm.org/xenial/
llvm-toolchain-xenial-7
main'
key_url
:
https://apt.llvm.org/llvm-snapshot.gpg.key
packages
:
# From sources above
-
llvm-7-dev
# Common
-
xz-utils
-
libexpat1-dev
-
libx11-xcb-dev
-
libelf-dev
-
python3-pip
-
python3-setuptools
-
env
:
-
LABEL="scons"
-
BUILD=scons
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment