mirror of
https://gitlab.freedesktop.org/wayland/weston
synced 2024-07-03 08:19:17 +00:00
Compare commits
4 Commits
7c0ae37453
...
4d4f54f78e
Author | SHA1 | Date | |
---|---|---|---|
|
4d4f54f78e | ||
|
de669aeb60 | ||
|
f843ba34d1 | ||
|
f2d2313693 |
|
@ -55,6 +55,7 @@ script_data.set('DOCTREES_DIR', meson.current_build_dir() + '/doctrees')
|
||||||
|
|
||||||
script_data.set('DOXYGEN_CONF', meson.current_build_dir() + '/doxygen.ini')
|
script_data.set('DOXYGEN_CONF', meson.current_build_dir() + '/doxygen.ini')
|
||||||
script_data.set('DOXYGEN_CMD', doxygen.full_path())
|
script_data.set('DOXYGEN_CMD', doxygen.full_path())
|
||||||
|
script_data.set('MESON_WERROR', get_option('werror') == true ? 'YES' : 'NO')
|
||||||
script_data.set('SPHINX_CMD', sphinx.full_path())
|
script_data.set('SPHINX_CMD', sphinx.full_path())
|
||||||
script_doxy_sphinx = configure_file(
|
script_doxy_sphinx = configure_file(
|
||||||
input: 'run_doxygen_sphinx.sh.in',
|
input: 'run_doxygen_sphinx.sh.in',
|
||||||
|
|
|
@ -1,2 +1,9 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
@DOXYGEN_CMD@ @DOXYGEN_CONF@ && @SPHINX_CMD@ -E -W -q -j auto -d @DOCTREES_DIR@ @SRCDIR@ @OUTDIR@
|
|
||||||
|
if [ "@MESON_WERROR@" = "YES" ]; then
|
||||||
|
SPHINX_WERROR="-W"
|
||||||
|
else
|
||||||
|
SPHINX_WERROR=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
@DOXYGEN_CMD@ @DOXYGEN_CONF@ && @SPHINX_CMD@ $SPHINX_WERROR -E -q -j auto -d @DOCTREES_DIR@ @SRCDIR@ @OUTDIR@
|
||||||
|
|
|
@ -946,7 +946,7 @@ drm_repaint_flush_device(struct drm_device *device)
|
||||||
{
|
{
|
||||||
struct drm_backend *b = device->backend;
|
struct drm_backend *b = device->backend;
|
||||||
struct drm_pending_state *pending_state;
|
struct drm_pending_state *pending_state;
|
||||||
struct weston_output *base;
|
struct drm_output_state *output_state;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
pending_state = device->repaint_data;
|
pending_state = device->repaint_data;
|
||||||
|
@ -964,15 +964,13 @@ drm_repaint_flush_device(struct drm_device *device)
|
||||||
if (ret == 0)
|
if (ret == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
wl_list_for_each(base, &b->compositor->output_list, link) {
|
wl_list_for_each(output_state, &pending_state->output_list, link) {
|
||||||
struct drm_output *tmp = to_drm_output(base);
|
struct drm_output *tmp = output_state->output;
|
||||||
if (!tmp || tmp->device != device)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (ret == -EBUSY)
|
if (ret == -EBUSY)
|
||||||
weston_output_schedule_repaint_restart(base);
|
weston_output_schedule_repaint_restart(&tmp->base);
|
||||||
else
|
else
|
||||||
weston_output_schedule_repaint_reset(base);
|
weston_output_schedule_repaint_reset(&tmp->base);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1064,6 +1064,12 @@ bind_linux_dmabuf(struct wl_client *client,
|
||||||
wl_array_for_each(fmt, &supported_formats->arr) {
|
wl_array_for_each(fmt, &supported_formats->arr) {
|
||||||
modifiers = weston_drm_format_get_modifiers(fmt, &num_modifiers);
|
modifiers = weston_drm_format_get_modifiers(fmt, &num_modifiers);
|
||||||
for (i = 0; i < num_modifiers; i++) {
|
for (i = 0; i < num_modifiers; i++) {
|
||||||
|
if (modifiers[i] == DRM_FORMAT_MOD_LINEAR ||
|
||||||
|
modifiers[i] == DRM_FORMAT_MOD_INVALID) {
|
||||||
|
zwp_linux_dmabuf_v1_send_format(resource,
|
||||||
|
fmt->format);
|
||||||
|
}
|
||||||
|
|
||||||
if (version >= ZWP_LINUX_DMABUF_V1_MODIFIER_SINCE_VERSION) {
|
if (version >= ZWP_LINUX_DMABUF_V1_MODIFIER_SINCE_VERSION) {
|
||||||
uint32_t modifier_lo = modifiers[i] & 0xFFFFFFFF;
|
uint32_t modifier_lo = modifiers[i] & 0xFFFFFFFF;
|
||||||
uint32_t modifier_hi = modifiers[i] >> 32;
|
uint32_t modifier_hi = modifiers[i] >> 32;
|
||||||
|
@ -1071,10 +1077,6 @@ bind_linux_dmabuf(struct wl_client *client,
|
||||||
fmt->format,
|
fmt->format,
|
||||||
modifier_hi,
|
modifier_hi,
|
||||||
modifier_lo);
|
modifier_lo);
|
||||||
} else if (modifiers[i] == DRM_FORMAT_MOD_LINEAR ||
|
|
||||||
modifiers[i] == DRM_FORMAT_MOD_INVALID) {
|
|
||||||
zwp_linux_dmabuf_v1_send_format(resource,
|
|
||||||
fmt->format);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user