[Bf-blender-cvs] [d9dc1ed] opensubdiv-modifier: Fix compilation error in Compositor after clew updates

[Sergey Sharybin]

Commit: d9dc1ed6a3d0682f1d84d6b3d4a8504abd4bd523
Author: Sergey Sharybin
Date:   Mon May 26 14:58:52 2014 +0600
https://developer.blender.org/rBd9dc1ed6a3d0682f1d84d6b3d4a8504abd4bd523

Fix compilation error in Compositor after clew updates

===================================================================

M	extern/clew/CMakeLists.txt
M	extern/clew/SConscript
M	extern/clew/include/clew.h
M	source/blender/compositor/CMakeLists.txt
M	source/blender/compositor/SConscript
M	source/blender/compositor/intern/COM_OpenCLDevice.cpp
M	source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp

===================================================================

diff --git a/extern/clew/CMakeLists.txt b/extern/clew/CMakeLists.txt
index 891c330..f75e933 100644
--- a/extern/clew/CMakeLists.txt
+++ b/extern/clew/CMakeLists.txt
@@ -37,5 +37,6 @@ set(SRC
 	src/clew.c
 )
 
+add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_1_APIS)
 
 blender_add_lib(extern_clew "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/extern/clew/SConscript b/extern/clew/SConscript
index 2b6117a..b96b6a8 100644
--- a/extern/clew/SConscript
+++ b/extern/clew/SConscript
@@ -30,5 +30,6 @@ Import ('env')
 sources = env.Glob('src/clew.c')
 
 incs = 'include'
+defs = [CL_USE_DEPRECATED_OPENCL_1_1_APIS]
 
-env.BlenderLib ( 'clew', sources, Split(incs), libtype=['core','player'], priority = [192,192] )
+env.BlenderLib ( 'clew', sources, Split(incs), defines=defs, libtype=['core','player'], priority = [192,192] )
diff --git a/extern/clew/include/clew.h b/extern/clew/include/clew.h
index 7f5add2..a99634f 100644
--- a/extern/clew/include/clew.h
+++ b/extern/clew/include/clew.h
@@ -89,7 +89,7 @@ extern "C" {
     #define CL_API_SUFFIX__VERSION_1_2
     #define CL_EXT_SUFFIX__VERSION_1_2
 
-    #ifdef __GNUC__
+    #if defined(__GNUC__)
         #ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS
             #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED
             #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED
@@ -105,7 +105,7 @@ extern "C" {
             #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED __attribute__((deprecated))
             #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED
         #endif
-    #elif _WIN32
+    #elif defined(_WIN32)
         #ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS
             #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED
             #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index fddcfd7..c6a12bc 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -535,4 +535,6 @@ list(APPEND INC
 data_to_c(${CMAKE_CURRENT_SOURCE_DIR}/operations/COM_OpenCLKernels.cl
           ${CMAKE_CURRENT_BINARY_DIR}/operations/COM_OpenCLKernels.cl.h SRC)
 
+add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_1_APIS)
+
 blender_add_lib(bf_compositor "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/compositor/SConscript b/source/blender/compositor/SConscript
index dd12fb6..eab4087 100644
--- a/source/blender/compositor/SConscript
+++ b/source/blender/compositor/SConscript
@@ -26,7 +26,7 @@
 # ***** END GPL LICENSE BLOCK *****
 
 Import ('env')
-defs = ['GLEW_STATIC']
+defs = ['GLEW_STATIC', 'CL_USE_DEPRECATED_OPENCL_1_1_APIS']
 
 sources_intern = env.Glob('intern/*.cpp')
 sources_nodes = env.Glob('nodes/*.cpp')
diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.cpp b/source/blender/compositor/intern/COM_OpenCLDevice.cpp
index 2cfc10c..c5b663d 100644
--- a/source/blender/compositor/intern/COM_OpenCLDevice.cpp
+++ b/source/blender/compositor/intern/COM_OpenCLDevice.cpp
@@ -103,7 +103,7 @@ void OpenCLDevice::COM_clAttachMemoryBufferOffsetToKernelParameter(cl_kernel ker
 	if (offsetIndex != -1) {
 		cl_int error;
 		rcti *rect = memoryBuffer->getRect();
-		cl_int2 offset = {rect->xmin, rect->ymin};
+		cl_int2 offset = {{rect->xmin, rect->ymin}};
 
 		error = clSetKernelArg(kernel, offsetIndex, sizeof(cl_int2), &offset);
 		if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));  }
@@ -114,7 +114,7 @@ void OpenCLDevice::COM_clAttachSizeToKernelParameter(cl_kernel kernel, int offse
 {
 	if (offsetIndex != -1) {
 		cl_int error;
-		cl_int2 offset = {(cl_int)operation->getWidth(), (cl_int)operation->getHeight()};
+		cl_int2 offset = {{(cl_int)operation->getWidth(), (cl_int)operation->getHeight()}};
 
 		error = clSetKernelArg(kernel, offsetIndex, sizeof(cl_int2), &offset);
 		if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));  }
@@ -154,7 +154,7 @@ void OpenCLDevice::COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer *outputMemo
 
 	bool breaked = false;
 	for (offsety = 0; offsety < height && (!breaked); offsety += localSize) {
-		offset[1] = offsety;
+		offset.y = offsety;
 		if (offsety + localSize < height) {
 			size[1] = localSize;
 		}
@@ -169,7 +169,7 @@ void OpenCLDevice::COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer *outputMemo
 			else {
 				size[0] = width - offsetx;
 			}
-			offset[0] = offsetx;
+			offset.x = offsetx;
 
 			error = clSetKernelArg(kernel, offsetIndex, sizeof(cl_int2), &offset);
 			if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); }
diff --git a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
index 0cea2a7..67f5293 100644
--- a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
@@ -109,8 +109,8 @@ void DirectionalBlurOperation::executeOpenCL(OpenCLDevice *device,
 	cl_kernel directionalBlurKernel = device->COM_clCreateKernel("directionalBlurKernel", NULL);
 
 	cl_int iterations = pow(2.0f, this->m_data->iter);
-	cl_float2 ltxy = {this->m_tx,  this->m_ty};
-	cl_float2 centerpix = {this->m_center_x_pix, this->m_center_y_pix};
+	cl_float2 ltxy = {{this->m_tx,  this->m_ty}};
+	cl_float2 centerpix = {{this->m_center_x_pix, this->m_center_y_pix}};
 	cl_float lsc = this->m_sc;
 	cl_float lrot = this->m_rot;