From 5714cd343330d38e515bf4c7973014230cb88a26 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 16 Jul 2020 12:49:28 +1000
Subject: [PATCH] ci: bump piglit checkout for dsa tests

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5896>
---
 .gitlab-ci.yml                     | 2 +-
 .gitlab-ci/build-piglit.sh         | 2 +-
 .gitlab-ci/piglit/glslparser.txt   | 4 ++--
 .gitlab-ci/piglit/quick_gl.txt     | 4 ++--
 .gitlab-ci/piglit/quick_shader.txt | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e769069370d..45fac9f2905 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -293,7 +293,7 @@ x86_test-base:
 x86_test-gl:
   extends: .use-x86_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-06-23-virgl"
+    FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-07-15-virgl"
 
 # Debian 10 based x86 test image for VK
 x86_test-vk:
diff --git a/.gitlab-ci/build-piglit.sh b/.gitlab-ci/build-piglit.sh
index 7c638349c13..75300e0de0d 100644
--- a/.gitlab-ci/build-piglit.sh
+++ b/.gitlab-ci/build-piglit.sh
@@ -4,7 +4,7 @@ set -ex
 
 git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
 pushd /piglit
-git checkout 6982bd10a9f71a36fbf441608aa0830d6b3fcf5b
+git checkout 404862743cf8a7b37a4e3a93b4ba1858d59cd4ab
 patch -p1 <$OLDPWD/.gitlab-ci/piglit/disable-vs_in.diff
 cmake -G Ninja -DCMAKE_BUILD_TYPE=Release
 ninja
diff --git a/.gitlab-ci/piglit/glslparser.txt b/.gitlab-ci/piglit/glslparser.txt
index 207f17f49d2..bc4d123d54f 100644
--- a/.gitlab-ci/piglit/glslparser.txt
+++ b/.gitlab-ci/piglit/glslparser.txt
@@ -2664,7 +2664,7 @@ spec/oes_texture_storage_multisample_2d_array/preprocessor/disabled-undefined-es
 summary:
        name:  results
        ----  --------
-       pass:    12169
+       pass:    12172
        fail:        2
       crash:        4
        skip:     2657
@@ -2676,4 +2676,4 @@ summary:
     changes:        0
       fixes:        0
 regressions:        0
-      total:    14832
+      total:    14835
diff --git a/.gitlab-ci/piglit/quick_gl.txt b/.gitlab-ci/piglit/quick_gl.txt
index 6df99b75778..f88c3bb292c 100644
--- a/.gitlab-ci/piglit/quick_gl.txt
+++ b/.gitlab-ci/piglit/quick_gl.txt
@@ -1670,7 +1670,7 @@ wgl/wgl-sanity: skip
 summary:
        name:  results
        ----  --------
-       pass:    21855
+       pass:    21862
        fail:      200
       crash:        0
        skip:     1445
@@ -1682,4 +1682,4 @@ summary:
     changes:        0
       fixes:        0
 regressions:        0
-      total:    23524
+      total:    23531
diff --git a/.gitlab-ci/piglit/quick_shader.txt b/.gitlab-ci/piglit/quick_shader.txt
index 7cad8a946c3..6a26294dbea 100644
--- a/.gitlab-ci/piglit/quick_shader.txt
+++ b/.gitlab-ci/piglit/quick_shader.txt
@@ -1,5 +1,4 @@
 shaders/glsl-idiv-const-opt: skip
-shaders/glsl-mul-const: skip
 spec/amd_shader_trinary_minmax/execution/built-in-functions/cs-max3-float-float-float: skip
 spec/amd_shader_trinary_minmax/execution/built-in-functions/cs-max3-int-int-int: skip
 spec/amd_shader_trinary_minmax/execution/built-in-functions/cs-max3-ivec2-ivec2-ivec2: skip
@@ -2227,6 +2226,7 @@ spec/glsl-4.30/execution/built-in-functions/cs-trunc-vec4: skip
 spec/glsl-4.40/execution/fs-interpolateatcentroid-swizzle: skip
 spec/glsl-4.40/execution/fs-interpolateatoffset-swizzle: skip
 spec/glsl-4.40/execution/fs-interpolateatsample-swizzle: skip
+spec/glsl-4.50/execution/glsl-mul-const: skip
 spec/glsl-4.50/execution/helper-invocation: skip
 spec/glsl-4.50/execution/ssbo-atomiccompswap-int: skip
 spec/intel_shader_atomic_float_minmax/execution/shared-atomiccompswap-float: skip
@@ -2322,7 +2322,7 @@ spec/nv_viewport_swizzle/viewport_swizzle: skip
 summary:
        name:  results
        ----  --------
-       pass:    14047
+       pass:    14054
        fail:      102
       crash:      178
        skip:     2041
@@ -2334,4 +2334,4 @@ summary:
     changes:        0
       fixes:        0
 regressions:        0
-      total:    16368
+      total:    16375
-- 
2.30.2