BitHeaven
/
picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update generate_blur_kernel to use abstract parameter type 

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui 2019-06-09 12:44:32 +01:00
parent e16e592302
commit c1b2ce1fce
No known key found for this signature in database
GPG Key ID: 37C999F617EA1A47
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/backend/backend_common.c
View File

@ -280,8 +280,9 @@ default_backend_render_shadow(backend_t *backend_data, int width, int height,
return ret; return ret;
} }
static struct conv **generate_box_blur_kernel(int blur_size, int *kernel_count) { static struct conv **
int r = blur_size * 2 + 1; generate_box_blur_kernel(struct box_kernel_args *args, int *kernel_count) {
int r = args->size * 2 + 1;
assert(r > 0); assert(r > 0);
auto ret = ccalloc(2, struct conv *); auto ret = ccalloc(2, struct conv *);
ret[0] = cvalloc(sizeof(struct conv) + sizeof(double) * (size_t)r); ret[0] = cvalloc(sizeof(struct conv) + sizeof(double) * (size_t)r);
@ -299,8 +300,8 @@ static struct conv **generate_box_blur_kernel(int blur_size, int *kernel_count)
} }
static struct conv ** static struct conv **
generate_gaussian_blur_kernel(int blur_size, double blur_deviation, int *kernel_count) { generate_gaussian_blur_kernel(struct gaussian_kernel_args *args, int *kernel_count) {
int r = blur_size * 2 + 1; int r = args->size * 2 + 1;
assert(r > 0); assert(r > 0);
auto ret = ccalloc(2, struct conv *); auto ret = ccalloc(2, struct conv *);
ret[0] = cvalloc(sizeof(struct conv) + sizeof(double) * (size_t)r); ret[0] = cvalloc(sizeof(struct conv) + sizeof(double) * (size_t)r);
@ -309,11 +310,11 @@ generate_gaussian_blur_kernel(int blur_size, double blur_deviation, int *kernel_
ret[0]->h = 1; ret[0]->h = 1;
ret[1]->w = 1; ret[1]->w = 1;
ret[1]->h = r; ret[1]->h = r;
for (int i = 0; i <= blur_size; i++) { for (int i = 0; i <= args->size; i++) {
ret[0]->data[i] = ret[0]->data[r - i - 1] = ret[0]->data[i] = ret[0]->data[r - i - 1] =
1.0 / (sqrt(2.0 * M_PI) * blur_deviation) * 1.0 / (sqrt(2.0 * M_PI) * args->deviation) *
exp(-(blur_size - i) * (blur_size - i) / exp(-(args->size - i) * (args->size - i) /
(2 * blur_deviation * blur_deviation)); (2 * args->deviation * args->deviation));
ret[1]->data[i] = ret[1]->data[r - i - 1] = ret[0]->data[i]; ret[1]->data[i] = ret[1]->data[r - i - 1] = ret[0]->data[i];
} }
*kernel_count = 2; *kernel_count = 2;
@ -322,13 +323,11 @@ generate_gaussian_blur_kernel(int blur_size, double blur_deviation, int *kernel_
/// Generate blur kernels for gaussian and box blur methods. Generated kernel is not /// Generate blur kernels for gaussian and box blur methods. Generated kernel is not
/// normalized, and the center element will always be 1. /// normalized, and the center element will always be 1.
struct conv **generate_blur_kernel(enum blur_method method, int blur_size, struct conv **generate_blur_kernel(enum blur_method method, void *args, int *kernel_count) {
double blur_deviation, int *kernel_count) {
assert(blur_size >= 0);
switch (method) { switch (method) {
case BLUR_METHOD_BOX: return generate_box_blur_kernel(blur_size, kernel_count); case BLUR_METHOD_BOX: return generate_box_blur_kernel(args, kernel_count);
case BLUR_METHOD_GAUSSIAN: case BLUR_METHOD_GAUSSIAN:
return generate_gaussian_blur_kernel(blur_size, blur_deviation, kernel_count); return generate_gaussian_blur_kernel(args, kernel_count);
default: break; default: break;
} }
return NULL; return NULL;

3
src/backend/backend_common.h
View File

@ -40,5 +40,4 @@ default_backend_render_shadow(backend_t *backend_data, int width, int height,
void init_backend_base(struct backend_base *base, session_t *ps); void init_backend_base(struct backend_base *base, session_t *ps);
struct conv **generate_blur_kernel(enum blur_method method, int blur_size, struct conv **generate_blur_kernel(enum blur_method method, void *args, int *kernel_count);
double blur_deviation, int *kernel_count);