[cogl/halfline/wip/render-node: 4/6] kms-winsys: rename device_name to card_device_name
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/halfline/wip/render-node: 4/6] kms-winsys: rename device_name to card_device_name
- Date: Thu, 27 Aug 2015 18:25:03 +0000 (UTC)
commit 653906b5202df112d11f881b466ee36380b3f9f2
Author: Ray Strode <rstrode redhat com>
Date: Wed Aug 26 11:30:04 2015 -0400
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
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 ada3c97..5be832d 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;
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]