Import Mesa 22.1.7

1 files changed, 95 insertions, 9 deletions

diff --git a/lib/mesa/.gitlab-ci/test-source-dep.yml b/lib/mesa/.gitlab-ci/test-source-dep.yml
index d654b928b..e19bb216e 100644
--- a/lib/mesa/.gitlab-ci/test-source-dep.yml
+++ b/lib/mesa/.gitlab-ci/test-source-dep.yml
@@ -18,6 +18,7 @@
       - .gitlab-ci/**/*
       - include/**/*
       - meson.build
+      - .gitattributes
       - src/*
       - src/compiler/**/*
       - src/drm-shim/**/*
@@ -30,10 +31,6 @@
       - src/loader/**/*
       - src/mapi/**/*
       - src/mesa/*
-      - src/mesa/drivers/*
-      - src/mesa/drivers/common/**/*
-      - src/mesa/drivers/dri/*
-      - src/mesa/drivers/dri/common/**/*
       - src/mesa/main/**/*
       - src/mesa/math/**/*
       - src/mesa/program/**/*
@@ -41,11 +38,10 @@
       - src/mesa/state_tracker/**/*
       - src/mesa/swrast/**/*
       - src/mesa/swrast_setup/**/*
-      - src/mesa/tnl/**/*
-      - src/mesa/tnl_dd/**/*
       - src/mesa/vbo/**/*
       - src/mesa/x86/**/*
       - src/mesa/x86-64/**/*
+      - src/tool/**/*
       - src/util/**/*
 
 .vulkan-rules:
@@ -132,6 +128,7 @@
       - .gitlab-ci.yml
       - .gitlab-ci/**/*
       - meson.build
+      - .gitattributes
       - include/**/*
       - src/compiler/**/*
       - src/include/**/*
@@ -153,6 +150,8 @@
   rules:
     - if: '$FD_FARM == "offline"'
       when: never
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     - *ignore_scheduled_pipelines
     - changes:
         *mesa_core_file_list
@@ -180,9 +179,11 @@
   rules:
     - if: '$FD_FARM == "offline"'
       when: never
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     # If the triggerer has access to the restricted traces and if it is pre-merge
     - if: '($GITLAB_USER_LOGIN !~ "/^(robclark|anholt|flto|cwabbott0|Danil|tomeu)$/") &&
-           ($GITLAB_USER_LOGIN != "marge-bot" || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME)'
+           ($GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH)'
       when: never
     - *ignore_scheduled_pipelines
     - changes:
@@ -206,9 +207,11 @@
   rules:
     - if: '$FD_FARM == "offline"'
       when: never
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     - *ignore_scheduled_pipelines
     # Run only on pre-merge pipelines from Marge
-    - if: '$GITLAB_USER_LOGIN != "marge-bot" || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME'
+    - if: '$GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH'
       when: never
     - changes:
         *mesa_core_file_list
@@ -224,10 +227,30 @@
       when: manual
     - when: never
 
+.nouveau-rules:
+  stage: nouveau
+  rules:
+    - *ignore_scheduled_pipelines
+    - changes:
+        *mesa_core_file_list
+      when: on_success
+    - changes:
+        *gallium_core_file_list
+      when: on_success
+    - changes:
+      - src/nouveau/**/*
+      - src/gallium/drivers/nouveau/**/*
+      - src/gallium/winsys/kmsro/**/*
+      - src/gallium/winsys/nouveau/**/*
+      when: on_success
+    - when: never
+
 .panfrost-midgard-rules:
   stage: arm
   rules:
     - *ignore_scheduled_pipelines
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     - changes:
         *mesa_core_file_list
       when: on_success
@@ -254,6 +277,8 @@
   stage: arm
   rules:
     - *ignore_scheduled_pipelines
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     - changes:
         *mesa_core_file_list
       when: on_success
@@ -349,6 +374,8 @@
   stage: amd
   rules:
     - *ignore_scheduled_pipelines
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     - changes:
         *mesa_core_file_list
       when: on_success
@@ -377,10 +404,37 @@
       when: on_success
     - when: never
 
+# Unfortunately YAML doesn't let us concatenate arrays, so we have to do the
+# rules duplication manually
+.virgl-lava-rules-performance:
+  stage: layered-backends
+  rules:
+    - *ignore_scheduled_pipelines
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
+    # Run only on pre-merge pipelines from Marge
+    - if: '$GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH'
+      when: never
+    - changes:
+        *mesa_core_file_list
+      when: manual
+    - changes:
+        *gallium_core_file_list
+      when: manual
+    - changes:
+        *llvmpipe_file_list
+      when: manual
+    - changes:
+        *virgl_file_list
+      when: manual
+    - when: never
+
 .radeonsi-rules:
   stage: amd
   rules:
     - *ignore_scheduled_pipelines
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     - changes:
         *mesa_core_file_list
       when: on_success
@@ -402,6 +456,8 @@
   stage: amd
   rules:
     - *ignore_scheduled_pipelines
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     - changes:
         *mesa_core_file_list
       when: on_success
@@ -434,10 +490,29 @@
       when: on_success
     - when: never
 
+.crocus-rules:
+  stage: intel
+  rules:
+    - *ignore_scheduled_pipelines
+    - changes:
+        *mesa_core_file_list
+      when: on_success
+    - changes:
+        *gallium_core_file_list
+      when: on_success
+    - changes:
+      - src/gallium/drivers/crocus/**/*
+      - src/gallium/winsys/crocus/**/*
+      - src/intel/**/*
+      when: on_success
+    - when: never
+
 .iris-rules:
   stage: intel
   rules:
     - *ignore_scheduled_pipelines
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     - changes:
         *mesa_core_file_list
       when: on_success
@@ -457,8 +532,10 @@
   stage: intel
   rules:
     - *ignore_scheduled_pipelines
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     # Run only on pre-merge pipelines from Marge
-    - if: '$GITLAB_USER_LOGIN != "marge-bot" || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME'
+    - if: '$GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH'
       when: never
     - changes:
         *mesa_core_file_list
@@ -475,6 +552,8 @@
   stage: intel
   rules:
     - *ignore_scheduled_pipelines
+    - if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      when: never
     - changes:
         *mesa_core_file_list
       when: on_success
@@ -508,6 +587,8 @@
 # rules duplication manually
 .windows-build-rules:
   rules:
+    - if: '$MICROSOFT_FARM == "offline"'
+      when: never
     - *ignore_scheduled_pipelines
     - changes: 
         *mesa_core_file_list
@@ -516,6 +597,9 @@
         *gallium_core_file_list
       when: on_success
     - changes:
+        *softpipe_file_list
+      when: on_success
+    - changes:
         *lavapipe_file_list
       when: on_success
     - changes:
@@ -539,6 +623,8 @@
 
 .windows-test-rules:
   rules:
+    - if: '$MICROSOFT_FARM == "offline"'
+      when: never
     - *ignore_scheduled_pipelines
     - changes:
         *mesa_core_file_list