[mutter/wayland] cursor: Do less work if we don't have a connection to GBM at all
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wayland] cursor: Do less work if we don't have a connection to GBM at all
- Date: Mon, 31 Mar 2014 23:16:52 +0000 (UTC)
commit f6a73bcf22b4132d107cf52393820d3ee48935d3
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Mon Mar 31 17:59:14 2014 -0400
cursor: Do less work if we don't have a connection to GBM at all
src/core/meta-cursor.c | 52 ++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 25 deletions(-)
---
diff --git a/src/core/meta-cursor.c b/src/core/meta-cursor.c
index a9bce19..2a78328 100644
--- a/src/core/meta-cursor.c
+++ b/src/core/meta-cursor.c
@@ -315,36 +315,38 @@ meta_cursor_image_load_from_buffer (MetaCursorTracker *tracker,
shm_buffer = wl_shm_buffer_get (buffer);
if (shm_buffer)
{
- int rowstride = wl_shm_buffer_get_stride (shm_buffer);
-
- switch (wl_shm_buffer_get_format (shm_buffer))
+ if (tracker->gbm)
{
+ int rowstride = wl_shm_buffer_get_stride (shm_buffer);
+
+ switch (wl_shm_buffer_get_format (shm_buffer))
+ {
#if G_BYTE_ORDER == G_BIG_ENDIAN
- case WL_SHM_FORMAT_ARGB8888:
- gbm_format = GBM_FORMAT_ARGB8888;
- break;
- case WL_SHM_FORMAT_XRGB8888:
- gbm_format = GBM_FORMAT_XRGB8888;
- break;
+ case WL_SHM_FORMAT_ARGB8888:
+ gbm_format = GBM_FORMAT_ARGB8888;
+ break;
+ case WL_SHM_FORMAT_XRGB8888:
+ gbm_format = GBM_FORMAT_XRGB8888;
+ break;
#else
- case WL_SHM_FORMAT_ARGB8888:
- gbm_format = GBM_FORMAT_ARGB8888;
- break;
- case WL_SHM_FORMAT_XRGB8888:
- gbm_format = GBM_FORMAT_XRGB8888;
- break;
+ case WL_SHM_FORMAT_ARGB8888:
+ gbm_format = GBM_FORMAT_ARGB8888;
+ break;
+ case WL_SHM_FORMAT_XRGB8888:
+ gbm_format = GBM_FORMAT_XRGB8888;
+ break;
#endif
- default:
- g_warn_if_reached ();
- gbm_format = GBM_FORMAT_ARGB8888;
+ default:
+ g_warn_if_reached ();
+ gbm_format = GBM_FORMAT_ARGB8888;
+ }
+
+ meta_cursor_image_load_gbm_buffer (tracker->gbm,
+ image,
+ (uint8_t *) wl_shm_buffer_get_data (shm_buffer),
+ width, height, rowstride,
+ gbm_format);
}
-
- if (tracker->gbm)
- meta_cursor_image_load_gbm_buffer (tracker->gbm,
- image,
- (uint8_t *) wl_shm_buffer_get_data (shm_buffer),
- width, height, rowstride,
- gbm_format);
}
else
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]