diff options
| author | Ray Strode <rstrode@redhat.com> | 2015-08-26 11:30:04 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2015-08-27 14:49:10 -0400 |
| commit | 268e4305489a67fa39d1abbaebb0477453784732 (patch) | |
| tree | 9594f98fbd31e1e408e616fd0d4acb5219ad451f | |
| parent | 07aa682054373478404077d4c035b702b272a222 (diff) | |
| download | cogl-268e4305489a67fa39d1abbaebb0477453784732.tar.gz | |
kms-winsys: rename device_name to card_device_name
The variable device_name is currently used to hold
the name of the drm device to open ("/dev/dri/card0").
We're going to be opening other drm devices in the future
(render nodes), so device_name will become ambiguous.
This commit renames it to card_device_name
https://bugzilla.gnome.org/show_bug.cgi?id=753531
| -rw-r--r-- | cogl/winsys/cogl-winsys-egl-kms.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c index ada3c973..5be832de 100644 --- a/cogl/winsys/cogl-winsys-egl-kms.c +++ b/cogl/winsys/cogl-winsys-egl-kms.c @@ -116,7 +116,7 @@ typedef struct _CoglOnscreenKMS struct gbm_surface *pending_surface; } CoglOnscreenKMS; -static const char device_name[] = "/dev/dri/card0"; +static const char card_device_name[] = "/dev/dri/card0"; static void _cogl_winsys_renderer_disconnect (CoglRenderer *renderer) @@ -320,14 +320,14 @@ _cogl_winsys_renderer_connect (CoglRenderer *renderer, } else { - kms_renderer->opened_fd = open (device_name, O_RDWR); + kms_renderer->opened_fd = open (card_device_name, O_RDWR); kms_renderer->fd = kms_renderer->opened_fd; if (kms_renderer->fd < 0) { /* Probably permissions error */ _cogl_set_error (error, COGL_WINSYS_ERROR, COGL_WINSYS_ERROR_INIT, - "Couldn't open %s", device_name); + "Couldn't open %s", card_device_name); return FALSE; } } |