summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2021-02-03 16:38:04 -0800
committerMarge Bot <eric+marge@anholt.net>2021-02-10 03:31:56 +0000
commit1bab56e1ba5bd93c4b79034ab95f6ca411fc6919 (patch)
tree807bee5324ef24622412c7f44e6667f8de3d962a /.gitlab-ci.yml
parent697fb11cfc070154ef84ae3635c47267ecd4a9eb (diff)
ci/virgl: Fix GLES31 testing on desktop GL.
The version overrides leaked into the virglrenderer server, breaking compiling of all sorts of shaders. We already get GLES3.1 when running virgl on llvmpipe GL without doing any overrides. Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8854>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml2
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d46d3d2ce5..ad9016c6240 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1378,8 +1378,6 @@ virgl-gles31-on-gl:
parallel: 2
variables:
DEQP_VER: gles31
- MESA_GLES_VERSION_OVERRIDE: "3.1"
- MESA_GLSL_VERSION_OVERRIDE: "310"
MESA_EXTENSION_OVERRIDE: "-GL_OES_tessellation_shader"
extends: virgl-gles3-on-gl