AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-12 21:40:19 +00:00
Code Issues Projects Releases Wiki Activity

vulkan: Stop keeping the context around

Browse Source 
These days, we can query it with gsk_vulkan_render_get_context().

Makes quite a few functions require one less argument.
And it also makes the GskVulkanRenderPass empty. Gotta figure out what
to do with it.
This commit is contained in:
Benjamin Otte 2023-07-19 00:00:34 +02:00
parent 67a3929583
commit 492507af11
7 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gsk/vulkan/gskvulkanrender.c
View File

@ -496,7 +496,6 @@ gsk_vulkan_render_add_node (GskVulkanRender *self,
graphene_vec2_init (&scale, self->scale, self->scale); graphene_vec2_init (&scale, self->scale, self->scale);
gsk_vulkan_render_pass_op (self, gsk_vulkan_render_pass_op (self,
self->vulkan,
g_object_ref (self->target), g_object_ref (self->target),
self->clip, self->clip,
&scale, &scale,

17
gsk/vulkan/gskvulkanrenderpass.c
View File

@ -42,7 +42,7 @@ typedef struct _GskVulkanParseState GskVulkanParseState;
struct _GskVulkanRenderPass struct _GskVulkanRenderPass
{ {
GdkVulkanContext *vulkan; int empty;
}; };
struct _GskVulkanParseState struct _GskVulkanParseState
@ -56,12 +56,11 @@ struct _GskVulkanParseState
}; };
GskVulkanRenderPass * GskVulkanRenderPass *
gsk_vulkan_render_pass_new (GdkVulkanContext *context) gsk_vulkan_render_pass_new (void)
{ {
GskVulkanRenderPass *self; GskVulkanRenderPass *self;
self = g_new0 (GskVulkanRenderPass, 1); self = g_new0 (GskVulkanRenderPass, 1);
self->vulkan = g_object_ref (context);
return self; return self;
} }
@ -69,8 +68,6 @@ gsk_vulkan_render_pass_new (GdkVulkanContext *context)
void void
gsk_vulkan_render_pass_free (GskVulkanRenderPass *self) gsk_vulkan_render_pass_free (GskVulkanRenderPass *self)
{ {
g_object_unref (self->vulkan);
g_free (self); g_free (self);
} }
@ -161,7 +158,7 @@ gsk_vulkan_render_pass_get_node_as_image (GskVulkanRenderPass *self,
result = gsk_vulkan_renderer_get_texture_image (renderer, texture); result = gsk_vulkan_renderer_get_texture_image (renderer, texture);
if (result == NULL) if (result == NULL)
{ {
result = gsk_vulkan_upload_texture_op (render, self->vulkan, texture); result = gsk_vulkan_upload_texture_op (render, texture);
gsk_vulkan_renderer_add_texture_image (renderer, texture, result); gsk_vulkan_renderer_add_texture_image (renderer, texture, result);
} }
@ -180,7 +177,6 @@ gsk_vulkan_render_pass_get_node_as_image (GskVulkanRenderPass *self,
return NULL; return NULL;
result = gsk_vulkan_upload_cairo_op (render, result = gsk_vulkan_upload_cairo_op (render,
self->vulkan,
node, node,
&state->scale, &state->scale,
&clipped); &clipped);
@ -205,7 +201,6 @@ gsk_vulkan_render_pass_get_node_as_image (GskVulkanRenderPass *self,
*tex_bounds = clipped; *tex_bounds = clipped;
result = gsk_vulkan_render_pass_op_offscreen (render, result = gsk_vulkan_render_pass_op_offscreen (render,
self->vulkan,
&state->scale, &state->scale,
&clipped, &clipped,
node); node);
@ -237,7 +232,6 @@ gsk_vulkan_render_pass_add_fallback_node (GskVulkanRenderPass *self,
return TRUE; return TRUE;
image = gsk_vulkan_upload_cairo_op (render, image = gsk_vulkan_upload_cairo_op (render,
self->vulkan,
node, node,
&state->scale, &state->scale,
&clipped); &clipped);
@ -439,7 +433,7 @@ gsk_vulkan_render_pass_add_texture_node (GskVulkanRenderPass *self,
image = gsk_vulkan_renderer_get_texture_image (renderer, texture); image = gsk_vulkan_renderer_get_texture_image (renderer, texture);
if (image == NULL) if (image == NULL)
{ {
image = gsk_vulkan_upload_texture_op (render, self->vulkan, texture); image = gsk_vulkan_upload_texture_op (render, texture);
gsk_vulkan_renderer_add_texture_image (renderer, texture, image); gsk_vulkan_renderer_add_texture_image (renderer, texture, image);
} }
@ -482,7 +476,7 @@ gsk_vulkan_render_pass_add_texture_scale_node (GskVulkanRenderPass *self,
image = gsk_vulkan_renderer_get_texture_image (renderer, texture); image = gsk_vulkan_renderer_get_texture_image (renderer, texture);
if (image == NULL) if (image == NULL)
{ {
image = gsk_vulkan_upload_texture_op (render, self->vulkan, texture); image = gsk_vulkan_upload_texture_op (render, texture);
gsk_vulkan_renderer_add_texture_image (renderer, texture, image); gsk_vulkan_renderer_add_texture_image (renderer, texture, image);
} }
@ -869,7 +863,6 @@ gsk_vulkan_render_pass_add_repeat_node (GskVulkanRenderPass *self,
return TRUE; return TRUE;
image = gsk_vulkan_render_pass_op_offscreen (render, image = gsk_vulkan_render_pass_op_offscreen (render,
self->vulkan,
&state->scale, &state->scale,
child_bounds, child_bounds,
gsk_repeat_node_get_child (node)); gsk_repeat_node_get_child (node));

7
gsk/vulkan/gskvulkanrenderpassop.c
View File

@ -244,7 +244,6 @@ static const GskVulkanOpClass GSK_VULKAN_RENDER_PASS_END_OP_CLASS = {
void void
gsk_vulkan_render_pass_op (GskVulkanRender *render, gsk_vulkan_render_pass_op (GskVulkanRender *render,
GdkVulkanContext *context,
GskVulkanImage *image, GskVulkanImage *image,
cairo_region_t *clip, cairo_region_t *clip,
const graphene_vec2_t *scale, const graphene_vec2_t *scale,
@ -264,7 +263,7 @@ gsk_vulkan_render_pass_op (GskVulkanRender *render,
cairo_region_get_extents (clip, &self->area); cairo_region_get_extents (clip, &self->area);
self->viewport_size = viewport->size; self->viewport_size = viewport->size;
self->render_pass = gsk_vulkan_render_pass_new (context); self->render_pass = gsk_vulkan_render_pass_new ();
/* This invalidates the self pointer */ /* This invalidates the self pointer */
gsk_vulkan_render_pass_add (self->render_pass, gsk_vulkan_render_pass_add (self->render_pass,
@ -282,11 +281,11 @@ gsk_vulkan_render_pass_op (GskVulkanRender *render,
GskVulkanImage * GskVulkanImage *
gsk_vulkan_render_pass_op_offscreen (GskVulkanRender *render, gsk_vulkan_render_pass_op_offscreen (GskVulkanRender *render,
GdkVulkanContext *context,
const graphene_vec2_t *scale, const graphene_vec2_t *scale,
const graphene_rect_t *viewport, const graphene_rect_t *viewport,
GskRenderNode *node) GskRenderNode *node)
{ {
GdkVulkanContext *context;
graphene_rect_t view; graphene_rect_t view;
GskVulkanImage *image; GskVulkanImage *image;
cairo_region_t *clip; cairo_region_t *clip;
@ -299,6 +298,7 @@ gsk_vulkan_render_pass_op_offscreen (GskVulkanRender *render,
ceil (scale_x * viewport->size.width), ceil (scale_x * viewport->size.width),
ceil (scale_y * viewport->size.height)); ceil (scale_y * viewport->size.height));
context = gsk_vulkan_render_get_context (render);
image = gsk_vulkan_image_new_for_offscreen (context, image = gsk_vulkan_image_new_for_offscreen (context,
gdk_vulkan_context_get_offscreen_format (context, gdk_vulkan_context_get_offscreen_format (context,
gsk_render_node_get_preferred_depth (node)), gsk_render_node_get_preferred_depth (node)),
@ -311,7 +311,6 @@ gsk_vulkan_render_pass_op_offscreen (GskVulkanRender *render,
}); });
gsk_vulkan_render_pass_op (render, gsk_vulkan_render_pass_op (render,
context,
image, image,
clip, clip,
scale, scale,

2
gsk/vulkan/gskvulkanrenderpassopprivate.h
View File

@ -5,7 +5,6 @@
G_BEGIN_DECLS G_BEGIN_DECLS
void gsk_vulkan_render_pass_op (GskVulkanRender *render, void gsk_vulkan_render_pass_op (GskVulkanRender *render,
GdkVulkanContext *context,
GskVulkanImage *image, GskVulkanImage *image,
cairo_region_t *clip, cairo_region_t *clip,
const graphene_vec2_t *scale, const graphene_vec2_t *scale,
@ -14,7 +13,6 @@ void gsk_vulkan_render_pass_op (GskVulk
VkImageLayout initial_layout, VkImageLayout initial_layout,
VkImageLayout final_layout); VkImageLayout final_layout);
GskVulkanImage * gsk_vulkan_render_pass_op_offscreen (GskVulkanRender *render, GskVulkanImage * gsk_vulkan_render_pass_op_offscreen (GskVulkanRender *render,
GdkVulkanContext *context,
const graphene_vec2_t *scale, const graphene_vec2_t *scale,
const graphene_rect_t *viewport, const graphene_rect_t *viewport,
GskRenderNode *node); GskRenderNode *node);

2
gsk/vulkan/gskvulkanrenderpassprivate.h
View File

@ -10,7 +10,7 @@
G_BEGIN_DECLS G_BEGIN_DECLS
GskVulkanRenderPass * gsk_vulkan_render_pass_new (GdkVulkanContext *context); GskVulkanRenderPass * gsk_vulkan_render_pass_new (void);
void gsk_vulkan_render_pass_free (GskVulkanRenderPass *self); void gsk_vulkan_render_pass_free (GskVulkanRenderPass *self);

6
gsk/vulkan/gskvulkanuploadop.c
View File

@ -214,7 +214,6 @@ static const GskVulkanOpClass GSK_VULKAN_UPLOAD_TEXTURE_OP_CLASS = {
GskVulkanImage * GskVulkanImage *
gsk_vulkan_upload_texture_op (GskVulkanRender *render, gsk_vulkan_upload_texture_op (GskVulkanRender *render,
GdkVulkanContext *context,
GdkTexture *texture) GdkTexture *texture)
{ {
GskVulkanUploadTextureOp *self; GskVulkanUploadTextureOp *self;
@ -222,7 +221,7 @@ gsk_vulkan_upload_texture_op (GskVulkanRender *render,
self = (GskVulkanUploadTextureOp *) gsk_vulkan_op_alloc (render, &GSK_VULKAN_UPLOAD_TEXTURE_OP_CLASS); self = (GskVulkanUploadTextureOp *) gsk_vulkan_op_alloc (render, &GSK_VULKAN_UPLOAD_TEXTURE_OP_CLASS);
self->texture = g_object_ref (texture); self->texture = g_object_ref (texture);
self->image = gsk_vulkan_image_new_for_upload (context, self->image = gsk_vulkan_image_new_for_upload (gsk_vulkan_render_get_context (render),
gdk_texture_get_format (texture), gdk_texture_get_format (texture),
gdk_texture_get_width (texture), gdk_texture_get_width (texture),
gdk_texture_get_height (texture)); gdk_texture_get_height (texture));
@ -327,7 +326,6 @@ static const GskVulkanOpClass GSK_VULKAN_UPLOAD_CAIRO_OP_CLASS = {
GskVulkanImage * GskVulkanImage *
gsk_vulkan_upload_cairo_op (GskVulkanRender *render, gsk_vulkan_upload_cairo_op (GskVulkanRender *render,
GdkVulkanContext *context,
GskRenderNode *node, GskRenderNode *node,
const graphene_vec2_t *scale, const graphene_vec2_t *scale,
const graphene_rect_t *viewport) const graphene_rect_t *viewport)
@ -337,7 +335,7 @@ gsk_vulkan_upload_cairo_op (GskVulkanRender *render,
self = (GskVulkanUploadCairoOp *) gsk_vulkan_op_alloc (render, &GSK_VULKAN_UPLOAD_CAIRO_OP_CLASS); self = (GskVulkanUploadCairoOp *) gsk_vulkan_op_alloc (render, &GSK_VULKAN_UPLOAD_CAIRO_OP_CLASS);
self->node = gsk_render_node_ref (node); self->node = gsk_render_node_ref (node);
self->image = gsk_vulkan_image_new_for_upload (context, self->image = gsk_vulkan_image_new_for_upload (gsk_vulkan_render_get_context (render),
GDK_MEMORY_DEFAULT, GDK_MEMORY_DEFAULT,
ceil (graphene_vec2_get_x (scale) * viewport->size.width), ceil (graphene_vec2_get_x (scale) * viewport->size.width),
ceil (graphene_vec2_get_y (scale) * viewport->size.height)); ceil (graphene_vec2_get_y (scale) * viewport->size.height));

2
gsk/vulkan/gskvulkanuploadopprivate.h
View File

@ -5,11 +5,9 @@
G_BEGIN_DECLS G_BEGIN_DECLS
GskVulkanImage * gsk_vulkan_upload_texture_op (GskVulkanRender *render, GskVulkanImage * gsk_vulkan_upload_texture_op (GskVulkanRender *render,
GdkVulkanContext *context,
GdkTexture *texture); GdkTexture *texture);
GskVulkanImage * gsk_vulkan_upload_cairo_op (GskVulkanRender *render, GskVulkanImage * gsk_vulkan_upload_cairo_op (GskVulkanRender *render,
GdkVulkanContext *context,
GskRenderNode *node, GskRenderNode *node,
const graphene_vec2_t *scale, const graphene_vec2_t *scale,
const graphene_rect_t *viewport); const graphene_rect_t *viewport);