brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cursor: Retrieve the GBM device from the MetaBackend

Browse Source 
Not the MetaCursorTracker.
This commit is contained in:
Jasper St. Pierre 2014-04-22 15:23:45 -04:00
parent 91784d87b6
commit d27e267382
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backends/meta-cursor-tracker-private.h
View File

@ -85,6 +85,4 @@ void meta_cursor_tracker_update_position (MetaCursorTracker *tracker,
void meta_cursor_tracker_force_update (MetaCursorTracker *tracker); void meta_cursor_tracker_force_update (MetaCursorTracker *tracker);
struct gbm_device * meta_cursor_tracker_get_gbm_device (MetaCursorTracker *tracker);
#endif #endif

6
src/backends/meta-cursor-tracker.c
View File

@ -488,9 +488,3 @@ meta_cursor_tracker_force_update (MetaCursorTracker *tracker)
meta_cursor_renderer_force_update (tracker->renderer); meta_cursor_renderer_force_update (tracker->renderer);
} }
struct gbm_device *
meta_cursor_tracker_get_gbm_device (MetaCursorTracker *tracker)
{
return meta_cursor_renderer_get_gbm_device (tracker->renderer);
}

19
src/backends/meta-cursor.c
View File

@ -27,6 +27,7 @@
#include "display-private.h" #include "display-private.h"
#include "screen-private.h" #include "screen-private.h"
#include "meta-backend.h"
#include "meta-cursor-tracker-private.h" #include "meta-cursor-tracker-private.h"
#include <string.h> #include <string.h>
@ -175,6 +176,14 @@ meta_cursor_image_load_gbm_buffer (struct gbm_device *gbm,
meta_warning ("HW cursor for format %d not supported\n", gbm_format); meta_warning ("HW cursor for format %d not supported\n", gbm_format);
} }
static struct gbm_device *
get_gbm_device (void)
{
MetaBackend *meta_backend = meta_get_backend ();
MetaCursorRenderer *renderer = meta_backend_get_cursor_renderer (meta_backend);
return meta_cursor_renderer_get_gbm_device (renderer);
}
static void static void
meta_cursor_image_load_from_xcursor_image (MetaCursorTracker *tracker, meta_cursor_image_load_from_xcursor_image (MetaCursorTracker *tracker,
MetaCursorImage *image, MetaCursorImage *image,
@ -210,7 +219,7 @@ meta_cursor_image_load_from_xcursor_image (MetaCursorTracker *tracker,
(uint8_t *) xc_image->pixels, (uint8_t *) xc_image->pixels,
NULL); NULL);
gbm = meta_cursor_tracker_get_gbm_device (tracker); gbm = get_gbm_device ();
if (gbm) if (gbm)
meta_cursor_image_load_gbm_buffer (gbm, meta_cursor_image_load_gbm_buffer (gbm,
image, image,
@ -239,18 +248,18 @@ meta_cursor_reference_from_theme (MetaCursorTracker *tracker,
} }
static void static void
meta_cursor_image_load_from_buffer (MetaCursorTracker *tracker, meta_cursor_image_load_from_buffer (MetaCursorImage *image,
MetaCursorImage *image,
struct wl_resource *buffer, struct wl_resource *buffer,
int hot_x, int hot_x,
int hot_y) int hot_y)
{ {
struct gbm_device *gbm = get_gbm_device ();
ClutterBackend *backend; ClutterBackend *backend;
CoglContext *cogl_context; CoglContext *cogl_context;
struct wl_shm_buffer *shm_buffer; struct wl_shm_buffer *shm_buffer;
uint32_t gbm_format; uint32_t gbm_format;
int width, height; int width, height;
struct gbm_device *gbm = meta_cursor_tracker_get_gbm_device (tracker);
image->hot_x = hot_x; image->hot_x = hot_x;
image->hot_y = hot_y; image->hot_y = hot_y;
@ -333,7 +342,7 @@ meta_cursor_reference_from_buffer (MetaCursorTracker *tracker,
self = g_slice_new0 (MetaCursorReference); self = g_slice_new0 (MetaCursorReference);
self->ref_count = 1; self->ref_count = 1;
meta_cursor_image_load_from_buffer (tracker, &self->image, buffer, hot_x, hot_y); meta_cursor_image_load_from_buffer (&self->image, buffer, hot_x, hot_y);
return self; return self;
} }