mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-04 13:29:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Optimize blur a bit more.

Browse source
This commit is contained in:
Kristian Høgsberg 2008-11-17 22:23:55 -05:00
parent 8c304f6d9a
commit 873302649a
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
cairo-util.c
View file

@ -100,6 +100,8 @@ buffer_create_from_cairo_surface(int fd, cairo_surface_t *surface)
return buffer; return buffer;
} }
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
void void
blur_surface(cairo_surface_t *surface, int margin) blur_surface(cairo_surface_t *surface, int margin)
{ {
@ -107,10 +109,11 @@ blur_surface(cairo_surface_t *surface, int margin)
int32_t width, height, stride, x, y, z, w; int32_t width, height, stride, x, y, z, w;
uint8_t *src, *dst; uint8_t *src, *dst;
uint32_t *s, *d, a, p; uint32_t *s, *d, a, p;
int i, j, k, size = 17, half; int i, j, k, size, half;
uint8_t kernel[100]; uint8_t kernel[10];
double f; double f;
size = ARRAY_LENGTH(kernel);
width = cairo_image_surface_get_width(surface); width = cairo_image_surface_get_width(surface);
height = cairo_image_surface_get_height(surface); height = cairo_image_surface_get_height(surface);
stride = cairo_image_surface_get_stride(surface); stride = cairo_image_surface_get_stride(surface);
@ -131,9 +134,11 @@ blur_surface(cairo_surface_t *surface, int margin)
s = (uint32_t *) (src + i * stride); s = (uint32_t *) (src + i * stride);
d = (uint32_t *) (dst + i * stride); d = (uint32_t *) (dst + i * stride);
for (j = 0; j < width; j++) { for (j = 0; j < width; j++) {
if (margin < j && j < width - margin && if (margin < j && j < width - margin) {
margin < i && i < height - margin) d[j] = s[j];
continue; continue;
}
x = 0; x = 0;
y = 0; y = 0;
z = 0; z = 0;
@ -156,9 +161,11 @@ blur_surface(cairo_surface_t *surface, int margin)
s = (uint32_t *) (dst + i * stride); s = (uint32_t *) (dst + i * stride);
d = (uint32_t *) (src + i * stride); d = (uint32_t *) (src + i * stride);
for (j = 0; j < width; j++) { for (j = 0; j < width; j++) {
if (margin <= j && j < width - margin && if (margin <= i && i < height - margin) {
margin <= i && i < height - margin) d[j] = s[j];
continue; continue;
}
x = 0; x = 0;
y = 0; y = 0;
z = 0; z = 0;

5
window.c
View file

@ -88,7 +88,7 @@ draw_window(void *data)
cairo_set_source_rgba(cr, 0, 0, 0, 0.5); cairo_set_source_rgba(cr, 0, 0, 0, 0.5);
rounded_rect(cr, 0, 0, window->width, window->height, radius); rounded_rect(cr, 0, 0, window->width, window->height, radius);
cairo_fill(cr); cairo_fill(cr);
blur_surface(surface, 16 + radius); blur_surface(surface, 24 + radius);
cairo_translate(cr, -5, -3); cairo_translate(cr, -5, -3);
cairo_set_line_width (cr, border); cairo_set_line_width (cr, border);
@ -148,7 +148,6 @@ draw_window(void *data)
cairo_set_source_rgb(cr, 1, 1, 1); cairo_set_source_rgb(cr, 1, 1, 1);
cairo_fill(cr); cairo_fill(cr);
cairo_destroy(cr); cairo_destroy(cr);
if (window->buffer != NULL) if (window->buffer != NULL)
buffer_destroy(window->buffer, window->fd); buffer_destroy(window->buffer, window->fd);
buffer = buffer_create_from_cairo_surface(window->fd, surface); buffer = buffer_create_from_cairo_surface(window->fd, surface);
@ -381,7 +380,7 @@ int main(int argc, char *argv[])
wl_display_set_event_handler(display, event_handler, window); wl_display_set_event_handler(display, event_handler, window);
g_timeout_add(20, draw, window); g_timeout_add(50, draw, window);
g_main_loop_run(loop); g_main_loop_run(loop);