Skip to content

[Wayland] Switch to stable linux-dmabuf #840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sunderland93 wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −5
Open

[Wayland] Switch to stable linux-dmabuf #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions src/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ if have_wayland
['wlr-layer-shell-unstable-v1', 'private', ],
['idle-inhibit', 'unstable', 'v1', ],
['keyboard-shortcuts-inhibit', 'unstable', 'v1', ],
['linux-dmabuf', 'unstable', 'v1', ],
['linux-dmabuf', 'stable', 'v1', ],
['pointer-constraints', 'unstable', 'v1', ],
['pointer-gestures', 'unstable', 'v1', ],
['pointer-warp-v1', 'private',],
Expand Down Expand Up @@ -864,7 +864,12 @@ if have_wayland
protocol_type = p.get(1)

if protocol_type == 'stable'
output_base = protocol_name
if p.length() == 3
protocol_version = p.get(2)
output_base = '@0@-@1@'.format(protocol_name, protocol_version)
else
output_base = protocol_name
endif
input = join_paths(protocols_dir,
'@0@/@1@/@2@.xml'.format(protocol_type,
protocol_name,
Expand Down
4 changes: 2 additions & 2 deletions src/wayland/meta-wayland-dma-buf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
#include "backends/native/meta-renderer-native.h"
#endif

#include "linux-dmabuf-unstable-v1-server-protocol.h"
#include "linux-dmabuf-v1-server-protocol.h"

#ifndef DRM_FORMAT_MOD_INVALID
#define DRM_FORMAT_MOD_INVALID ((1ULL << 56) - 1)
Expand Down Expand Up @@ -418,7 +418,7 @@ buffer_params_add (struct wl_client *client,
dma_buf->drm_modifier != drm_modifier)
{
wl_resource_post_error (resource,
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INVALID_WL_BUFFER,
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INVALID_FORMAT,
"mismatching modifier between planes");
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/wayland/meta-wayland-versions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
#define META_ZXDG_IMPORTER_V1_VERSION 1
#define META_ZXDG_EXPORTER_V2_VERSION 1
#define META_ZXDG_IMPORTER_V2_VERSION 1
#define META_ZWP_LINUX_DMABUF_V1_VERSION 4
#define META_ZWP_LINUX_DMABUF_V1_VERSION 5
#define META_ZWP_KEYBOARD_SHORTCUTS_INHIBIT_V1_VERSION 1
#define META_ZXDG_OUTPUT_V1_VERSION 3
#define META_ZWP_XWAYLAND_KEYBOARD_GRAB_V1_VERSION 1
Expand Down
Loading