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
46d23c0a
Commit
46d23c0a
authored
Jan 20, 2019
by
Eric Engestrom
Browse files
gitlab-ci: add a meson vulkan build
Signed-off-by:
Eric Engestrom
<
eric.engestrom@intel.com
>
parent
329f5cd7
Changes
2
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
46d23c0a
...
...
@@ -22,6 +22,7 @@ variables:
stages
:
-
containers-build
-
build+test
# CONTAINERS
...
...
@@ -47,3 +48,63 @@ containers:ubuntu:
changes
:
-
.gitlab-ci.yml
-
.gitlab-ci/Dockerfile.ubuntu
# BUILD
.build
:
image
:
$UBUNTU_IMAGE
stage
:
build+test
artifacts
:
when
:
on_failure
untracked
:
true
.meson-build
:
extends
:
.build
before_script
:
# We need to control the version of llvm-config we're using, so we'll
# generate a native file to do so. This requires meson >=0.49
-
if test -n "$LLVM_VERSION"; then
LLVM_CONFIG="llvm-config-${LLVM_VERSION}";
echo -e "[binaries]\nllvm-config = '`which $LLVM_CONFIG`'" > native.file;
$LLVM_CONFIG --version;
else
touch native.file;
fi
-
meson --version
-
meson _build
--native-file=native.file
-D build-tests=true
-D libunwind=${UNWIND}
${DRI_LOADERS}
-D dri-drivers=${DRI_DRIVERS:-[]}
${GALLIUM_ST}
-D gallium-drivers=${GALLIUM_DRIVERS:-[]}
-D vulkan-drivers=${VULKAN_DRIVERS:-[]}
-
cd _build
-
meson configure
script
:
-
ninja
-
ninja test
build:meson-vulkan:
extends
:
.meson-build
variables
:
UNWIND
:
"
false"
DRI_LOADERS
:
>
-D glx=disabled
-D gbm=false
-D egl=false
-D platforms=x11,wayland,drm
-D osmesa=none
GALLIUM_ST
:
>
-D dri3=true
-D gallium-vdpau=false
-D gallium-xvmc=false
-D gallium-omx=disabled
-D gallium-va=false
-D gallium-xa=false
-D gallium-nine=false
-D gallium-opencl=disabled
VULKAN_DRIVERS
:
intel,amd
LLVM_VERSION
:
"
7"
.travis.yml
View file @
46d23c0a
...
...
@@ -31,30 +31,6 @@ env:
matrix
:
include
:
-
env
:
-
LABEL="meson Vulkan"
-
BUILD=meson
-
UNWIND="false"
-
DRI_LOADERS="-Dglx=disabled -Dgbm=false -Degl=false -Dplatforms=x11,wayland,drm -Dosmesa=none"
-
GALLIUM_ST="-Ddri3=true -Dgallium-vdpau=false -Dgallium-xvmc=false -Dgallium-omx=disabled -Dgallium-va=false -Dgallium-xa=false -Dgallium-nine=false -Dgallium-opencl=disabled"
-
VULKAN_DRIVERS="intel,amd"
-
LLVM_VERSION=7
-
LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
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
:
-
llvm-7-dev
# Common
-
xz-utils
-
libexpat1-dev
-
libx11-xcb-dev
-
libelf-dev
-
python3.5
-
python3-pip
-
python3-setuptools
-
env
:
-
LABEL="meson loaders/classic DRI"
-
BUILD=meson
...
...
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