diff options
author | Benjamin Otte <otte@redhat.com> | 2016-12-21 20:28:21 +0100 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2016-12-23 08:11:01 +0100 |
commit | 2d2209859e0759dfe9ca0fbf284cf2e99381bb97 (patch) | |
tree | 77139dbba8836de62fbc20f5ecedb2a909d09ff3 /gsk | |
parent | 373e08d6d4ea35dbc937a012ef864fd36bb6e42d (diff) | |
download | gtk+-2d2209859e0759dfe9ca0fbf284cf2e99381bb97.tar.gz |
gsk: Rename to gsk_texture_download_surface()
I want to reuse the name gsk_texture_download() for downloading the
actual bytes.
Diffstat (limited to 'gsk')
-rw-r--r-- | gsk/gskgldriver.c | 2 | ||||
-rw-r--r-- | gsk/gskrendernodeimpl.c | 4 | ||||
-rw-r--r-- | gsk/gsktexture.c | 12 | ||||
-rw-r--r-- | gsk/gsktextureprivate.h | 4 | ||||
-rw-r--r-- | gsk/gskvulkanrenderer.c | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/gsk/gskgldriver.c b/gsk/gskgldriver.c index f08b1f925a..ead05347fa 100644 --- a/gsk/gskgldriver.c +++ b/gsk/gskgldriver.c @@ -462,7 +462,7 @@ gsk_gl_driver_get_texture_for_texture (GskGLDriver *driver, if (gsk_texture_set_render_data (texture, driver, t, gsk_gl_driver_release_texture)) t->user = texture; - surface = gsk_texture_download (texture); + surface = gsk_texture_download_surface (texture); gsk_gl_driver_bind_source_texture (driver, t->texture_id); gsk_gl_driver_init_texture_with_surface (driver, t->texture_id, diff --git a/gsk/gskrendernodeimpl.c b/gsk/gskrendernodeimpl.c index 8e428f4aeb..d2f27243d5 100644 --- a/gsk/gskrendernodeimpl.c +++ b/gsk/gskrendernodeimpl.c @@ -601,7 +601,7 @@ gsk_texture_node_draw (GskRenderNode *node, GskTextureNode *self = (GskTextureNode *) node; cairo_surface_t *surface; - surface = gsk_texture_download (self->texture); + surface = gsk_texture_download_surface (self->texture); cairo_save (cr); @@ -627,7 +627,7 @@ gsk_texture_node_serialize (GskRenderNode *node) cairo_surface_t *surface; GVariant *result; - surface = gsk_texture_download (self->texture); + surface = gsk_texture_download_surface (self->texture); g_assert (cairo_image_surface_get_width (surface) * 4 == cairo_image_surface_get_stride (surface)); diff --git a/gsk/gsktexture.c b/gsk/gsktexture.c index ceb36b2e50..aabc805f0d 100644 --- a/gsk/gsktexture.c +++ b/gsk/gsktexture.c @@ -135,7 +135,7 @@ gsk_texture_cairo_finalize (GskTexture *texture) } static cairo_surface_t * -gsk_texture_cairo_download (GskTexture *texture) +gsk_texture_cairo_download_surface (GskTexture *texture) { GskCairoTexture *cairo = (GskCairoTexture *) texture; @@ -146,7 +146,7 @@ static const GskTextureClass GSK_TEXTURE_CLASS_CAIRO = { "cairo", sizeof (GskCairoTexture), gsk_texture_cairo_finalize, - gsk_texture_cairo_download + gsk_texture_cairo_download_surface }; GskTexture * @@ -209,7 +209,7 @@ gsk_texture_pixbuf_finalize (GskTexture *texture) } static cairo_surface_t * -gsk_texture_pixbuf_download (GskTexture *texture) +gsk_texture_pixbuf_download_surface (GskTexture *texture) { GskPixbufTexture *pixbuf = (GskPixbufTexture *) texture; @@ -220,7 +220,7 @@ static const GskTextureClass GSK_TEXTURE_CLASS_PIXBUF = { "pixbuf", sizeof (GskPixbufTexture), gsk_texture_pixbuf_finalize, - gsk_texture_pixbuf_download + gsk_texture_pixbuf_download_surface, }; GskTexture * @@ -276,9 +276,9 @@ gsk_texture_get_height (GskTexture *texture) } cairo_surface_t * -gsk_texture_download (GskTexture *texture) +gsk_texture_download_surface (GskTexture *texture) { - return texture->klass->download (texture); + return texture->klass->download_surface (texture); } gboolean diff --git a/gsk/gsktextureprivate.h b/gsk/gsktextureprivate.h index c8d94b6789..13eba48eae 100644 --- a/gsk/gsktextureprivate.h +++ b/gsk/gsktextureprivate.h @@ -30,14 +30,14 @@ struct _GskTextureClass { gsize size; void (* finalize) (GskTexture *texture); - cairo_surface_t * (* download) (GskTexture *texture); + cairo_surface_t * (* download_surface) (GskTexture *texture); }; gpointer gsk_texture_new (const GskTextureClass *klass, int width, int height); GskTexture * gsk_texture_new_for_surface (cairo_surface_t *surface); -cairo_surface_t * gsk_texture_download (GskTexture *texture); +cairo_surface_t * gsk_texture_download_surface (GskTexture *texture); gboolean gsk_texture_set_render_data (GskTexture *self, gpointer key, diff --git a/gsk/gskvulkanrenderer.c b/gsk/gskvulkanrenderer.c index 3cab29fd4a..bb3d79b48e 100644 --- a/gsk/gskvulkanrenderer.c +++ b/gsk/gskvulkanrenderer.c @@ -281,7 +281,7 @@ gsk_vulkan_renderer_ref_texture_image (GskVulkanRenderer *self, if (data) return g_object_ref (data->image); - surface = gsk_texture_download (texture); + surface = gsk_texture_download_surface (texture); image = gsk_vulkan_image_new_from_data (uploader, cairo_image_surface_get_data (surface), cairo_image_surface_get_width (surface), |