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

Tweak transform node apis

Browse Source 
Rename the getter to follow the peek naming scheme.

Update all callers.
This commit is contained in:
Matthias Clasen
2017-10-20 09:31:14 +02:00
parent 04f6b26205
commit b76c5abb57
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gsk/gskglrenderer.c
View File

@@ -907,7 +907,7 @@ gsk_gl_renderer_add_render_item (GskGLRenderer *self,
{
graphene_matrix_t transform, transformed_mv;
gsk_transform_node_get_transform (node, &transform);
graphene_matrix_init_from_matrix (&transform, gsk_transform_node_peek_transform (node));
graphene_matrix_multiply (&transform, modelview, &transformed_mv);
gsk_gl_renderer_add_render_item (self,
projection, &transformed_mv,

4
gsk/gskrendernode.h
View File

@@ -203,8 +203,8 @@ GskRenderNode * gsk_transform_node_new (GskRenderNode
GDK_AVAILABLE_IN_3_90
GskRenderNode * gsk_transform_node_get_child (GskRenderNode *node);
GDK_AVAILABLE_IN_3_94
void gsk_transform_node_get_transform (GskRenderNode *node,
graphene_matrix_t *transform);
const graphene_matrix_t *
gsk_transform_node_peek_transform (GskRenderNode *node);
GDK_AVAILABLE_IN_3_90
GskRenderNode * gsk_opacity_node_new (GskRenderNode *child,

9
gsk/gskrendernodeimpl.c
View File

@@ -2326,15 +2326,14 @@ gsk_transform_node_get_child (GskRenderNode *node)
return self->child;
}
void
gsk_transform_node_get_transform (GskRenderNode *node,
graphene_matrix_t *transform)
const graphene_matrix_t *
gsk_transform_node_peek_transform (GskRenderNode *node)
{
GskTransformNode *self = (GskTransformNode *) node;
g_return_if_fail (GSK_IS_RENDER_NODE_TYPE (node, GSK_TRANSFORM_NODE));
g_return_val_if_fail (GSK_IS_RENDER_NODE_TYPE (node, GSK_TRANSFORM_NODE), NULL);
graphene_matrix_init_from_matrix (transform, &self->transform);
return &self->transform;
}
/*** GSK_OPACITY_NODE ***/

9
gsk/gskvulkanrenderpass.c
View File

@@ -555,8 +555,7 @@ gsk_vulkan_render_pass_add_node (GskVulkanRenderPass *self,
case GSK_TRANSFORM_NODE:
{
graphene_matrix_t transform;
graphene_matrix_t mv;
graphene_matrix_t transform, mv;
GskRenderNode *child;
#if 0
@@ -564,8 +563,8 @@ gsk_vulkan_render_pass_add_node (GskVulkanRenderPass *self,
FALLBACK ("Transform nodes can't deal with clip type %u\n", clip->type);
#endif
gsk_transform_node_get_transform (node, &transform);
mv = self->mv;
graphene_matrix_init_from_matrix (&transform, gsk_transform_node_peek_transform (node));
graphene_matrix_init_from_matrix (&mv, &self->mv);
graphene_matrix_multiply (&transform, &mv, &self->mv);
child = gsk_transform_node_get_child (node);
if (!gsk_vulkan_push_constants_transform (&op.constants.constants, constants, &transform, &child->bounds))
@@ -575,7 +574,7 @@ gsk_vulkan_render_pass_add_node (GskVulkanRenderPass *self,
gsk_vulkan_render_pass_add_node (self, render, &op.constants.constants, child);
gsk_vulkan_push_constants_init_copy (&op.constants.constants, constants);
self->mv = mv;
graphene_matrix_init_from_matrix (&self->mv, &mv);
g_array_append_val (self->render_ops, op);
}
return;