[gegl] operations: rename motion-blur to motion-blur-linear
- From: Téo Mazars <teom src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] operations: rename motion-blur to motion-blur-linear
- Date: Sun, 2 Jun 2013 14:30:15 +0000 (UTC)
commit e0539dc409e674ab821acf35eeb85be3e53f0814
Author: Téo Mazars <teo mazars ensimag fr>
Date: Sun Jun 2 16:12:18 2013 +0200
operations: rename motion-blur to motion-blur-linear
To differentiate it from -zoom and -circular
opencl/{motion-blur.cl => motion-blur-linear.cl} | 22 +++++++++---------
.../{motion-blur.cl.h => motion-blur-linear.cl.h} | 24 ++++++++++----------
.../common/{motion-blur.c => motion-blur-linear.c} | 17 +++++++------
po/POTFILES.in | 2 +-
4 files changed, 33 insertions(+), 32 deletions(-)
---
diff --git a/opencl/motion-blur.cl b/opencl/motion-blur-linear.cl
similarity index 75%
rename from opencl/motion-blur.cl
rename to opencl/motion-blur-linear.cl
index a4cd49c..7c94895 100644
--- a/opencl/motion-blur.cl
+++ b/opencl/motion-blur-linear.cl
@@ -20,17 +20,17 @@ float4 get_pixel_color(const __global float4 *in_buf,
return in_buf[iy * rect_width + ix];
}
-__kernel void motion_blur(const __global float4 *src_buf,
- int src_width,
- int src_height,
- int src_x,
- int src_y,
- __global float4 *dst_buf,
- int dst_x,
- int dst_y,
- int num_steps,
- float offset_x,
- float offset_y)
+__kernel void motion_blur_linear(const __global float4 *src_buf,
+ int src_width,
+ int src_height,
+ int src_x,
+ int src_y,
+ __global float4 *dst_buf,
+ int dst_x,
+ int dst_y,
+ int num_steps,
+ float offset_x,
+ float offset_y)
{
int gidx = get_global_id(0);
int gidy = get_global_id(1);
diff --git a/opencl/motion-blur.cl.h b/opencl/motion-blur-linear.cl.h
similarity index 87%
rename from opencl/motion-blur.cl.h
rename to opencl/motion-blur-linear.cl.h
index 807fdeb..e3db14f 100644
--- a/opencl/motion-blur.cl.h
+++ b/opencl/motion-blur-linear.cl.h
@@ -1,4 +1,4 @@
-static const char* motion_blur_cl_source =
+static const char* motion_blur_linear_cl_source =
"int CLAMP(int val,int lo,int hi) \n"
"{ \n"
" return (val < lo) ? lo : ((hi < val) ? hi : val); \n"
@@ -21,17 +21,17 @@ static const char* motion_blur_cl_source =
" return in_buf[iy * rect_width + ix]; \n"
"} \n"
" \n"
-"__kernel void motion_blur(const __global float4 *src_buf, \n"
-" int src_width, \n"
-" int src_height, \n"
-" int src_x, \n"
-" int src_y, \n"
-" __global float4 *dst_buf, \n"
-" int dst_x, \n"
-" int dst_y, \n"
-" int num_steps, \n"
-" float offset_x, \n"
-" float offset_y) \n"
+"__kernel void motion_blur_linear(const __global float4 *src_buf, \n"
+" int src_width, \n"
+" int src_height, \n"
+" int src_x, \n"
+" int src_y, \n"
+" __global float4 *dst_buf, \n"
+" int dst_x, \n"
+" int dst_y, \n"
+" int num_steps, \n"
+" float offset_x, \n"
+" float offset_y) \n"
"{ \n"
" int gidx = get_global_id(0); \n"
" int gidy = get_global_id(1); \n"
diff --git a/operations/common/motion-blur.c b/operations/common/motion-blur-linear.c
similarity index 93%
rename from operations/common/motion-blur.c
rename to operations/common/motion-blur-linear.c
index 9428b14..c575a6a 100644
--- a/operations/common/motion-blur.c
+++ b/operations/common/motion-blur-linear.c
@@ -32,7 +32,7 @@ gegl_chant_double_ui (angle, _("Angle"), -360, 360, 0, -180.0, 180.0, 1.0,
#else
#define GEGL_CHANT_TYPE_AREA_FILTER
-#define GEGL_CHANT_C_FILE "motion-blur.c"
+#define GEGL_CHANT_C_FILE "motion-blur-linear.c"
#include "gegl-chant.h"
@@ -58,12 +58,12 @@ prepare (GeglOperation *operation)
#include "opencl/gegl-cl.h"
#include "buffer/gegl-buffer-cl-iterator.h"
-#include "opencl/motion-blur.cl.h"
+#include "opencl/motion-blur-linear.cl.h"
static GeglClRunData *cl_data = NULL;
static gboolean
-cl_motion_blur (cl_mem in_tex,
+cl_motion_blur_linear (cl_mem in_tex,
cl_mem out_tex,
size_t global_worksize,
const GeglRectangle *roi,
@@ -77,8 +77,8 @@ cl_motion_blur (cl_mem in_tex,
if (!cl_data)
{
- const char *kernel_name[] = {"motion_blur", NULL};
- cl_data = gegl_cl_compile_and_build (motion_blur_cl_source, kernel_name);
+ const char *kernel_name[] = {"motion_blur_linear", NULL};
+ cl_data = gegl_cl_compile_and_build (motion_blur_linear_cl_source, kernel_name);
}
if (!cl_data) return TRUE;
@@ -149,10 +149,10 @@ cl_process (GeglOperation *operation,
if (err) return FALSE;
for (j=0; j < i->n; j++)
{
- err = cl_motion_blur(i->tex[read][j], i->tex[0][j], i->size[0][j], &i->roi[0][j],
&i->roi[read][j], num_steps, offset_x, offset_y);
+ err = cl_motion_blur_linear(i->tex[read][j], i->tex[0][j], i->size[0][j], &i->roi[0][j],
&i->roi[read][j], num_steps, offset_x, offset_y);
if (err)
{
- g_warning("[OpenCL] Error in gegl:motion-blur");
+ g_warning("[OpenCL] Error in gegl:motion-blur-linear");
return FALSE;
}
}
@@ -279,9 +279,10 @@ gegl_chant_class_init (GeglChantClass *klass)
operation_class->prepare = prepare;
operation_class->opencl_support = TRUE;
+ operation_class->compat_name = "gegl:motion-blur";
gegl_operation_class_set_keys (operation_class,
- "name" , "gegl:motion-blur",
+ "name" , "gegl:motion-blur-linear",
"categories" , "blur",
"description", _("Linear motion blur"),
NULL);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3d39d9e..0ae483b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -51,7 +51,7 @@ operations/common/matting-global.c
operations/common/mblur.c
operations/common/mirrors.c
operations/common/mono-mixer.c
-operations/common/motion-blur.c
+operations/common/motion-blur-linear.c
operations/common/motion-blur-zoom.c
operations/common/noise.c
operations/common/noise-cielch.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
