swr/rast: Disable use of __forceinline by default

[mesa.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fafc9e075e74142830bddf5c04a80b68cb3b5719..9e1a32f7a0af3fecc221b973609717bd0b4444ac 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,8 @@
 # at "01" unless you have multiple updates on the same day :)
 variables:
   UBUNTU_TAG: 2019-01-31-01
-  UBUNTU_IMAGE: "$CI_REGISTRY/$CI_PROJECT_PATH/ubuntu:$UBUNTU_TAG"
+  UBUNTU_IMAGE: "$CI_REGISTRY_IMAGE/ubuntu:$UBUNTU_TAG"
+  UBUNTU_IMAGE_MAIN: "registry.freedesktop.org/mesa/mesa/ubuntu:$UBUNTU_TAG"
 
 
 stages:
@@ -42,6 +43,10 @@ containers:ubuntu:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
     # Check if the image (with the specific tag) already exists
     - docker manifest inspect $UBUNTU_IMAGE && exit || true
+    # Try to re-use the image from the main repository's registry
+    - docker image pull $UBUNTU_IMAGE_MAIN &&
+      docker image tag $UBUNTU_IMAGE_MAIN $UBUNTU_IMAGE &&
+      docker image push $UBUNTU_IMAGE && exit || true
     - docker build -t $UBUNTU_IMAGE -f .gitlab-ci/Dockerfile.ubuntu .
     - docker push $UBUNTU_IMAGE
   only:
@@ -84,7 +89,7 @@ containers:ubuntu:
     - cd _build
     - meson configure
   script:
-    - ninja
+    - ninja -j4
     - ninja test
 
 .make-build:
@@ -165,6 +170,25 @@ build:meson-loader-classic-dri:
       -D gallium-nine=false
       -D gallium-opencl=disabled
 
+build:meson-glvnd:
+  extends: .meson-build
+  variables:
+    UNWIND: "true"
+    DRI_LOADERS: >
+      -D glvnd=true
+      -D egl=true
+      -D gbm=true
+      -D glx=dri
+    DRI_DRIVERS: "i965"
+    GALLIUM_ST: >
+      -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
+
 # NOTE: Building SWR is 2x (yes two) times slower than all the other
 # gallium drivers combined.
 # Start this early so that it doesn't hunder the run time.
@@ -305,6 +329,137 @@ build:make-vulkan:
     VULKAN_DRIVERS: intel,radeon
     LIBUNWIND_FLAGS: --disable-libunwind
 
+build:make-loader-classic-dri:
+  extends: .make-build
+  variables:
+    MAKE_CHECK_COMMAND: "make check"
+    DRI_LOADERS: >
+      --enable-glx
+      --enable-gbm
+      --enable-egl
+      --with-platforms=x11,wayland,drm,surfaceless
+      --enable-osmesa
+    DRI_DRIVERS: "i915,i965,radeon,r200,swrast,nouveau"
+    GALLIUM_ST: >
+      --enable-dri
+      --disable-opencl
+      --disable-xa
+      --disable-nine
+      --disable-xvmc
+      --disable-vdpau
+      --disable-va
+      --disable-omx-bellagio
+      --disable-gallium-osmesa
+    LIBUNWIND_FLAGS: --disable-libunwind
+
+# NOTE: Building SWR is 2x (yes two) times slower than all the other
+# gallium drivers combined.
+# Start this early so that it doesn't hunder the run time.
+build:make-gallium-drivers-swr:
+  extends: .make-build
+  variables:
+    MAKE_CHECK_COMMAND: "true"
+    LLVM_VERSION: "6.0"
+    DRI_LOADERS: >
+      --disable-glx
+      --disable-gbm
+      --disable-egl
+    GALLIUM_ST: >
+      --enable-dri
+      --disable-opencl
+      --disable-xa
+      --disable-nine
+      --disable-xvmc
+      --disable-vdpau
+      --disable-va
+      --disable-omx-bellagio
+      --disable-gallium-osmesa
+    GALLIUM_DRIVERS: "swr"
+    LIBUNWIND_FLAGS: --enable-libunwind
+
+build:make-gallium-drivers-radeonsi:
+  extends: build:make-gallium-drivers-swr
+  variables:
+    LLVM_VERSION: "7"
+    GALLIUM_DRIVERS: "radeonsi"
+
+build:make-gallium-drivers-other:
+  extends: build:make-gallium-drivers-swr
+  variables:
+    LLVM_VERSION: "3.9"
+    GALLIUM_DRIVERS: "i915,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv"
+
+build:make-gallium-st-clover-llvm-39:
+  extends: .make-build
+  variables:
+    MAKE_CHECK_COMMAND: "true"
+    LLVM_VERSION: "3.9"
+    DRI_LOADERS: >
+      --disable-glx
+      --disable-gbm
+      --disable-egl
+    GALLIUM_ST: >
+      --disable-dri
+      --enable-opencl
+      --enable-opencl-icd
+      --enable-llvm
+      --disable-xa
+      --disable-nine
+      --disable-xvmc
+      --disable-vdpau
+      --disable-va
+      --disable-omx-bellagio
+      --disable-gallium-osmesa
+    GALLIUM_DRIVERS: "r600"
+    LIBUNWIND_FLAGS: --enable-libunwind
+
+build:make-gallium-st-clover-llvm-4:
+  extends: build:make-gallium-st-clover-llvm-39
+  variables:
+    LLVM_VERSION: "4.0"
+
+build:make-gallium-st-clover-llvm-5:
+  extends: build:make-gallium-st-clover-llvm-39
+  variables:
+    LLVM_VERSION: "5.0"
+
+build:make-gallium-st-clover-llvm-6:
+  extends: build:make-gallium-st-clover-llvm-39
+  variables:
+    LLVM_VERSION: "6.0"
+
+build:make-gallium-st-clover-llvm-7:
+  extends: build:make-gallium-st-clover-llvm-39
+  variables:
+    LLVM_VERSION: "7"
+    GALLIUM_DRIVERS: "r600,radeonsi"
+
+build:make-gallium-st-other:
+  extends: .make-build
+  variables:
+    MAKE_CHECK_COMMAND: "true"
+    # We should be testing 3.3, but 3.9 is the oldest that still exists in ubuntu
+    LLVM_VERSION: "3.9"
+    DRI_LOADERS: >
+      --disable-glx
+      --disable-gbm
+      --disable-egl
+    GALLIUM_ST: >
+      --enable-dri
+      --disable-opencl
+      --enable-xa
+      --enable-nine
+      --enable-xvmc
+      --enable-vdpau
+      --enable-va
+      --enable-omx-bellagio
+      --enable-gallium-osmesa
+    # We need swrast for osmesa and nine.
+    # i915 most likely doesn't work with most ST.
+    # Regardless - we're doing a quick build test here.
+    GALLIUM_DRIVERS: "i915,swrast"
+    LIBUNWIND_FLAGS: --enable-libunwind
+
 build:scons-nollvm:
   extends: .scons-build
   variables: