Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for own error with opencl bokeh blur.

Browse Source
This commit is contained in:
Campbell Barton
2012-08-11 18:47:09 +00:00
parent df1dd658c9
commit 823083a744
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/cmake/macros.cmake
View File

@@ -727,7 +727,6 @@ macro(set_lib_path
endmacro() endmacro()
# TODO, create a C binary and call it instead!, doing this in cmake its slow
macro(data_to_c macro(data_to_c
file_from file_to file_from file_to
list_to_add) list_to_add)
@@ -744,6 +743,7 @@ macro(data_to_c
unset(_file_to_path) unset(_file_to_path)
endmacro() endmacro()
# same as above but generates the var name and output automatic. # same as above but generates the var name and output automatic.
macro(data_to_c_simple macro(data_to_c_simple
file_from file_from

2
source/blender/compositor/operations/COM_OpenCLKernels.cl
View 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, __kernel void defocusKernel(__read_only image2d_t inputImage, __read_only image2d_t bokehImage,
__read_only image2d_t inputSize, __read_only image2d_t inputSize,
__write_only image2d_t output, int2 offsetInput, int2 offsetOutput, __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}; float4 color = {1.0f, 0.0f, 0.0f, 1.0f};
int2 coords = {get_global_id(0), get_global_id(1)}; int2 coords = {get_global_id(0), get_global_id(1)};