util: Add util functionality for GL4.1 support

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 31c9bd7d4a9debce4b46f095a2d0458144a4f389..f8c6c9ff32d17a7fb79ae9ed13927d5cfb0efe31 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -231,7 +231,7 @@ x86_test-base:
 x86_test-gl:
   extends: .use-x86_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-06-02"
+    FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-06-04"
 
 # Debian 10 based x86 test image for VK
 x86_test-vk:
@@ -838,6 +838,7 @@ virgl-gles31:
     DEQP_RUNNER_OPTIONS: "--timeout 120"
     MESA_GLES_VERSION_OVERRIDE: "3.1"
     MESA_GLSL_VERSION_OVERRIDE: "310"
+    MESA_EXTENSION_OVERRIDE: "-GL_OES_tessellation_shader"
   extends: virgl-gles2
 
 # Rules for tests that should not be present in MRs or the main
@@ -887,7 +888,6 @@ arm64_a630_noubo:
     DEQP_VER: gles31
     IR3_SHADER_DEBUG: nouboopt
     DEQP_CASELIST_FILTER: "functional.*ubo"
-    DEQP_EXPECTED_FAILS: deqp-freedreno-a630-noubo-fails.txt
 
 # The driver does some guessing as to whether to render using gmem
 # or bypass, and some GLES3.1 features interact with either one.