From 868406197582da862e5a0e788fc49be8373dd12d Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 25 Aug 2020 13:43:27 -0700 Subject: [PATCH] ci: Test the KHR-GL* CTS cases with softpipe. I've been hacking on softpipe in the process of trying to delete a bunch of core Mesa code, and want to make sure I don't regress desktop GL either. The run takes under a minute and a half. Reviewed-by: Alyssa Rosenzweig Reviewed-by: Tomeu Vizoso Part-of: --- .gitlab-ci.yml | 9 +++++++++ .gitlab-ci/deqp-softpipe-fails.txt | 31 ++++++++++++++++++++++++++++++ .gitlab-ci/deqp-softpipe-skips.txt | 3 +++ 3 files changed, 43 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2765f3972d2..47ca4bb20c2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -961,6 +961,15 @@ softpipe-gles31: DEQP_VER: gles31 extends: softpipe-gles2 +# Note that KHR-GL3* test sets include all tests from the previous +# version, so we only need to run one test list (unlike dEQP-GLES, +# where the test sets are separate). +softpipe-gl: + variables: + DEQP_VER: gl33 + extends: + - softpipe-gles2 + virgl-gles2-on-gl: variables: DEQP_VER: gles2 diff --git a/.gitlab-ci/deqp-softpipe-fails.txt b/.gitlab-ci/deqp-softpipe-fails.txt index 5bb7f297722..b3e044962aa 100644 --- a/.gitlab-ci/deqp-softpipe-fails.txt +++ b/.gitlab-ci/deqp-softpipe-fails.txt @@ -841,3 +841,34 @@ dEQP-GLES31.functional.texture.multisample.samples_1.sample_mask_and_sample_cove dEQP-GLES31.functional.texture.multisample.samples_1.sample_mask_and_sample_coverage_and_alpha_to_coverage dEQP-GLES31.functional.texture.multisample.samples_1.sample_mask_non_effective_bits dEQP-GLES31.functional.texture.multisample.samples_1.sample_mask_only +KHR-GL33.CommonBugs.CommonBug_ParenthesisInLayoutQualifierIntegerValue +KHR-GL33.clip_distance.functional +KHR-GL33.cull_distance.functional +KHR-GL33.pipeline_statistics_query_tests_ARB.functional_compute_shader_invocations +KHR-GL33.pipeline_statistics_query_tests_ARB.functional_default_qo_values +KHR-GL33.pipeline_statistics_query_tests_ARB.functional_fragment_shader_invocations +KHR-GL33.pipeline_statistics_query_tests_ARB.functional_geometry_shader_queries +KHR-GL33.pipeline_statistics_query_tests_ARB.functional_non_rendering_commands_do_not_affect_queries +KHR-GL33.pipeline_statistics_query_tests_ARB.functional_primitives_vertices_submitted_and_clipping_input_output_primitives +KHR-GL33.pipeline_statistics_query_tests_ARB.functional_vertex_shader_invocations +KHR-GL33.texture_size_promotion.functional +KHR-GL33.transform_feedback.api_errors_test +KHR-GL33.transform_feedback.capture_geometry_interleaved_test +KHR-GL33.transform_feedback.capture_geometry_separate_test +KHR-GL33.transform_feedback.capture_vertex_interleaved_test +KHR-GL33.transform_feedback.capture_vertex_separate_test +KHR-GL33.transform_feedback.discard_geometry_test +KHR-GL33.transform_feedback.discard_vertex_test +KHR-GL33.transform_feedback.draw_xfb_instanced_test +KHR-GL33.transform_feedback.draw_xfb_stream_instanced_test +KHR-GL33.transform_feedback.draw_xfb_stream_test +KHR-GL33.transform_feedback.query_geometry_interleaved_test +KHR-GL33.transform_feedback.query_geometry_separate_test +KHR-GL33.transform_feedback.query_vertex_interleaved_test +KHR-GL33.transform_feedback.query_vertex_separate_test +KHR-GL33.transform_feedback_overflow_query_ARB.advanced-single-stream-interleaved-attribs +KHR-GL33.transform_feedback_overflow_query_ARB.advanced-single-stream-separate-attribs +KHR-GL33.transform_feedback_overflow_query_ARB.basic-single-stream-interleaved-attribs +KHR-GL33.transform_feedback_overflow_query_ARB.basic-single-stream-separate-attribs +KHR-GL33.transform_feedback_overflow_query_ARB.multiple-streams-multiple-buffers-per-stream +KHR-GL33.transform_feedback_overflow_query_ARB.multiple-streams-one-buffer-per-stream diff --git a/.gitlab-ci/deqp-softpipe-skips.txt b/.gitlab-ci/deqp-softpipe-skips.txt index daab5af5f88..6d8414e6bc7 100644 --- a/.gitlab-ci/deqp-softpipe-skips.txt +++ b/.gitlab-ci/deqp-softpipe-skips.txt @@ -18,3 +18,6 @@ dEQP-GLES31.functional.shaders.builtin_functions.*geometry dEQP-GLES31.functional.shaders.linkage.es31.geometry.varying.types.uvec4 dEQP-GLES31.functional.shaders.opaque_type_indexing.sampler.const_expression.geometry.usampler3d dEQP-GLES31.functional.shaders.opaque_type_indexing.sampler.dynamically_uniform.geometry.sampler2darray + +# This one is really slow and can time out (~56 seconds locally) +KHR-GL33.texture_swizzle.smoke -- 2.30.2