fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-02 04:58:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend-drm: rename "virtual" to work with C++ compilers

Browse source 
"virtual" is a keyword in C++ so any C++ code including drm-internal.h
fails to compile.

Signed-off-by: Ray Smith <rsmith@brightsign.biz>
This commit is contained in:
Ray Smith 2024-07-22 15:12:15 +01:00 • committed by Marius Vlad
parent 7b1520c4d9
commit ee5b6bcc30
6 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libweston/backend-drm/drm-internal.h
View file

@ -581,7 +581,7 @@ struct drm_output {
struct wl_event_source *pageflip_timer;
bool virtual;
bool is_virtual;
void (*virtual_destroy)(struct weston_output *base);
submit_frame_cb virtual_submit_frame;

10
libweston/backend-drm/drm-virtual.c
View file

@ -211,7 +211,7 @@ drm_virtual_output_repaint(struct weston_output *output_base)
struct drm_pending_state *pending_state;
struct drm_device *device;
assert(output->virtual);
assert(output->is_virtual);
device = output->device;
pending_state = device->repaint_data;
@ -267,7 +267,7 @@ drm_virtual_output_destroy(struct weston_output *base)
{
struct drm_output *output = to_drm_output(base);
assert(output->virtual);
assert(output->is_virtual);
if (output->base.enabled)
drm_virtual_output_deinit(&output->base);
@ -289,7 +289,7 @@ drm_virtual_output_enable(struct weston_output *output_base)
struct drm_device *device = output->device;
struct drm_backend *b = device->backend;
assert(output->virtual);
assert(output->is_virtual);
if (output_base->compositor->renderer->type == WESTON_RENDERER_PIXMAN) {
weston_log("Not support pixman renderer on Virtual output\n");
@ -335,7 +335,7 @@ drm_virtual_output_disable(struct weston_output *base)
{
struct drm_output *output = to_drm_output(base);
assert(output->virtual);
assert(output->is_virtual);
if (output->base.enabled)
drm_virtual_output_deinit(&output->base);
@ -363,7 +363,7 @@ drm_virtual_output_create(struct weston_compositor *c, char *name,
return NULL;
}
output->virtual = true;
output->is_virtual = true;
output->virtual_destroy = destroy_func;
output->gbm_bo_flags = GBM_BO_USE_LINEAR | GBM_BO_USE_RENDERING;

12
libweston/backend-drm/drm.c
View file

@ -198,7 +198,7 @@ drm_plane_is_available(struct drm_plane *plane, struct drm_output *output)
{
assert(plane->state_cur);
if (output->virtual)
if (output->is_virtual)
return false;
/* The plane still has a request not yet completed by the kernel. */
@ -701,7 +701,7 @@ drm_output_repaint(struct weston_output *output_base)
struct drm_device *device;
assert(output);
assert(!output->virtual);
assert(!output->is_virtual);
device = output->device;
pending_state = device->repaint_data;
@ -1480,7 +1480,7 @@ drm_set_dpms(struct weston_output *output_base, enum dpms_enum level)
int ret;
assert(output);
assert(!output->virtual);
assert(!output->is_virtual);
if (output->state_cur->dpms == level)
return;
@ -2288,7 +2288,7 @@ drm_output_enable(struct weston_output *base)
int ret;
assert(output);
assert(!output->virtual);
assert(!output->is_virtual);
/* TODO: drop this hack when we rework the output configuration API. For
* now we need this because the frontend may call
@ -2406,7 +2406,7 @@ drm_output_destroy(struct weston_output *base)
struct drm_device *device = output->device;
assert(output);
assert(!output->virtual);
assert(!output->is_virtual);
if (output->page_flip_pending || output->atomic_complete_pending) {
if (!base->compositor->shutting_down) {
@ -2452,7 +2452,7 @@ drm_output_disable(struct weston_output *base)
struct drm_output *output = to_drm_output(base);
assert(output);
assert(!output->virtual);
assert(!output->is_virtual);
if (output->page_flip_pending || output->atomic_complete_pending) {
output->disable_pending = true;

6
libweston/backend-drm/kms.c
View file

@ -1388,7 +1388,7 @@ drm_pending_state_clear_tearing(struct drm_pending_state *pending_state)
struct drm_output_state *output_state;
wl_list_for_each(output_state, &pending_state->output_list, link) {
if (output_state->output->virtual)
if (output_state->output->is_virtual)
continue;
output_state->tear = false;
}
@ -1514,7 +1514,7 @@ drm_pending_state_apply_atomic(struct drm_pending_state *pending_state,
}
wl_list_for_each(output_state, &pending_state->output_list, link) {
if (output_state->output->virtual)
if (output_state->output->is_virtual)
continue;
if (mode == DRM_STATE_APPLY_SYNC)
assert(output_state->dpms == WESTON_DPMS_OFF);
@ -1648,7 +1648,7 @@ drm_pending_state_apply(struct drm_pending_state *pending_state)
struct drm_output *output = output_state->output;
int ret;
if (output->virtual) {
if (output->is_virtual) {
drm_output_assign_state(output_state,
DRM_STATE_APPLY_ASYNC);
continue;

2
libweston/backend-drm/modes.c
View file

@ -809,7 +809,7 @@ drm_output_set_mode(struct weston_output *base,
struct drm_mode *current;
if (output->virtual)
if (output->is_virtual)
return -1;
if (drm_output_update_modelist_from_heads(output) < 0)

2
libweston/backend-drm/state-propose.c
View file

@ -980,7 +980,7 @@ drm_assign_planes(struct weston_output *output_base)
drm_debug(b, "\t[repaint] preparing state for output %s (%lu)\n",
output_base->name, (unsigned long) output_base->id);
if (!device->sprites_are_broken && !output->virtual && b->gbm) {
if (!device->sprites_are_broken && !output->is_virtual && b->gbm) {
drm_debug(b, "\t[repaint] trying planes-only build state\n");
state = drm_output_propose_state(output_base, pending_state, mode);
if (!state) {