brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move MetaDrmTimeline to src/common

Browse Source 
There's nothing Wayland specific about it.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3876>
This commit is contained in:
Michel Dänzer 2024-06-28 18:40:30 +02:00 committed by Marge Bot
parent 36eee131c2
commit 6d21b5151e
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wayland/meta-drm-timeline.c → src/common/meta-drm-timeline.c
View File

@ -37,8 +37,8 @@
#include <sys/eventfd.h> #include <sys/eventfd.h>
#endif #endif
#include "common/meta-drm-timeline.h"
#include "meta/util.h" #include "meta/util.h"
#include "wayland/meta-drm-timeline.h"
enum enum
{ {

0
src/wayland/meta-drm-timeline.h → src/common/meta-drm-timeline.h
View File

4
src/meson.build
View File

@ -585,8 +585,6 @@ if have_wayland
'core/meta-service-channel.h', 'core/meta-service-channel.h',
'wayland/meta-cursor-sprite-wayland.c', 'wayland/meta-cursor-sprite-wayland.c',
'wayland/meta-cursor-sprite-wayland.h', 'wayland/meta-cursor-sprite-wayland.h',
'wayland/meta-drm-timeline.c',
'wayland/meta-drm-timeline.h',
'wayland/meta-pointer-confinement-wayland.c', 'wayland/meta-pointer-confinement-wayland.c',
'wayland/meta-pointer-confinement-wayland.h', 'wayland/meta-pointer-confinement-wayland.h',
'wayland/meta-pointer-lock-wayland.c', 'wayland/meta-pointer-lock-wayland.c',
@ -894,6 +892,8 @@ if have_wayland or have_native_backend
'common/meta-cogl-drm-formats.h', 'common/meta-cogl-drm-formats.h',
'common/meta-drm-format-helpers.c', 'common/meta-drm-format-helpers.c',
'common/meta-drm-format-helpers.h', 'common/meta-drm-format-helpers.h',
'common/meta-drm-timeline.c',
'common/meta-drm-timeline.h',
] ]
endif endif

2
src/wayland/meta-wayland-buffer.c
View File

@ -58,8 +58,8 @@
#include "wayland/meta-wayland-private.h" #include "wayland/meta-wayland-private.h"
#include "common/meta-cogl-drm-formats.h" #include "common/meta-cogl-drm-formats.h"
#include "common/meta-drm-format-helpers.h" #include "common/meta-drm-format-helpers.h"
#include "common/meta-drm-timeline.h"
#include "compositor/meta-multi-texture-format-private.h" #include "compositor/meta-multi-texture-format-private.h"
#include "wayland/meta-drm-timeline.h"
#include "wayland/meta-wayland-linux-drm-syncobj.h" #include "wayland/meta-wayland-linux-drm-syncobj.h"
#ifdef HAVE_NATIVE_BACKEND #ifdef HAVE_NATIVE_BACKEND

2
src/wayland/meta-wayland-linux-drm-syncobj.h
View File

@ -22,8 +22,8 @@
#include <glib.h> #include <glib.h>
#include "common/meta-drm-timeline.h"
#include "wayland/meta-wayland-types.h" #include "wayland/meta-wayland-types.h"
#include "wayland/meta-drm-timeline.h"
#include "linux-drm-syncobj-v1-server-protocol.h" #include "linux-drm-syncobj-v1-server-protocol.h"