isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

screen-cast-src: Change offscreen cursor helper to take a uint8_t *

Browse Source 
Instead of a `uint32_t *`. Eventually we shouldn't assume pixels are
always 32 bit, and this gets rid of some casts while at it.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/413
This commit is contained in:
Jonas Ådahl 2019-01-24 18:36:34 +01:00
parent 9be189daa7
commit 176b508029
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/backends/meta-screen-cast-stream-src.c
View File

@ -165,7 +165,7 @@ draw_cursor_sprite_via_offscreen (MetaScreenCastStreamSrc *src,
CoglTexture *cursor_texture, CoglTexture *cursor_texture,
int bitmap_width, int bitmap_width,
int bitmap_height, int bitmap_height,
uint32_t *bitmap_data, uint8_t *bitmap_data,
GError **error) GError **error)
{ {
MetaScreenCastStream *stream = meta_screen_cast_stream_src_get_stream (src); MetaScreenCastStream *stream = meta_screen_cast_stream_src_get_stream (src);
@ -216,7 +216,7 @@ draw_cursor_sprite_via_offscreen (MetaScreenCastStreamSrc *src,
0, 0, 0, 0,
bitmap_width, bitmap_height, bitmap_width, bitmap_height,
COGL_PIXEL_FORMAT_RGBA_8888_PRE, COGL_PIXEL_FORMAT_RGBA_8888_PRE,
(uint8_t *) bitmap_data); bitmap_data);
cogl_object_unref (fb); cogl_object_unref (fb);
return TRUE; return TRUE;
@ -288,7 +288,7 @@ meta_screen_cast_stream_src_set_cursor_sprite_metadata (MetaScreenCastStreamSrc
int hotspot_x, hotspot_y; int hotspot_x, hotspot_y;
int texture_width, texture_height; int texture_width, texture_height;
int bitmap_width, bitmap_height; int bitmap_width, bitmap_height;
uint32_t *bitmap_data; uint8_t *bitmap_data;
cursor_texture = meta_cursor_sprite_get_cogl_texture (cursor_sprite); cursor_texture = meta_cursor_sprite_get_cogl_texture (cursor_sprite);
if (!cursor_texture) if (!cursor_texture)
@ -326,7 +326,7 @@ meta_screen_cast_stream_src_set_cursor_sprite_metadata (MetaScreenCastStreamSrc
bitmap_data = SPA_MEMBER (spa_meta_bitmap, bitmap_data = SPA_MEMBER (spa_meta_bitmap,
spa_meta_bitmap->offset, spa_meta_bitmap->offset,
uint32_t); uint8_t);
if (texture_width == bitmap_width && if (texture_width == bitmap_width &&
texture_height == bitmap_height) texture_height == bitmap_height)
@ -334,7 +334,7 @@ meta_screen_cast_stream_src_set_cursor_sprite_metadata (MetaScreenCastStreamSrc
cogl_texture_get_data (cursor_texture, cogl_texture_get_data (cursor_texture,
COGL_PIXEL_FORMAT_RGBA_8888_PRE, COGL_PIXEL_FORMAT_RGBA_8888_PRE,
texture_width * 4, texture_width * 4,
(uint8_t *) bitmap_data); bitmap_data);
} }
else else
{ {