griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v2.81-release'

Browse Source
This commit is contained in:
Campbell Barton
2019-10-30 00:15:29 +11:00
parent a05be009a5 bcac0ed977
commit 455ccac5b8
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/compositor/operations/COM_OpenCLKernels.cl
View File

@@ -26,22 +26,22 @@
const sampler_t SAMPLER_NEAREST = CLK_NORMALIZED_COORDS_FALSE | CLK_ADDRESS_CLAMP_TO_EDGE | CLK_FILTER_NEAREST;
const sampler_t SAMPLER_NEAREST_CLAMP = CLK_NORMALIZED_COORDS_FALSE | CLK_ADDRESS_CLAMP | CLK_FILTER_NEAREST;
__constant const int zero = {0,0};
__constant const int2 zero = {0,0};
// KERNEL --- BOKEH BLUR ---
__kernel void bokehBlurKernel(__read_only image2d_t boundingBox, __read_only image2d_t inputImage,
__read_only image2d_t bokehImage, __write_only image2d_t output,
int offsetInput, int offsetOutput, int radius, int step, int dimension, int offset)
int2 offsetInput, int2 offsetOutput, int radius, int step, int2 dimension, int2 offset)
{
int coords = {get_global_id(0), get_global_id(1)};
int2 coords = {get_global_id(0), get_global_id(1)};
coords += offset;
float tempBoundingBox;
float color = {0.0f,0.0f,0.0f,0.0f};
float multiplyer = {0.0f,0.0f,0.0f,0.0f};
float bokeh;
float4 color = {0.0f,0.0f,0.0f,0.0f};
float4 multiplyer = {0.0f,0.0f,0.0f,0.0f};
float4 bokeh;
const float radius2 = radius*2.0f;
const int realCoordinate = coords + offsetOutput;
int imageCoordinates = realCoordinate - offsetInput;
const int2 realCoordinate = coords + offsetOutput;
int2 imageCoordinates = realCoordinate - offsetInput;
tempBoundingBox = read_imagef(boundingBox, SAMPLER_NEAREST, coords).s0;