blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change iface prefix to suffix

This commit is contained in:
Scott Anderson 2017-10-02 21:44:33 +13:00
parent f6f9c40965
commit f193623ca1
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/drm/iface_atomic.c → backend/drm/atomic.c
View File

@ -181,7 +181,7 @@ static bool atomic_crtc_move_cursor(struct wlr_drm_backend *drm,
return atomic_end(drm->fd, &atom); return atomic_end(drm->fd, &atom);
} }
const struct wlr_drm_interface iface_atomic = { const struct wlr_drm_interface atomic_iface = {
.conn_enable = atomic_conn_enable, .conn_enable = atomic_conn_enable,
.crtc_pageflip = atomic_crtc_pageflip, .crtc_pageflip = atomic_crtc_pageflip,
.crtc_set_cursor = atomic_crtc_set_cursor, .crtc_set_cursor = atomic_crtc_set_cursor,

6
backend/drm/drm.c
View File

@ -32,13 +32,13 @@ bool wlr_drm_check_features(struct wlr_drm_backend *drm) {
if (getenv("WLR_DRM_NO_ATOMIC")) { if (getenv("WLR_DRM_NO_ATOMIC")) {
wlr_log(L_DEBUG, "WLR_DRM_NO_ATOMIC set, forcing legacy DRM interface"); wlr_log(L_DEBUG, "WLR_DRM_NO_ATOMIC set, forcing legacy DRM interface");
drm->iface = &iface_legacy; drm->iface = &legacy_iface;
} else if (drmSetClientCap(drm->fd, DRM_CLIENT_CAP_ATOMIC, 1)) { } else if (drmSetClientCap(drm->fd, DRM_CLIENT_CAP_ATOMIC, 1)) {
wlr_log(L_DEBUG, "Atomic modesetting unsupported, using legacy DRM interface"); wlr_log(L_DEBUG, "Atomic modesetting unsupported, using legacy DRM interface");
drm->iface = &iface_legacy; drm->iface = &legacy_iface;
} else { } else {
wlr_log(L_DEBUG, "Using atomic DRM interface"); wlr_log(L_DEBUG, "Using atomic DRM interface");
drm->iface = &iface_atomic; drm->iface = &atomic_iface;
} }
return true; return true;

2
backend/drm/iface_legacy.c → backend/drm/legacy.c
View File

@ -58,7 +58,7 @@ bool legacy_crtc_move_cursor(struct wlr_drm_backend *drm,
return !drmModeMoveCursor(drm->fd, crtc->id, x, y); return !drmModeMoveCursor(drm->fd, crtc->id, x, y);
} }
const struct wlr_drm_interface iface_legacy = { const struct wlr_drm_interface legacy_iface = {
.conn_enable = legacy_conn_enable, .conn_enable = legacy_conn_enable,
.crtc_pageflip = legacy_crtc_pageflip, .crtc_pageflip = legacy_crtc_pageflip,
.crtc_set_cursor = legacy_crtc_set_cursor, .crtc_set_cursor = legacy_crtc_set_cursor,

4
backend/meson.build
View File

@ -3,10 +3,10 @@ backend_files = files(
'session/direct-ipc.c', 'session/direct-ipc.c',
'session/direct.c', 'session/direct.c',
'session/session.c', 'session/session.c',
'drm/atomic.c',
'drm/backend.c', 'drm/backend.c',
'drm/drm.c', 'drm/drm.c',
'drm/iface_atomic.c', 'drm/legacy.c',
'drm/iface_legacy.c',
'drm/properties.c', 'drm/properties.c',
'drm/renderer.c', 'drm/renderer.c',
'drm/util.c', 'drm/util.c',

4
include/backend/drm/iface.h
View File

@ -29,7 +29,7 @@ struct wlr_drm_interface {
struct wlr_drm_crtc *crtc, int x, int y); struct wlr_drm_crtc *crtc, int x, int y);
}; };
extern const struct wlr_drm_interface iface_atomic; extern const struct wlr_drm_interface atomic_iface;
extern const struct wlr_drm_interface iface_legacy; extern const struct wlr_drm_interface legacy_iface;
#endif #endif