From bcac0ed977c9e2eb2610bceda4b447947c2d199d Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Tue, 29 Oct 2019 09:35:24 +0100 Subject: Fix T70913: OpenCL Compiler Errors Reverting part of a clean up that was done 6 months ago. The consequence was that OpenCL compositing wasn't working since then. --- .../blender/compositor/operations/COM_OpenCLKernels.cl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source/blender') diff --git a/source/blender/compositor/operations/COM_OpenCLKernels.cl b/source/blender/compositor/operations/COM_OpenCLKernels.cl index 4dfca1777f1..ebe8a6d08ec 100644 --- a/source/blender/compositor/operations/COM_OpenCLKernels.cl +++ b/source/blender/compositor/operations/COM_OpenCLKernels.cl @@ -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; -- cgit v1.2.3