fix for own error with opencl bokeh blur.
authorCampbell Barton <ideasman42@gmail.com>
Sat, 11 Aug 2012 18:47:09 +0000 (18:47 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 11 Aug 2012 18:47:09 +0000 (18:47 +0000)
build_files/cmake/macros.cmake
source/blender/compositor/operations/COM_OpenCLKernels.cl

index 1340920eafa460d83de341bc384fe25a8a40841f..62e1e83326c7f4c069f880795f3892b4a8f9d1a3 100644 (file)
@@ -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
index 7366db19444e2f4f728dde985945a9b5e5804055..4d366a864c46b2b7f1b2874b11fef6cc17272306 100644 (file)
@@ -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)};