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

cursor-tracker: Update for Cogl APIs as well

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-01-13 13:55:53 -05:00
parent 7155d7e043
commit 2391606cc5
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/meta-cursor-tracker.c
View File

@ -305,7 +305,6 @@ meta_cursor_reference_from_theme (MetaCursorTracker *tracker,
self->texture = cogl_texture_2d_new_from_data (cogl_context, self->texture = cogl_texture_2d_new_from_data (cogl_context,
width, height, width, height,
cogl_format, cogl_format,
COGL_PIXEL_FORMAT_ANY,
rowstride, rowstride,
(uint8_t*)image->pixels, (uint8_t*)image->pixels,
NULL); NULL);
@ -365,7 +364,7 @@ meta_cursor_reference_from_buffer (MetaCursorTracker *tracker,
ClutterBackend *backend; ClutterBackend *backend;
CoglContext *cogl_context; CoglContext *cogl_context;
MetaCursorReference *self; MetaCursorReference *self;
CoglPixelFormat cogl_format, cogl_internal_format; CoglPixelFormat cogl_format;
struct wl_shm_buffer *shm_buffer; struct wl_shm_buffer *shm_buffer;
uint32_t gbm_format; uint32_t gbm_format;
@ -389,37 +388,31 @@ meta_cursor_reference_from_buffer (MetaCursorTracker *tracker,
#if G_BYTE_ORDER == G_BIG_ENDIAN #if G_BYTE_ORDER == G_BIG_ENDIAN
case WL_SHM_FORMAT_ARGB8888: case WL_SHM_FORMAT_ARGB8888:
cogl_format = COGL_PIXEL_FORMAT_ARGB_8888_PRE; cogl_format = COGL_PIXEL_FORMAT_ARGB_8888_PRE;
cogl_internal_format = COGL_PIXEL_FORMAT_ANY;
gbm_format = GBM_FORMAT_ARGB8888; gbm_format = GBM_FORMAT_ARGB8888;
break; break;
case WL_SHM_FORMAT_XRGB8888: case WL_SHM_FORMAT_XRGB8888:
cogl_format = COGL_PIXEL_FORMAT_ARGB_8888; cogl_format = COGL_PIXEL_FORMAT_ARGB_8888;
cogl_internal_format = COGL_PIXEL_FORMAT_RGB_888;
gbm_format = GBM_FORMAT_XRGB8888; gbm_format = GBM_FORMAT_XRGB8888;
break; break;
#else #else
case WL_SHM_FORMAT_ARGB8888: case WL_SHM_FORMAT_ARGB8888:
cogl_format = COGL_PIXEL_FORMAT_BGRA_8888_PRE; cogl_format = COGL_PIXEL_FORMAT_BGRA_8888_PRE;
cogl_internal_format = COGL_PIXEL_FORMAT_ANY;
gbm_format = GBM_FORMAT_ARGB8888; gbm_format = GBM_FORMAT_ARGB8888;
break; break;
case WL_SHM_FORMAT_XRGB8888: case WL_SHM_FORMAT_XRGB8888:
cogl_format = COGL_PIXEL_FORMAT_BGRA_8888; cogl_format = COGL_PIXEL_FORMAT_BGRA_8888;
cogl_internal_format = COGL_PIXEL_FORMAT_BGR_888;
gbm_format = GBM_FORMAT_XRGB8888; gbm_format = GBM_FORMAT_XRGB8888;
break; break;
#endif #endif
default: default:
g_warn_if_reached (); g_warn_if_reached ();
cogl_format = COGL_PIXEL_FORMAT_ARGB_8888; cogl_format = COGL_PIXEL_FORMAT_ARGB_8888;
cogl_internal_format = COGL_PIXEL_FORMAT_ANY;
gbm_format = GBM_FORMAT_ARGB8888; gbm_format = GBM_FORMAT_ARGB8888;
} }
self->texture = cogl_texture_2d_new_from_data (cogl_context, self->texture = cogl_texture_2d_new_from_data (cogl_context,
width, height, width, height,
cogl_format, cogl_format,
cogl_internal_format,
rowstride, rowstride,
wl_shm_buffer_get_data (shm_buffer), wl_shm_buffer_get_data (shm_buffer),
NULL); NULL);