diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2017-10-20 08:52:02 +0200 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2017-10-20 13:54:01 +0200 |
| commit | 243bd4f0c818715387155ea3d579c17dd93d6da6 (patch) | |
| tree | 11f0c328f7d6f61ae4b94920210d20bae72dbd60 /gsk/gskvulkanrenderpass.c | |
| parent | eee89587c3afe0c8c240e2bf26cad4719c6bf39a (diff) | |
| download | gtk+-243bd4f0c818715387155ea3d579c17dd93d6da6.tar.gz | |
gsk: Tweak cairo node apis
Rename the surface getter to peek, following other render
node getters, and make the surface-based constructor private,
since it is not something we want to encourage.
Update all callers.
Diffstat (limited to 'gsk/gskvulkanrenderpass.c')
| -rw-r--r-- | gsk/gskvulkanrenderpass.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gsk/gskvulkanrenderpass.c b/gsk/gskvulkanrenderpass.c index 3a1a23cdeb..83d9e2edd2 100644 --- a/gsk/gskvulkanrenderpass.c +++ b/gsk/gskvulkanrenderpass.c @@ -353,7 +353,7 @@ gsk_vulkan_render_pass_add_node (GskVulkanRenderPass *self, return; case GSK_CAIRO_NODE: - if (gsk_cairo_node_get_surface (node) == NULL) + if (gsk_cairo_node_peek_surface (node) == NULL) return; if (gsk_vulkan_clip_contains_rect (&constants->clip, &node->bounds)) pipeline_type = GSK_VULKAN_PIPELINE_TEXTURE; @@ -691,7 +691,7 @@ gsk_vulkan_render_pass_get_node_as_texture (GskVulkanRenderPass *self, case GSK_CAIRO_NODE: if (graphene_rect_equal (bounds, &node->bounds)) { - surface = cairo_surface_reference (gsk_cairo_node_get_surface (node)); + surface = cairo_surface_reference ((cairo_surface_t *)gsk_cairo_node_peek_surface (node)); goto got_surface; } break; @@ -910,7 +910,7 @@ gsk_vulkan_render_pass_upload (GskVulkanRenderPass *self, { cairo_surface_t *surface; - surface = gsk_cairo_node_get_surface (op->render.node); + surface = gsk_cairo_node_peek_surface (op->render.node); op->render.source = gsk_vulkan_image_new_from_data (uploader, cairo_image_surface_get_data (surface), cairo_image_surface_get_width (surface), |