diff options
Diffstat (limited to 'gsk/ngl/gsknglrenderjob.c')
| -rw-r--r-- | gsk/ngl/gsknglrenderjob.c | 121 |
1 files changed, 68 insertions, 53 deletions
diff --git a/gsk/ngl/gsknglrenderjob.c b/gsk/ngl/gsknglrenderjob.c index 69c92ac80f..60f0cff82c 100644 --- a/gsk/ngl/gsknglrenderjob.c +++ b/gsk/ngl/gsknglrenderjob.c @@ -212,6 +212,13 @@ node_is_invisible (const GskRenderNode *node) node->bounds.size.height == 0.0f; } +static inline gboolean G_GNUC_PURE +rounded_rect_equal (const GskRoundedRect *r1, + const GskRoundedRect *r2) +{ + return memcmp (r1, r2, sizeof (GskRoundedRect)) == 0; +} + static inline void gsk_rounded_rect_shrink_to_minimum (GskRoundedRect *self) { @@ -811,9 +818,9 @@ interval_contains (float p1, float w1, } static inline gboolean -gsk_ngl_render_job_update_clip (GskNglRenderJob *job, - const GskRenderNode *node, - gboolean *pushed_clip) +gsk_ngl_render_job_update_clip (GskNglRenderJob *job, + const graphene_rect_t *bounds, + gboolean *pushed_clip) { graphene_rect_t transformed_bounds; gboolean no_clip = FALSE; @@ -827,7 +834,7 @@ gsk_ngl_render_job_update_clip (GskNglRenderJob *job, return TRUE; } - gsk_ngl_render_job_transform_bounds (job, &node->bounds, &transformed_bounds); + gsk_ngl_render_job_transform_bounds (job, bounds, &transformed_bounds); if (!rect_intersects (&job->current_clip->rect.bounds, &transformed_bounds)) { @@ -2451,6 +2458,8 @@ gsk_ngl_render_job_visit_blurred_outset_shadow_node (GskNglRenderJob *job, return; } + /* slicing */ + gsk_ngl_render_job_begin_draw (job, CHOOSE_PROGRAM (job, outset_shadow)); gsk_ngl_program_set_uniform_texture (job->current_program, UNIFORM_SHARED_SOURCE, 0, @@ -2469,6 +2478,8 @@ gsk_ngl_render_job_visit_blurred_outset_shadow_node (GskNglRenderJob *job, float max_y = ceilf (outline->bounds.origin.y + outline->bounds.size.height + half_blur_extra + dy + spread); const GskNglTextureNineSlice *slices; + float left_width, center_width, right_width; + float top_height, center_height, bottom_height; GskNglTexture *texture; texture = gsk_ngl_driver_get_texture_by_id (job->driver, blurred_texture_id); @@ -2479,14 +2490,23 @@ gsk_ngl_render_job_visit_blurred_outset_shadow_node (GskNglRenderJob *job, /* Our texture coordinates MUST be scaled, while the actual vertex coords * MUST NOT be scaled. */ + left_width = slices[NINE_SLICE_TOP_LEFT].rect.width / scale_x; + right_width = slices[NINE_SLICE_TOP_RIGHT].rect.width / scale_x; + center_width = (max_x - min_x) - (left_width + right_width); + + top_height = slices[NINE_SLICE_TOP_LEFT].rect.height / scale_y; + bottom_height = slices[NINE_SLICE_BOTTOM_LEFT].rect.height / scale_y; + center_height = (max_y - min_y) - (top_height + bottom_height); + /* Top left */ if (nine_slice_is_visible (&slices[NINE_SLICE_TOP_LEFT])) { memcpy (&offscreen.area, &slices[NINE_SLICE_TOP_LEFT].area, sizeof offscreen.area); gsk_ngl_render_job_draw_offscreen_with_color (job, - &GRAPHENE_RECT_INIT (min_x, min_y, - slices[NINE_SLICE_TOP_LEFT].rect.width / scale_x, - slices[NINE_SLICE_TOP_LEFT].rect.height / scale_y), + &GRAPHENE_RECT_INIT (min_x, + min_y, + left_width, + top_height), &offscreen, color); } @@ -2495,13 +2515,11 @@ gsk_ngl_render_job_visit_blurred_outset_shadow_node (GskNglRenderJob *job, if (nine_slice_is_visible (&slices[NINE_SLICE_TOP_CENTER])) { memcpy (&offscreen.area, &slices[NINE_SLICE_TOP_CENTER].area, sizeof offscreen.area); - float width = (max_x - min_x) - (slices[NINE_SLICE_TOP_LEFT].rect.width / scale_x + - slices[NINE_SLICE_TOP_RIGHT].rect.width / scale_x); gsk_ngl_render_job_draw_offscreen_with_color (job, - &GRAPHENE_RECT_INIT (min_x + (slices[NINE_SLICE_TOP_LEFT].rect.width / scale_x), + &GRAPHENE_RECT_INIT (min_x + left_width, min_y, - width, - slices[NINE_SLICE_TOP_CENTER].rect.height / scale_y), + center_width, + top_height), &offscreen, color); } @@ -2511,10 +2529,10 @@ gsk_ngl_render_job_visit_blurred_outset_shadow_node (GskNglRenderJob *job, { memcpy (&offscreen.area, &slices[NINE_SLICE_TOP_RIGHT].area, sizeof offscreen.area); gsk_ngl_render_job_draw_offscreen_with_color (job, - &GRAPHENE_RECT_INIT (max_x - (slices[NINE_SLICE_TOP_RIGHT].rect.width / scale_x), + &GRAPHENE_RECT_INIT (max_x - right_width, min_y, - slices[NINE_SLICE_TOP_RIGHT].rect.width / scale_x, - slices[NINE_SLICE_TOP_RIGHT].rect.height / scale_y), + right_width, + top_height), &offscreen, color); } @@ -2524,10 +2542,10 @@ gsk_ngl_render_job_visit_blurred_outset_shadow_node (GskNglRenderJob *job, { memcpy (&offscreen.area, &slices[NINE_SLICE_BOTTOM_RIGHT].area, sizeof offscreen.area); gsk_ngl_render_job_draw_offscreen_with_color (job, - &GRAPHENE_RECT_INIT (max_x - (slices[NINE_SLICE_BOTTOM_RIGHT].rect.width / scale_x), - max_y - (slices[NINE_SLICE_BOTTOM_RIGHT].rect.height / scale_y), - slices[NINE_SLICE_BOTTOM_RIGHT].rect.width / scale_x, - slices[NINE_SLICE_BOTTOM_RIGHT].rect.height / scale_y), + &GRAPHENE_RECT_INIT (max_x - right_width, + max_y - bottom_height, + right_width, + bottom_height), &offscreen, color); } @@ -2538,9 +2556,9 @@ gsk_ngl_render_job_visit_blurred_outset_shadow_node (GskNglRenderJob *job, memcpy (&offscreen.area, &slices[NINE_SLICE_BOTTOM_LEFT].area, sizeof offscreen.area); gsk_ngl_render_job_draw_offscreen_with_color (job, &GRAPHENE_RECT_INIT (min_x, - max_y - (slices[NINE_SLICE_BOTTOM_LEFT].rect.height / scale_y), - slices[NINE_SLICE_BOTTOM_LEFT].rect.width / scale_x, - slices[NINE_SLICE_BOTTOM_LEFT].rect.height / scale_y), + max_y - bottom_height, + left_width, + bottom_height), &offscreen, color); } @@ -2549,13 +2567,11 @@ gsk_ngl_render_job_visit_blurred_outset_shadow_node (GskNglRenderJob *job, if (nine_slice_is_visible (&slices[NINE_SLICE_LEFT_CENTER])) { memcpy (&offscreen.area, &slices[NINE_SLICE_LEFT_CENTER].area, sizeof offscreen.area); - float height = (max_y - min_y) - (slices[NINE_SLICE_TOP_LEFT].rect.height / scale_y + - slices[NINE_SLICE_BOTTOM_LEFT].rect.height / scale_y); gsk_ngl_render_job_draw_offscreen_with_color (job, &GRAPHENE_RECT_INIT (min_x, - min_y + (slices[NINE_SLICE_TOP_LEFT].rect.height / scale_y), - slices[NINE_SLICE_LEFT_CENTER].rect.width / scale_x, - height), + min_y + top_height, + left_width, + center_height), &offscreen, color); } @@ -2564,13 +2580,11 @@ gsk_ngl_render_job_visit_blurred_outset_shadow_node (GskNglRenderJob *job, if (nine_slice_is_visible (&slices[NINE_SLICE_RIGHT_CENTER])) { memcpy (&offscreen.area, &slices[NINE_SLICE_RIGHT_CENTER].area, sizeof offscreen.area); - float height = (max_y - min_y) - (slices[NINE_SLICE_TOP_RIGHT].rect.height / scale_y + - slices[NINE_SLICE_BOTTOM_RIGHT].rect.height / scale_y); gsk_ngl_render_job_draw_offscreen_with_color (job, - &GRAPHENE_RECT_INIT (max_x - (slices[NINE_SLICE_RIGHT_CENTER].rect.width / scale_x), - min_y + (slices[NINE_SLICE_TOP_LEFT].rect.height / scale_y), - slices[NINE_SLICE_RIGHT_CENTER].rect.width / scale_x, - height), + &GRAPHENE_RECT_INIT (max_x - right_width, + min_y + top_height, + right_width, + center_height), &offscreen, color); } @@ -2579,13 +2593,11 @@ gsk_ngl_render_job_visit_blurred_outset_shadow_node (GskNglRenderJob *job, if (nine_slice_is_visible (&slices[NINE_SLICE_BOTTOM_CENTER])) { memcpy (&offscreen.area, &slices[NINE_SLICE_BOTTOM_CENTER].area, sizeof offscreen.area); - float width = (max_x - min_x) - (slices[NINE_SLICE_BOTTOM_LEFT].rect.width / scale_x + - slices[NINE_SLICE_BOTTOM_RIGHT].rect.width / scale_x); gsk_ngl_render_job_draw_offscreen_with_color (job, - &GRAPHENE_RECT_INIT (min_x + (slices[NINE_SLICE_BOTTOM_LEFT].rect.width / scale_x), - max_y - (slices[NINE_SLICE_BOTTOM_CENTER].rect.height / scale_y), - width, - slices[NINE_SLICE_BOTTOM_CENTER].rect.height / scale_y), + &GRAPHENE_RECT_INIT (min_x + left_width, + max_y - bottom_height, + center_width, + bottom_height), &offscreen, color); } @@ -2593,17 +2605,20 @@ gsk_ngl_render_job_visit_blurred_outset_shadow_node (GskNglRenderJob *job, /* Middle */ if (nine_slice_is_visible (&slices[NINE_SLICE_CENTER])) { - memcpy (&offscreen.area, &slices[NINE_SLICE_CENTER].area, sizeof offscreen.area); - float width = (max_x - min_x) - (slices[NINE_SLICE_LEFT_CENTER].rect.width / scale_x + - slices[NINE_SLICE_RIGHT_CENTER].rect.width / scale_x); - float height = (max_y - min_y) - (slices[NINE_SLICE_TOP_CENTER].rect.height / scale_y + - slices[NINE_SLICE_BOTTOM_CENTER].rect.height / scale_y); - gsk_ngl_render_job_draw_offscreen_with_color (job, - &GRAPHENE_RECT_INIT (min_x + (slices[NINE_SLICE_LEFT_CENTER].rect.width / scale_x), - min_y + (slices[NINE_SLICE_TOP_CENTER].rect.height / scale_y), - width, height), - &offscreen, - color); + if (!gsk_rounded_rect_contains_rect (outline, &GRAPHENE_RECT_INIT (min_x + left_width, + min_y + top_height, + center_width, + center_height))) + { + memcpy (&offscreen.area, &slices[NINE_SLICE_CENTER].area, sizeof offscreen.area); + gsk_ngl_render_job_draw_offscreen_with_color (job, + &GRAPHENE_RECT_INIT (min_x + left_width, + min_y + top_height, + center_width, + center_height), + &offscreen, + color); + } } } @@ -3414,7 +3429,7 @@ gsk_ngl_render_job_visit_node (GskNglRenderJob *job, if (node_is_invisible (node)) return; - if (!gsk_ngl_render_job_update_clip (job, node, &has_clip)) + if (!gsk_ngl_render_job_update_clip (job, &node->bounds, &has_clip)) return; switch (gsk_render_node_get_node_type (node)) @@ -3474,8 +3489,8 @@ gsk_ngl_render_job_visit_node (GskNglRenderJob *job, if (gsk_render_node_get_node_type (grandchild) == GSK_COLOR_NODE && gsk_render_node_get_node_type (child2) == GSK_BORDER_NODE && gsk_border_node_get_uniform_color (child2) && - gsk_rounded_rect_equal (gsk_rounded_clip_node_get_clip (child), - gsk_border_node_get_outline (child2))) + rounded_rect_equal (gsk_rounded_clip_node_get_clip (child), + gsk_border_node_get_outline (child2))) { gsk_ngl_render_job_visit_css_background (job, child, child2); i++; /* skip the border node */ |