[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49819] trunk/blender: fix for own error with opencl bokeh blur.

[Campbell Barton]

Revision: 49819
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49819
Author:   campbellbarton
Date:     2012-08-11 18:47:09 +0000 (Sat, 11 Aug 2012)
Log Message:
-----------
fix for own error with opencl bokeh blur.

Modified Paths:
--------------
    trunk/blender/build_files/cmake/macros.cmake
    trunk/blender/source/blender/compositor/operations/COM_OpenCLKernels.cl

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2012-08-11 18:40:15 UTC (rev 49818)
+++ trunk/blender/build_files/cmake/macros.cmake	2012-08-11 18:47:09 UTC (rev 49819)
@@ -727,7 +727,6 @@
 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 @@
 	unset(_file_to_path)
 endmacro()
 
+
 # same as above but generates the var name and output automatic.
 macro(data_to_c_simple
       file_from

Modified: trunk/blender/source/blender/compositor/operations/COM_OpenCLKernels.cl
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_OpenCLKernels.cl	2012-08-11 18:40:15 UTC (rev 49818)
+++ trunk/blender/source/blender/compositor/operations/COM_OpenCLKernels.cl	2012-08-11 18:47:09 UTC (rev 49819)
@@ -78,7 +78,7 @@
 __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)};