[cogl/halfline/wip/render-node: 3/5] 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: 3/5] kms-winsys: rename device_name to card_device_name
- Date: Thu, 27 Aug 2015 00:34:51 +0000 (UTC)
commit 8e93c8d69cf5c1ebf23a482319f288012d0e2818
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 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 be 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 2c7d448..a4f6ba9 100644
--- a/cogl/winsys/cogl-winsys-egl-kms.c
+++ b/cogl/winsys/cogl-winsys-egl-kms.c
@@ -121,7 +121,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)
@@ -325,13 +325,13 @@ _cogl_winsys_renderer_connect (CoglRenderer *renderer,
}
else
{
- kms_renderer->card_device.fd = open (device_name, O_RDWR);
+ kms_renderer->card_device.fd = open (card_device_name, O_RDWR);
if (kms_renderer->card_device.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]