Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gsk: Rename to gsk_texture_download_surface()

Browse Source 
I want to reuse the name gsk_texture_download() for downloading the
actual bytes.
This commit is contained in:
Benjamin Otte
2016-12-21 20:28:21 +01:00
parent 67d0fd06b8
commit 2345ffe0e4
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gsk/gskgldriver.c
View File

@@ -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,

4
gsk/gskrendernodeimpl.c
View File

@@ -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));

12
gsk/gsktexture.c
View File

@@ -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

4
gsk/gsktextureprivate.h
View File

@@ -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,

2
gsk/gskvulkanrenderer.c
View File

@@ -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),