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

gpu: Allow NULL as clear color

Browse Source 
NULL disables clearing. We only implement this for GL as in Vulkan we'd
need to create different renderpasses with different attachment
descriptions and that would require more plumbing.
This commit is contained in:
Benjamin Otte
2024-07-08 22:39:35 +02:00
parent 1dd905d976
commit fcf59ad135
3 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gsk/gpu/gskgpunodeprocessor.c
View File

@@ -681,6 +681,7 @@ gsk_gpu_copy_image (GskGpuFrame *frame,
&(cairo_rectangle_int_t) { 0, 0, width, height },
&rect);
/* FIXME: With blend mode SOURCE/OFF we wouldn't need the clear here */
gsk_gpu_render_pass_begin_op (other.frame,
copy,
&(cairo_rectangle_int_t) { 0, 0, width, height },
@@ -3066,7 +3067,7 @@ gsk_gpu_node_processor_add_first_container_node (GskGpuNodeProcessor *se
gsk_gpu_render_pass_begin_op (self->frame,
target,
clip,
&GDK_RGBA_TRANSPARENT,
NULL,
pass_type);
}
@@ -3432,7 +3433,7 @@ gsk_gpu_node_processor_add_first_node (GskGpuNodeProcessor *self,
gsk_gpu_render_pass_begin_op (self->frame,
target,
clip,
&GDK_RGBA_TRANSPARENT,
NULL,
pass_type);
gsk_gpu_node_processor_add_node (self, node);

28
gsk/gpu/gskgpurenderpassop.c
View File

@@ -22,7 +22,8 @@ struct _GskGpuRenderPassOp
GskGpuImage *target;
cairo_rectangle_int_t area;
float background[4];
gboolean clear;
float clear_color[4];
GskRenderPassType pass_type;
};
@@ -45,8 +46,8 @@ gsk_gpu_render_pass_op_print (GskGpuOp *op,
gsk_gpu_print_op (string, indent, "begin-render-pass");
gsk_gpu_print_image (string, self->target);
gsk_gpu_print_int_rect (string, &self->area);
if (self->background[3] > 0)
gsk_gpu_print_rgba (string, self->background);
if (self->clear)
gsk_gpu_print_rgba (string, self->clear_color);
gsk_gpu_print_newline (string);
}
@@ -144,10 +145,10 @@ gsk_gpu_render_pass_op_vk_command (GskGpuOp *op,
{
.color = {
.float32 = {
self->background[0],
self->background[1],
self->background[2],
self->background[3]
self->clear ? self->clear_color[0] : 0,
self->clear ? self->clear_color[1] : 0,
self->clear ? self->clear_color[2] : 0,
self->clear ? self->clear_color[3] : 0
}
}
}
@@ -192,8 +193,11 @@ gsk_gpu_render_pass_op_gl_command (GskGpuOp *op,
glScissor (self->area.x, state->flip_y - self->area.y - self->area.height, self->area.width, self->area.height);
else
glScissor (self->area.x, self->area.y, self->area.width, self->area.height);
glClearColor (self->background[0], self->background[1], self->background[2], self->background[3]);
glClear (GL_COLOR_BUFFER_BIT);
if (self->clear)
{
glClearColor (self->clear_color[0], self->clear_color[1], self->clear_color[2], self->clear_color[3]);
glClear (GL_COLOR_BUFFER_BIT);
}
op = op->next;
while (op->op_class->stage != GSK_GPU_STAGE_END_PASS)
@@ -324,7 +328,7 @@ void
gsk_gpu_render_pass_begin_op (GskGpuFrame *frame,
GskGpuImage *image,
const cairo_rectangle_int_t *area,
const GdkRGBA *background,
const GdkRGBA *clear_color_or_null,
GskRenderPassType pass_type)
{
GskGpuRenderPassOp *self;
@@ -333,7 +337,9 @@ gsk_gpu_render_pass_begin_op (GskGpuFrame *frame,
self->target = g_object_ref (image);
self->area = *area;
gsk_gpu_rgba_to_float (background, self->background);
self->clear = clear_color_or_null != NULL;
if (clear_color_or_null)
gsk_gpu_rgba_to_float (clear_color_or_null, self->clear_color);
self->pass_type = pass_type;
}

2
gsk/gpu/gskgpurenderpassopprivate.h
View File

@@ -18,7 +18,7 @@ typedef enum
void gsk_gpu_render_pass_begin_op (GskGpuFrame *frame,
GskGpuImage *image,
const cairo_rectangle_int_t *area,
const GdkRGBA *background,
const GdkRGBA *clear_color_or_null,
GskRenderPassType pass_type);
void gsk_gpu_render_pass_end_op (GskGpuFrame *frame,
GskGpuImage *image,