Revert "build: add test-gl-renderer option"

This reverts commit 1618697dc3.

The original commit was a workaround for
https://gitlab.freedesktop.org/mesa/mesa/-/issues/2219 which was fixed
in Mesa:
- c7617d8908a970124321ce731b43d5996c3c5775 released as 20.1.0-rc1
- a0e6341fe4417e41cda0b19e4fa7f8bbe4e1dba1 released as 19.3.5
- f27e5d9df5bc9c85d45c2cb1f2a4997b453365fe released as 20.0.0

This workaround should not be necessary anymore, we don't use it in our
CI, and it was manual to begin with. Therefore remove it.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
dev
Pekka Paalanen 2 years ago committed by Pekka Paalanen
parent 8508f93f2b
commit fb7b1a4125
  1. 2
      meson.build
  2. 6
      meson_options.txt
  3. 7
      tests/weston-test-fixture-compositor.c

@ -121,8 +121,6 @@ config_h.set_quoted('LIBEXECDIR', dir_libexec)
config_h.set_quoted('MODULEDIR', dir_module_weston)
config_h.set_quoted('LIBWESTON_MODULEDIR', dir_module_libweston)
config_h.set10('TEST_GL_RENDERER', get_option('test-gl-renderer'))
backend_default = get_option('backend-default')
if backend_default == 'auto'
foreach b : [ 'headless', 'x11', 'wayland', 'drm' ]

@ -210,12 +210,6 @@ option(
value: false,
description: 'Tests: consider skip to be a failure'
)
option(
'test-gl-renderer',
type: 'boolean',
value: true,
description: 'Tests: allow running with GL-renderer'
)
option(
'doc',
type: 'boolean',

@ -329,13 +329,6 @@ execute_compositor(const struct compositor_setup *setup,
}
#endif
#if !TEST_GL_RENDERER
if (setup->renderer == RENDERER_GL) {
fprintf(stderr, "GL-renderer disabled for tests, skipping.\n");
return RESULT_SKIP;
}
#endif
prog_args_init(&args);
/* argv[0] */

Loading…
Cancel
Save