diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-11 22:47:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-11 22:47:09 +0400 |
| commit | 823083a744db2179432b47320f7fa8d86245837c (patch) | |
| tree | b4dca3b76accda02dac75f2fd2a7a93dd6a1de36 | |
| parent | df1dd658c9554cf53040f05e6a4926c0b6e70e95 (diff) | |
fix for own error with opencl bokeh blur.
| -rw-r--r-- | build_files/cmake/macros.cmake | 2 | ||||
| -rw-r--r-- | source/blender/compositor/operations/COM_OpenCLKernels.cl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 1340920eafa..62e1e83326c 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -727,7 +727,6 @@ macro(set_lib_path endmacro() -# TODO, create a C binary and call it instead!, doing this in cmake its slow macro(data_to_c file_from file_to list_to_add) @@ -744,6 +743,7 @@ macro(data_to_c unset(_file_to_path) endmacro() + # same as above but generates the var name and output automatic. macro(data_to_c_simple file_from diff --git a/source/blender/compositor/operations/COM_OpenCLKernels.cl b/source/blender/compositor/operations/COM_OpenCLKernels.cl index 7366db19444..4d366a864c4 100644 --- a/source/blender/compositor/operations/COM_OpenCLKernels.cl +++ b/source/blender/compositor/operations/COM_OpenCLKernels.cl @@ -78,7 +78,7 @@ __kernel void bokehBlurKernel(__read_only image2d_t boundingBox, __read_only ima __kernel void defocusKernel(__read_only image2d_t inputImage, __read_only image2d_t bokehImage, __read_only image2d_t inputSize, __write_only image2d_t output, int2 offsetInput, int2 offsetOutput, - int step, int maxBlurScalar, float threshold, int2 dimension, int2 offset, float scalar) + int step, int maxBlurScalar, float threshold, float scalar, int2 dimension, int2 offset) { float4 color = {1.0f, 0.0f, 0.0f, 1.0f}; int2 coords = {get_global_id(0), get_global_id(1)}; |