diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2023-05-04 21:12:40 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2023-05-04 21:12:40 +0000 |
| commit | d82f603fcbe97b25cb174a908de93321002059be (patch) | |
| tree | 681178d3a971762f070b92b91ad01b260779f700 | |
| parent | 81db6e9e617cb63b07149ae1bd5d0ad237df12bc (diff) | |
| parent | 5e8e4130a51f8d1f599ee74360c5e9126ff40d48 (diff) | |
| download | gtk+-d82f603fcbe97b25cb174a908de93321002059be.tar.gz | |
Merge branch 'smalltexture-plus-gles' into 'main'
Merge wayland_smalltexture and wayland_gles
See merge request GNOME/gtk!5917
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | testsuite/gsk/meson.build | 5 | ||||
| -rw-r--r-- | testsuite/meson.build | 8 |
3 files changed, 6 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b152073e0b..657ddd4fca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,7 +59,6 @@ style-check-diff: - "${CI_PROJECT_DIR}/_build/report-x11.xml" - "${CI_PROJECT_DIR}/_build/report-wayland.xml" - "${CI_PROJECT_DIR}/_build/report-wayland_gles.xml" - - "${CI_PROJECT_DIR}/_build/report-wayland_smalltexture.xml" - "${CI_PROJECT_DIR}/_build/report-broadway.xml" name: "gtk-${CI_COMMIT_REF_NAME}" paths: @@ -103,7 +102,6 @@ fedora-x86_64: - .gitlab-ci/run-tests.sh _build x11 - .gitlab-ci/run-tests.sh _build wayland - .gitlab-ci/run-tests.sh _build wayland_gles - - .gitlab-ci/run-tests.sh _build wayland_smalltexture - .gitlab-ci/run-tests.sh _build broadway release-build: diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build index 7e738cd097..bdc6ecf623 100644 --- a/testsuite/gsk/meson.build +++ b/testsuite/gsk/meson.build @@ -114,7 +114,8 @@ compare_xfails = [ compare_xfails_small_texture = [ 'big-checkerboard', - 'big-checkerboard-scaled-down' + 'big-checkerboard-scaled-down', + 'big-checkerboard-scaled-down2' ] foreach renderer : renderers @@ -135,7 +136,7 @@ foreach renderer : renderers endif if compare_xfails_small_texture.contains(testname) - suites += 'wayland_smalltexture_failing' + suites += 'wayland_gles_failing' endif if ((exclude_term == '' or not testname.contains(exclude_term)) and diff --git a/testsuite/meson.build b/testsuite/meson.build index 43d6cfcf1a..b300823339 100644 --- a/testsuite/meson.build +++ b/testsuite/meson.build @@ -20,12 +20,10 @@ setups = [ 'env': ['GDK_DEBUG=gl-gles,default-settings', 'MESA_GLES_VERSION_OVERRIDE=2.0', 'MESA_EXTENSION_OVERRIDE=-GL_OES_vertex_array_object', + 'GSK_MAX_TEXTURE_SIZE=1024', ], }, { 'backend': 'win32', 'if': os_win32 }, { 'backend': 'broadway', 'if': broadway_enabled, }, - { 'name': 'wayland_smalltexture', - 'backend': 'wayland', 'if': wayland_enabled, - 'env': ['GSK_MAX_TEXTURE_SIZE=1024'] }, { 'backend': 'win32', 'if': os_win32 }, ] @@ -39,8 +37,8 @@ foreach setup : setups exclude += 'gsk-compare-broadway' endif - if name == 'wayland_smalltexture' - exclude += 'wayland_smalltexture_failing' + if name == 'wayland_gles' + exclude += 'wayland_gles_failing' endif env = common_env + [ |