From 116bd1848e9db6286c7410ea105ac2e80d13e30a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Ondra=C4=8Dka?= Date: Tue, 29 Jul 2025 15:49:04 +0200 Subject: [PATCH] r300/ci: remove emulated swtcl testing Part-of: --- .../drivers/r300/ci/deqp-r300-rv380.toml | 18 ------ .../drivers/r300/ci/r300-rv380-fails.txt | 64 ------------------- .../drivers/r300/ci/r300-rv380-skips.txt | 4 -- 3 files changed, 86 deletions(-) diff --git a/src/gallium/drivers/r300/ci/deqp-r300-rv380.toml b/src/gallium/drivers/r300/ci/deqp-r300-rv380.toml index 45e27d9eda5..ee81a85ef56 100644 --- a/src/gallium/drivers/r300/ci/deqp-r300-rv380.toml +++ b/src/gallium/drivers/r300/ci/deqp-r300-rv380.toml @@ -1,5 +1,3 @@ -# swtcl tests come first, since otherwise there are some flakes, -# see https://gitlab.freedesktop.org/mesa/mesa/-/issues/12765 [[deqp]] deqp = "/deqp-gles/modules/gles2/deqp-gles2" caselists = ["/deqp-gles/mustpass/gles2-main.txt"] @@ -13,22 +11,6 @@ deqp_args = [ version_check = "GL ES 2.0.*git" renderer_check = "RV370" extensions_check = "/install/r300-rv380-gles2-extensions.txt" -prefix = "swtcl-" -[deqp.env] -RADEON_DEBUG = "notcl" - -[[deqp]] -deqp = "/deqp-gles/modules/gles2/deqp-gles2" -caselists = ["/deqp-gles/mustpass/gles2-main.txt"] -deqp_args = [ - "--deqp-surface-width=256", - "--deqp-surface-height=256", - "--deqp-surface-type=pbuffer", - "--deqp-gl-config-name=rgba8888d24s8ms0", - "--deqp-visibility=hidden" -] -version_check = "GL ES 2.0.*git" -renderer_check = "RV370" [[deqp]] deqp = "/deqp-gles/external/openglcts/modules/glcts" diff --git a/src/gallium/drivers/r300/ci/r300-rv380-fails.txt b/src/gallium/drivers/r300/ci/r300-rv380-fails.txt index 152c913b08d..deca18b9d9f 100644 --- a/src/gallium/drivers/r300/ci/r300-rv380-fails.txt +++ b/src/gallium/drivers/r300/ci/r300-rv380-fails.txt @@ -497,67 +497,3 @@ KHR-GLES2.texture_3d.filtering.sizes.63x63x63_linear_mipmap_nearest,Fail KHR-GLES2.texture_3d.filtering.sizes.63x63x63_nearest,Fail KHR-GLES2.texture_3d.filtering.sizes.63x63x63_nearest_mipmap_linear,Fail KHR-GLES2.texture_3d.filtering.sizes.63x63x63_nearest_mipmap_nearest,Fail - -# swtcl specific failures, lot of those (for example all the draw ones are not reproducible locally) -swtcl-dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_center,Fail -swtcl-dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_corner,Fail -swtcl-dEQP-GLES2.functional.clipping.point.point_clip_viewport_center,Fail -swtcl-dEQP-GLES2.functional.clipping.point.point_clip_viewport_corner,Fail -swtcl-dEQP-GLES2.functional.clipping.point.point_z_clip,Fail -swtcl-dEQP-GLES2.functional.clipping.point.point_z_clip_viewport_center,Fail -swtcl-dEQP-GLES2.functional.clipping.point.point_z_clip_viewport_corner,Fail -swtcl-dEQP-GLES2.functional.clipping.point.wide_point_clip,Fail -swtcl-dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_center,Fail -swtcl-dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_corner,Fail -swtcl-dEQP-GLES2.functional.clipping.point.wide_point_z_clip,Fail -swtcl-dEQP-GLES2.functional.clipping.point.wide_point_z_clip_viewport_center,Fail -swtcl-dEQP-GLES2.functional.clipping.point.wide_point_z_clip_viewport_corner,Fail -swtcl-dEQP-GLES2.functional.draw.draw_arrays.points.default_attribute,Fail -swtcl-dEQP-GLES2.functional.draw.draw_arrays.points.multiple_attributes,Fail -swtcl-dEQP-GLES2.functional.draw.draw_arrays.points.single_attribute,Fail -swtcl-dEQP-GLES2.functional.draw.draw_elements.points.default_attribute,Fail -swtcl-dEQP-GLES2.functional.draw.draw_elements.points.multiple_attributes,Fail -swtcl-dEQP-GLES2.functional.draw.draw_elements.points.single_attribute,Fail -swtcl-dEQP-GLES2.functional.draw.random.12,Fail -swtcl-dEQP-GLES2.functional.draw.random.25,Fail -swtcl-dEQP-GLES2.functional.draw.random.31,Fail -swtcl-dEQP-GLES2.functional.draw.random.32,Fail -swtcl-dEQP-GLES2.functional.draw.random.36,Fail -swtcl-dEQP-GLES2.functional.draw.random.46,Fail -swtcl-dEQP-GLES2.functional.draw.random.50,Fail -swtcl-dEQP-GLES2.functional.draw.random.51,Fail -swtcl-dEQP-GLES2.functional.draw.random.65,Fail -swtcl-dEQP-GLES2.functional.draw.random.69,Fail -swtcl-dEQP-GLES2.functional.draw.random.70,Fail -swtcl-dEQP-GLES2.functional.draw.random.71,Fail -swtcl-dEQP-GLES2.functional.draw.random.8,Fail -swtcl-dEQP-GLES2.functional.fbo.render.repeated_clear.tex2d_rgb,Fail -swtcl-dEQP-GLES2.functional.fbo.render.repeated_clear.tex2d_rgba,Fail -swtcl-dEQP-GLES2.functional.polygon_offset.fixed16_displacement_with_units,Fail -swtcl-dEQP-GLES2.functional.polygon_offset.fixed16_render_with_units,Fail -swtcl-dEQP-GLES2.functional.rasterization.primitives.line_loop_wide,Fail -swtcl-dEQP-GLES2.functional.rasterization.primitives.line_strip_wide,Fail -swtcl-dEQP-GLES2.functional.rasterization.primitives.points,Fail -swtcl-dEQP-GLES2.functional.shaders.builtin_variable.frontfacing,Fail -swtcl-dEQP-GLES2.functional.shaders.builtin_variable.pointcoord,Fail -swtcl-dEQP-GLES2.functional.uniform_api.random.81,Fail -swtcl-dEQP-GLES2.functional.uniform_api.info_query.array_in_struct.mat4_mat2_both,Fail -swtcl-dEQP-GLES2.functional.uniform_api.info_query.multiple_nested_structs_arrays.both,Fail -swtcl-dEQP-GLES2.functional.uniform_api.info_query.nested_structs_arrays.mat4_mat2_both,Fail -swtcl-dEQP-GLES2.functional.uniform_api.info_query.struct_in_array.mat4_mat2_both,Fail -swtcl-dEQP-GLES2.functional.uniform_api.random.13,Fail -swtcl-dEQP-GLES2.functional.uniform_api.random.20,Fail -swtcl-dEQP-GLES2.functional.uniform_api.random.23,Fail -swtcl-dEQP-GLES2.functional.uniform_api.random.27,Fail -swtcl-dEQP-GLES2.functional.uniform_api.value.assigned.basic_array_assign_full.array_in_struct.mat4_mat2_both,Fail -swtcl-dEQP-GLES2.functional.uniform_api.value.assigned.basic_array_assign_partial.array_in_struct.mat4_mat2_both,Fail -swtcl-dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.get_uniform.array_in_struct.mat4_mat2_both,Fail -swtcl-dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.get_uniform.multiple_nested_structs_arrays.both,Fail -swtcl-dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.get_uniform.nested_structs_arrays.mat4_mat2_both,Fail -swtcl-dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.get_uniform.struct_in_array.mat4_mat2_both,Fail -swtcl-dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.render.array_in_struct.mat4_mat2_both,Fail -swtcl-dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.render.multiple_nested_structs_arrays.both,Fail -swtcl-dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.render.nested_structs_arrays.mat4_mat2_both,Fail -swtcl-dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.render.struct_in_array.mat4_mat2_both,Fail -swtcl-dEQP-GLES2.functional.uniform_api.value.assigned.by_value.render.multiple_nested_structs_arrays.both,Fail -swtcl-dEQP-GLES2.functional.uniform_api.value.assigned.by_value.get_uniform.multiple_nested_structs_arrays.both,Fail diff --git a/src/gallium/drivers/r300/ci/r300-rv380-skips.txt b/src/gallium/drivers/r300/ci/r300-rv380-skips.txt index 925e9a99230..d513eb32560 100644 --- a/src/gallium/drivers/r300/ci/r300-rv380-skips.txt +++ b/src/gallium/drivers/r300/ci/r300-rv380-skips.txt @@ -1,7 +1,3 @@ # Timeouts KHR-GLES2.texture_3d.filtering.combinations.*linear_mipmap_linear KHR-GLES2.texture_3d.filtering.sizes.*linear_mipmap_linear - -# swtcl should test just the draw paths, fragment shaders and texturing are tested in normal run -swtcl.*fragment.* -swtcl.*texture.*