nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-25 08:32:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux-dmabuf-v1: switch to stable

Browse Source 
The protocol is no longer unstable.
This commit is contained in:
Simon Ser 2023-11-26 14:37:39 +01:00
parent ba3c1ae065
commit 6991f03767
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/wayland/backend.c
View File

@ -21,7 +21,7 @@
#include "render/pixel_format.h" #include "render/pixel_format.h"
#include "drm-client-protocol.h" #include "drm-client-protocol.h"
#include "linux-dmabuf-unstable-v1-client-protocol.h" #include "linux-dmabuf-v1-client-protocol.h"
#include "pointer-gestures-unstable-v1-client-protocol.h" #include "pointer-gestures-unstable-v1-client-protocol.h"
#include "presentation-time-client-protocol.h" #include "presentation-time-client-protocol.h"
#include "xdg-activation-v1-client-protocol.h" #include "xdg-activation-v1-client-protocol.h"

2
backend/wayland/meson.build
View File

@ -14,7 +14,7 @@ wlr_files += files(
client_protos = [ client_protos = [
'drm', 'drm',
'linux-dmabuf-unstable-v1', 'linux-dmabuf-v1',
'pointer-gestures-unstable-v1', 'pointer-gestures-unstable-v1',
'presentation-time', 'presentation-time',
'relative-pointer-unstable-v1', 'relative-pointer-unstable-v1',

2
backend/wayland/output.c
View File

@ -20,7 +20,7 @@
#include "render/wlr_renderer.h" #include "render/wlr_renderer.h"
#include "types/wlr_output.h" #include "types/wlr_output.h"
#include "linux-dmabuf-unstable-v1-client-protocol.h" #include "linux-dmabuf-v1-client-protocol.h"
#include "presentation-time-client-protocol.h" #include "presentation-time-client-protocol.h"
#include "viewporter-client-protocol.h" #include "viewporter-client-protocol.h"
#include "xdg-activation-v1-client-protocol.h" #include "xdg-activation-v1-client-protocol.h"

4
include/wlr/types/wlr_linux_dmabuf_v1.h
View File

@ -67,7 +67,7 @@ struct wlr_linux_dmabuf_v1 {
}; };
/** /**
* Create the linux-dmabuf-unstable-v1 global. * Create the linux-dmabuf-v1 global.
* *
* Compositors using struct wlr_renderer should use * Compositors using struct wlr_renderer should use
* wlr_linux_dmabuf_v1_create_with_renderer() instead. * wlr_linux_dmabuf_v1_create_with_renderer() instead.
@ -76,7 +76,7 @@ struct wlr_linux_dmabuf_v1 *wlr_linux_dmabuf_v1_create(struct wl_display *displa
uint32_t version, const struct wlr_linux_dmabuf_feedback_v1 *default_feedback); uint32_t version, const struct wlr_linux_dmabuf_feedback_v1 *default_feedback);
/** /**
* Create the linux-dmabuf-unstable-v1 global. * Create the linux-dmabuf-v1 global.
* *
* The default DMA-BUF feedback is initialized from the struct wlr_renderer. * The default DMA-BUF feedback is initialized from the struct wlr_renderer.
*/ */

4
protocol/meson.build
View File

@ -1,5 +1,5 @@
wayland_protos = dependency('wayland-protocols', wayland_protos = dependency('wayland-protocols',
version: '>=1.32', version: '>=1.33',
fallback: 'wayland-protocols', fallback: 'wayland-protocols',
default_options: ['tests=false'], default_options: ['tests=false'],
) )
@ -13,6 +13,7 @@ wayland_scanner = find_program(
protocols = { protocols = {
# Stable upstream protocols # Stable upstream protocols
'linux-dmabuf-v1': wl_protocol_dir / 'stable/linux-dmabuf/linux-dmabuf-v1.xml',
'presentation-time': wl_protocol_dir / 'stable/presentation-time/presentation-time.xml', 'presentation-time': wl_protocol_dir / 'stable/presentation-time/presentation-time.xml',
'viewporter': wl_protocol_dir / 'stable/viewporter/viewporter.xml', 'viewporter': wl_protocol_dir / 'stable/viewporter/viewporter.xml',
'xdg-shell': wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml', 'xdg-shell': wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml',
@ -34,7 +35,6 @@ protocols = {
'fullscreen-shell-unstable-v1': wl_protocol_dir / 'unstable/fullscreen-shell/fullscreen-shell-unstable-v1.xml', 'fullscreen-shell-unstable-v1': wl_protocol_dir / 'unstable/fullscreen-shell/fullscreen-shell-unstable-v1.xml',
'idle-inhibit-unstable-v1': wl_protocol_dir / 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml', 'idle-inhibit-unstable-v1': wl_protocol_dir / 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml',
'keyboard-shortcuts-inhibit-unstable-v1': wl_protocol_dir / 'unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml', 'keyboard-shortcuts-inhibit-unstable-v1': wl_protocol_dir / 'unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml',
'linux-dmabuf-unstable-v1': wl_protocol_dir / 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml',
'pointer-constraints-unstable-v1': wl_protocol_dir / 'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml', 'pointer-constraints-unstable-v1': wl_protocol_dir / 'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml',
'pointer-gestures-unstable-v1': wl_protocol_dir / 'unstable/pointer-gestures/pointer-gestures-unstable-v1.xml', 'pointer-gestures-unstable-v1': wl_protocol_dir / 'unstable/pointer-gestures/pointer-gestures-unstable-v1.xml',
'primary-selection-unstable-v1': wl_protocol_dir / 'unstable/primary-selection/primary-selection-unstable-v1.xml', 'primary-selection-unstable-v1': wl_protocol_dir / 'unstable/primary-selection/primary-selection-unstable-v1.xml',

2
types/wlr_linux_dmabuf_v1.c
View File

@ -14,7 +14,7 @@
#include <wlr/types/wlr_output_layer.h> #include <wlr/types/wlr_output_layer.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include <xf86drm.h> #include <xf86drm.h>
#include "linux-dmabuf-unstable-v1-protocol.h" #include "linux-dmabuf-v1-protocol.h"
#include "render/drm_format_set.h" #include "render/drm_format_set.h"
#include "util/shm.h" #include "util/shm.h"