ci: Reshuffle test setups

Add a wayland_gl setup that explicitly uses desktop GL, and rename
wayland_gles to wayland_gles2 (since that is what it does).

In ci, make the fedora-x86_64 runner run tests with wayland_gl
and wayland_gles2, and make the fedora-release runner run test
with wayland and x11.

.gitlab-ci.yml

@@ -66,7 +66,7 @@ style-check-diff:
       junit:
         - "${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_gles2.xml"
         - "${CI_PROJECT_DIR}/_build/report-broadway.xml"
     name: "gtk-${CI_COMMIT_REF_NAME}"
     paths:
@@ -103,8 +103,8 @@ fedora-x86_64:
             ${FEATURE_FLAGS}
             _build
     - meson compile -C _build
-    - .gitlab-ci/run-tests.sh _build wayland
-    - .gitlab-ci/run-tests.sh _build wayland_gles
+    - .gitlab-ci/run-tests.sh _build wayland_gl
+    - .gitlab-ci/run-tests.sh _build wayland_gles2
 
 release-build:
   extends: .build-fedora-default
@@ -129,6 +129,7 @@ release-build:
     - meson install -C _build
     - PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello
     - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
+    - .gitlab-ci/run-tests.sh _build wayland
     - .gitlab-ci/run-tests.sh _build x11
 
 fedora-clang:
@@ -424,7 +425,7 @@ asan-build:
             _build
     - ninja -C _build
     - .gitlab-ci/run-tests.sh _build wayland
-    - .gitlab-ci/run-tests.sh _build wayland_gles
+    - .gitlab-ci/run-tests.sh _build wayland_gles2
     - .gitlab-ci/run-tests.sh _build x11
   artifacts:
     when: always

testsuite/gsk/meson.build

@@ -159,7 +159,7 @@ foreach renderer : renderers
     endif
 
     if compare_xfails_small_texture.contains(testname)
-      suites += 'wayland_gles_failing'
+      suites += 'wayland_gles2_failing'
     endif
 
     test_env = [

testsuite/meson.build

@@ -16,12 +16,16 @@ exclude_unstable = ['flaky', 'failing']
 setups = [
   { 'backend': 'x11', 'if': x11_enabled, },
   { 'backend': 'wayland', 'if': wayland_enabled, 'is_default': true, },
-  { 'name': 'wayland_gles',
+  { 'name': 'wayland_gles2',
     'backend': 'wayland', 'if': wayland_enabled,
-    'env': ['GDK_DEBUG=gl-gles,default-settings',
+    'env': ['GDK_DEBUG=default-settings',
             'MESA_GLES_VERSION_OVERRIDE=2.0',
             'GSK_MAX_TEXTURE_SIZE=1024',
            ], },
+  { 'name': 'wayland_gl',
+    'backend': 'wayland', 'if': wayland_enabled,
+    'env': ['GDK_DEBUG=gl-prefer-gl,default-settings',
+           ], },
   { 'backend': 'win32', 'if': os_win32 },
   { 'backend': 'broadway', 'if': broadway_enabled, },
   { 'backend': 'win32', 'if': os_win32 },
@@ -37,8 +41,9 @@ foreach setup : setups
       exclude += 'gsk-compare-broadway'
     endif
 
-    if name == 'wayland_gles'
-      exclude += 'wayland_gles_failing'
+    if name == 'wayland_gles2'
+      # exclude tests that are failing with the small texture size in this setup
+      exclude += 'wayland_gles2_failing'
     endif
 
     env = common_env + [