Revert recent changes about not including compute in combined limits.
[mesa.git] / .travis.yml
index 90f9ec40e12cefea994f2ddaeb3a0ce721921f82..4ef0286a68f3a4c180e26f108cbdabd873d590af 100644 (file)
@@ -90,6 +90,7 @@ matrix:
             - libx11-xcb-dev
             - libxdamage-dev
             - libxfixes-dev
+            - python3-pip
     - env:
         # NOTE: Building SWR is 2x (yes two) times slower than all the other
         # gallium drivers combined.
@@ -122,6 +123,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         - LABEL="make Gallium Drivers RadeonSI"
         - BUILD=make
@@ -151,6 +153,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         - LABEL="make Gallium Drivers Other"
         - BUILD=make
@@ -183,6 +186,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         # NOTE: Analogous to SWR above, building Clover is quite slow.
         - LABEL="make Gallium ST Clover LLVM-3.9"
@@ -222,6 +226,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         # NOTE: Analogous to SWR above, building Clover is quite slow.
         - LABEL="make Gallium ST Clover LLVM-4.0"
@@ -258,6 +263,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         # NOTE: Analogous to SWR above, building Clover is quite slow.
         - LABEL="make Gallium ST Clover LLVM-5.0"
@@ -294,6 +300,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         # NOTE: Analogous to SWR above, building Clover is quite slow.
         - LABEL="make Gallium ST Clover LLVM-6.0"
@@ -327,6 +334,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         - LABEL="make Gallium ST Other"
         - BUILD=make
@@ -363,6 +371,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         - LABEL="make Vulkan"
         - BUILD=make
@@ -391,6 +400,7 @@ matrix:
             - libexpat1-dev
             - libx11-xcb-dev
             - libelf-dev
+            - python3-pip
     - env:
         - LABEL="scons"
         - BUILD=scons
@@ -499,7 +509,7 @@ install:
 
   # Install autotools build dependencies
   - if test "x$BUILD" = xmake; then
-      pip2 install --user mako;
+      pip3 install --user mako;
     fi
 
   # Install a more modern scons from pip.