Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions cogl/cogl-config.h.meson
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@
/* Have GLES 2.0 for rendering */
#mesondefine HAVE_COGL_GLES2

/* Building with Sysprof profiling suport */

Check failure on line 7 in cogl/cogl-config.h.meson

View workflow job for this annotation

GitHub Actions / build / build (mint22, linuxmintd/mint22-amd64, Mint 22, true) / Mint 22

suport ==> support
#mesondefine HAVE_TRACING

/* Enable unit tests */
#mesondefine ENABLE_UNIT_TESTS

/* Default COGL driver */
#mesondefine COGL_DEFAULT_DRIVER

#define COGL_CONFIG_H_INCLUDED 1
26 changes: 0 additions & 26 deletions cogl/cogl/cogl-renderer.c
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,6 @@ foreach_driver_description (CoglDriver driver_override,
CoglDriverCallback callback,
void *user_data)
{
#ifdef COGL_DEFAULT_DRIVER
const CoglDriverDescription *default_driver = NULL;
#endif
int i;

if (driver_override != COGL_DRIVER_ANY)
Expand All @@ -294,31 +291,8 @@ foreach_driver_description (CoglDriver driver_override,
return;
}

#ifdef COGL_DEFAULT_DRIVER
for (i = 0; i < G_N_ELEMENTS (_cogl_drivers); i++)
{
const CoglDriverDescription *desc = &_cogl_drivers[i];
if (g_ascii_strcasecmp (desc->name, COGL_DEFAULT_DRIVER) == 0)
{
default_driver = desc;
break;
}
}

if (default_driver)
{
if (!callback (default_driver, user_data))
return;
}
#endif

for (i = 0; i < G_N_ELEMENTS (_cogl_drivers); i++)
{
#ifdef COGL_DEFAULT_DRIVER
if (&_cogl_drivers[i] == default_driver)
continue;
#endif

if (!callback (&_cogl_drivers[i], user_data))
return;
}
Expand Down
4 changes: 0 additions & 4 deletions cogl/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ cdata.set('HAVE_COGL_GLES2', have_gles2)
cdata.set('HAVE_TRACING', have_profiler)
cdata.set('ENABLE_UNIT_TESTS', have_cogl_tests)

if default_driver != 'auto'
cdata.set_quoted('COGL_DEFAULT_DRIVER', default_driver)
endif

cogl_config_h = configure_file(
input: 'cogl-config.h.meson',
output: 'cogl-config.h',
Expand Down
11 changes: 1 addition & 10 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,7 @@ CONFFLAGS += \
-Dcore_tests=false \
-Dlibwacom=false \
-Dwayland=false \
-Dnative_backend=false \
-Ddefault_driver=gl
endif

ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf))
CONFFLAGS += \
-Ddefault_driver=gles2
else
CONFFLAGS += \
-Ddefault_driver=gl
-Dnative_backend=false
endif

override_dh_auto_configure:
Expand Down
3 changes: 0 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,6 @@ if have_wayland_eglstream
endif
endif

default_driver = get_option('default_driver')

have_sm = get_option('sm')
if have_sm
sm_dep = dependency('sm')
Expand Down Expand Up @@ -491,7 +489,6 @@ output = [
' Wayland EGLStream................ ' + have_wayland_eglstream.to_string(),
' Native Backend................... ' + have_native_backend.to_string(),
' EGL Device....................... ' + have_egl_device.to_string(),
' Default driver................... ' + default_driver,
' Remote desktop................... ' + have_remote_desktop.to_string(),
' gudev............................ ' + have_libgudev.to_string(),
' Wacom............................ ' + have_libwacom.to_string(),
Expand Down
6 changes: 0 additions & 6 deletions meson_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,6 @@
description: 'Enable verbose logging ability'
)

option('default_driver',
type: 'combo',
choices: ['auto', 'gl', 'gl3', 'gles2', 'nop'],
value: 'auto'
)

option('xwayland_path',
type: 'string',
value: '',
Expand All @@ -156,7 +150,7 @@
option('xwayland_grab_default_access_rules',
type: 'string',
value: 'gnome-boxes,remote-viewer,virt-viewer,virt-manager,vinagre,vncviewer,Xephyr',
description: 'Comma delimited list of applications ressources or class allowed to issue X11 grabs in Xwayland'

Check failure on line 153 in meson_options.txt

View workflow job for this annotation

GitHub Actions / build / build (mint22, linuxmintd/mint22-amd64, Mint 22, true) / Mint 22

ressources ==> resources
)

option('xwayland_initfd',
Expand Down
Loading