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

Rename files to remove pointless drm prefix

This commit is contained in:
Scott Anderson 2017-09-30 19:03:34 +13:00
parent c8a8ff66f2
commit 610b0493ac
10 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/drm/backend.c
View File

@ -12,7 +12,7 @@
#include <wlr/util/list.h> #include <wlr/util/list.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include <wlr/egl.h> #include <wlr/egl.h>
#include "backend/drm.h" #include "backend/drm/drm.h"
static bool wlr_drm_backend_start(struct wlr_backend *_backend) { static bool wlr_drm_backend_start(struct wlr_backend *_backend) {
struct wlr_drm_backend *backend = (struct wlr_drm_backend *)_backend; struct wlr_drm_backend *backend = (struct wlr_drm_backend *)_backend;

14
backend/drm/drm.c
View File

@ -20,12 +20,12 @@
#include <wlr/render/matrix.h> #include <wlr/render/matrix.h>
#include <wlr/render/gles2.h> #include <wlr/render/gles2.h>
#include <wlr/render.h> #include <wlr/render.h>
#include "backend/drm.h" #include "backend/drm/drm.h"
#include "backend/drm-util.h" #include "backend/drm/util.h"
bool wlr_drm_check_features(struct wlr_drm_backend *backend) { bool wlr_drm_check_features(struct wlr_drm_backend *backend) {
extern const struct wlr_drm_interface legacy_iface; extern const struct wlr_drm_interface iface_legacy;
extern const struct wlr_drm_interface atomic_iface; extern const struct wlr_drm_interface iface_atomic;
if (drmSetClientCap(backend->fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1)) { if (drmSetClientCap(backend->fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1)) {
wlr_log(L_ERROR, "DRM universal planes unsupported"); wlr_log(L_ERROR, "DRM universal planes unsupported");
@ -34,13 +34,13 @@ bool wlr_drm_check_features(struct wlr_drm_backend *backend) {
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");
backend->iface = &legacy_iface; backend->iface = &iface_legacy;
} else if (drmSetClientCap(backend->fd, DRM_CLIENT_CAP_ATOMIC, 1)) { } else if (drmSetClientCap(backend->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");
backend->iface = &legacy_iface; backend->iface = &iface_legacy;
} else { } else {
wlr_log(L_DEBUG, "Using atomic DRM interface"); wlr_log(L_DEBUG, "Using atomic DRM interface");
backend->iface = &atomic_iface; backend->iface = &iface_atomic;
} }
return true; return true;

6
backend/drm/drm-atomic.c → backend/drm/iface_atomic.c
View File

@ -2,8 +2,8 @@
#include <xf86drm.h> #include <xf86drm.h>
#include <xf86drmMode.h> #include <xf86drmMode.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "backend/drm.h" #include "backend/drm/drm.h"
#include "backend/drm-util.h" #include "backend/drm/util.h"
struct atomic { struct atomic {
drmModeAtomicReq *req; drmModeAtomicReq *req;
@ -180,7 +180,7 @@ static bool atomic_crtc_move_cursor(struct wlr_drm_backend *backend,
return atomic_end(backend->fd, &atom); return atomic_end(backend->fd, &atom);
} }
const struct wlr_drm_interface atomic_iface = { const struct wlr_drm_interface iface_atomic = {
.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-legacy.c → backend/drm/iface_legacy.c
View File

@ -2,8 +2,8 @@
#include <xf86drm.h> #include <xf86drm.h>
#include <xf86drmMode.h> #include <xf86drmMode.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "backend/drm.h" #include "backend/drm/drm.h"
#include "backend/drm-util.h" #include "backend/drm/util.h"
static bool legacy_crtc_pageflip(struct wlr_drm_backend *backend, static bool legacy_crtc_pageflip(struct wlr_drm_backend *backend,
struct wlr_drm_output *output, struct wlr_drm_crtc *crtc, struct wlr_drm_output *output, struct wlr_drm_crtc *crtc,
@ -57,7 +57,7 @@ bool legacy_crtc_move_cursor(struct wlr_drm_backend *backend,
return !drmModeMoveCursor(backend->fd, crtc->id, x, y); return !drmModeMoveCursor(backend->fd, crtc->id, x, y);
} }
const struct wlr_drm_interface legacy_iface = { const struct wlr_drm_interface iface_legacy = {
.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,

2
backend/drm/drm-properties.c → backend/drm/properties.c
View File

@ -5,7 +5,7 @@
#include <xf86drm.h> #include <xf86drm.h>
#include <xf86drmMode.h> #include <xf86drmMode.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "backend/drm-properties.h" #include "backend/drm/properties.h"
/* /*
* Creates a mapping between property names and an array index where to store * Creates a mapping between property names and an array index where to store

2
backend/drm/drm-util.c → backend/drm/util.c
View File

@ -3,7 +3,7 @@
#include <drm.h> #include <drm.h>
#include <drm_mode.h> #include <drm_mode.h>
#include <gbm.h> #include <gbm.h>
#include "backend/drm-util.h" #include "backend/drm/util.h"
#include <wlr/util/log.h> #include <wlr/util/log.h>
int32_t calculate_refresh_rate(drmModeModeInfo *mode) { int32_t calculate_refresh_rate(drmModeModeInfo *mode) {

8
backend/meson.build
View File

@ -5,10 +5,10 @@ backend_files = files(
'session/session.c', 'session/session.c',
'drm/backend.c', 'drm/backend.c',
'drm/drm.c', 'drm/drm.c',
'drm/drm-atomic.c', 'drm/iface_atomic.c',
'drm/drm-legacy.c', 'drm/iface_legacy.c',
'drm/drm-properties.c', 'drm/properties.c',
'drm/drm-util.c', 'drm/util.c',
'libinput/backend.c', 'libinput/backend.c',
'libinput/events.c', 'libinput/events.c',
'libinput/keyboard.c', 'libinput/keyboard.c',

6
include/backend/drm.h → include/backend/drm/drm.h
View File

@ -1,5 +1,5 @@
#ifndef BACKEND_DRM_H #ifndef BACKEND_DRM_DRM_H
#define BACKEND_DRM_H #define BACKEND_DRM_DRM_H
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h> #include <stddef.h>
@ -15,7 +15,7 @@
#include <wlr/egl.h> #include <wlr/egl.h>
#include <wlr/util/list.h> #include <wlr/util/list.h>
#include "drm-properties.h" #include "properties.h"
struct wlr_drm_plane { struct wlr_drm_plane {
uint32_t type; uint32_t type;

0
include/backend/drm-properties.h → include/backend/drm/properties.h
View File

0
include/backend/drm-util.h → include/backend/drm/util.h
View File