From: Eric Anholt Date: Thu, 30 Jan 2020 23:53:39 +0000 (-0800) Subject: ci: Bump the GLES CTS version to 3.2.6.1. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=658eb691fc4266cfcb6d2a7eec17469f5eae10b5;p=mesa.git ci: Bump the GLES CTS version to 3.2.6.1. This brings in the surfaceless fixes so we don't need to check out the whole repo to cherry pick any more (which was bothering me as I debugged things late in the painfully slow ARM container build process). Reviewed-by: Michel Dänzer Tested-by: Marge Bot Part-of: --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 508ae0df36a..571d6601cbe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -125,7 +125,7 @@ x86_build: x86_test-gl: extends: x86_build variables: - DEBIAN_TAG: &x86_test-gl "2020-01-14" + DEBIAN_TAG: &x86_test-gl "2020-01-30" # Debian 10 based x86 test image for VK x86_test-vk: @@ -165,7 +165,7 @@ arm_build: - .debian@container-ifnot-exists@arm64v8 - .container variables: - DEBIAN_TAG: &arm_build "2020-02-03" + DEBIAN_TAG: &arm_build "2020-02-05" .use-arm_build: variables: @@ -178,7 +178,7 @@ arm_build: arm_test: extends: arm_build variables: - DEBIAN_TAG: &arm_test "2019-12-18" + DEBIAN_TAG: &arm_test "2020-01-30" .use-arm_test: variables: diff --git a/.gitlab-ci/build-deqp-gl.sh b/.gitlab-ci/build-deqp-gl.sh index 63164956f0c..13c684b31a6 100644 --- a/.gitlab-ci/build-deqp-gl.sh +++ b/.gitlab-ci/build-deqp-gl.sh @@ -1,14 +1,11 @@ git config --global user.email "mesa@example.com" git config --global user.name "Mesa CI" -# XXX: Use --depth 1 once we can drop the cherry-picks. git clone \ + --depth 1 \ https://github.com/KhronosGroup/VK-GL-CTS.git \ - -b opengl-es-cts-3.2.5.1 \ + -b opengl-es-cts-3.2.6.1 \ /VK-GL-CTS pushd /VK-GL-CTS -# Fix surfaceless build -git cherry-pick -x 22f41e5e321c6dcd8569c4dad91bce89f06b3670 -git cherry-pick -x 1daa8dff73161ea60ead965bd6c9f2a0a2165648 # surfaceless links against libkms and such despite not using it. sed -i '/gbm/d' targets/surfaceless/surfaceless.cmake @@ -38,7 +35,7 @@ ninja mkdir /deqp/mustpass for gles in gles2 gles3 gles31; do cp \ - /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/aosp_mustpass/3.2.5.x/$gles-master.txt \ + /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/aosp_mustpass/3.2.6.x/$gles-master.txt \ /deqp/mustpass/$gles-master.txt done diff --git a/.gitlab-ci/container/arm_build.sh b/.gitlab-ci/container/arm_build.sh index a24d81ea972..b7f0b5942ae 100644 --- a/.gitlab-ci/container/arm_build.sh +++ b/.gitlab-ci/container/arm_build.sh @@ -41,6 +41,7 @@ apt-get -y install \ meson \ pkg-config \ python \ + python3-distutils \ python3-mako \ unzip \ wget \ @@ -69,6 +70,7 @@ DEBIAN_ARCH=arm64 . .gitlab-ci/container/lava_arm.sh DEBIAN_ARCH=armhf . .gitlab-ci/container/lava_arm.sh apt-get purge -y \ + python3-distutils \ wget apt-get autoremove -y --purge diff --git a/.gitlab-ci/container/arm_test.sh b/.gitlab-ci/container/arm_test.sh index a6ef7407ccd..6f91da724ab 100644 --- a/.gitlab-ci/container/arm_test.sh +++ b/.gitlab-ci/container/arm_test.sh @@ -30,6 +30,7 @@ apt-get -y install \ pkg-config \ procps \ python \ + python3-distutils \ waffle-utils \ wget \ zlib1g @@ -59,6 +60,7 @@ apt-get purge -y \ meson \ pkg-config \ python \ + python3-distutils \ wget apt-get autoremove -y --purge diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh index a8fb9889c8d..961ad2accc6 100644 --- a/.gitlab-ci/container/x86_test-gl.sh +++ b/.gitlab-ci/container/x86_test-gl.sh @@ -50,6 +50,7 @@ apt-get install -y --no-remove \ meson \ patch \ pkg-config \ + python3-distutils \ python3-mako \ python3-numpy \ python3-six \ @@ -91,6 +92,7 @@ apt-get purge -y \ meson \ patch \ pkg-config \ - python + python \ + python3-distutils apt-get autoremove -y --purge diff --git a/.gitlab-ci/deqp-freedreno-a630-fails.txt b/.gitlab-ci/deqp-freedreno-a630-fails.txt index 4124d0984fe..61478eb1fef 100644 --- a/.gitlab-ci/deqp-freedreno-a630-fails.txt +++ b/.gitlab-ci/deqp-freedreno-a630-fails.txt @@ -1,3 +1,4 @@ dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_neg_z_and_pos_x_pos_z_and_neg_x_neg_y_pos_z +dEQP-GLES2.functional.clip_control.depth_mode_zero_to_one dEQP-GLES31.functional.stencil_texturing.render.depth24_stencil8_clear dEQP-GLES31.functional.stencil_texturing.render.depth24_stencil8_draw diff --git a/.gitlab-ci/deqp-freedreno-a630-skips.txt b/.gitlab-ci/deqp-freedreno-a630-skips.txt index 38f0560f643..16c8bd70d8d 100644 --- a/.gitlab-ci/deqp-freedreno-a630-skips.txt +++ b/.gitlab-ci/deqp-freedreno-a630-skips.txt @@ -18,6 +18,7 @@ dEQP-GLES31.functional.primitive_bounding_box.* # Intermittent timeout dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.23 +dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.48 # Flakes reported more than once during January 2020 dEQP-GLES31.functional.layout_binding.ssbo.fragment_binding_array diff --git a/.gitlab-ci/deqp-lima-fails.txt b/.gitlab-ci/deqp-lima-fails.txt index c85e28b4cc9..2ddd3548250 100644 --- a/.gitlab-ci/deqp-lima-fails.txt +++ b/.gitlab-ci/deqp-lima-fails.txt @@ -4,6 +4,7 @@ dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_neg_x_neg_y_pos_z_a dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_neg_x_pos_y_pos_z_and_pos_x_neg_y_neg_z dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_pos_x_neg_y_pos_z_and_neg_x_pos_y_neg_z dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_pos_x_pos_y_pos_z_and_neg_x_neg_y_neg_z +dEQP-GLES2.functional.default_vertex_attrib.float.vertex_attrib_1f dEQP-GLES2.functional.depth_stencil_clear.depth_stencil_masked dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_rgb565_depth_component16 dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_rgb565_stencil_index8 @@ -62,6 +63,7 @@ dEQP-GLES2.functional.fragment_ops.depth_stencil.random.8 dEQP-GLES2.functional.fragment_ops.depth_stencil.random.9 dEQP-GLES2.functional.fragment_ops.depth_stencil.write_mask.stencil dEQP-GLES2.functional.shaders.algorithm.hsl_to_rgb_vertex +dEQP-GLES2.functional.shaders.builtin_variable.frontfacing dEQP-GLES2.functional.shaders.functions.array_arguments.global_in_int_vertex dEQP-GLES2.functional.shaders.functions.array_arguments.local_in_int_vertex dEQP-GLES2.functional.shaders.functions.datatypes.int_int_vertex diff --git a/.gitlab-ci/deqp-softpipe-fails.txt b/.gitlab-ci/deqp-softpipe-fails.txt index a0adbc8108d..0f3c7faaddc 100644 --- a/.gitlab-ci/deqp-softpipe-fails.txt +++ b/.gitlab-ci/deqp-softpipe-fails.txt @@ -503,6 +503,7 @@ dEQP-GLES31.functional.image_load_store.early_fragment_tests.early_fragment_test dEQP-GLES31.functional.image_load_store.early_fragment_tests.early_fragment_tests_stencil_fbo dEQP-GLES31.functional.image_load_store.early_fragment_tests.no_early_fragment_tests_depth dEQP-GLES31.functional.image_load_store.early_fragment_tests.no_early_fragment_tests_depth_fbo +dEQP-GLES31.functional.shaders.opaque_type_indexing.sampler.const_expression.geometry.usampler3d dEQP-GLES31.functional.shaders.opaque_type_indexing.ubo.dynamically_uniform_geometry dEQP-GLES31.functional.state_query.integer.max_framebuffer_samples_getfloat dEQP-GLES31.functional.state_query.integer.max_framebuffer_samples_getinteger diff --git a/.gitlab-ci/deqp-softpipe-skips.txt b/.gitlab-ci/deqp-softpipe-skips.txt index 5efd9dc7c0b..61bbda20998 100644 --- a/.gitlab-ci/deqp-softpipe-skips.txt +++ b/.gitlab-ci/deqp-softpipe-skips.txt @@ -11,6 +11,7 @@ dEQP-GLES[0-9]*.functional.flush_finish.* # Random failures dEQP-GLES31.functional.shaders.builtin_functions.*geometry +dEQP-GLES31.functional.geometry_shading.input.basic_primitive.points dEQP-GLES31.functional.fbo.no_attachments.maximums.all dEQP-GLES31.functional.fbo.no_attachments.maximums.size