[Bf-blender-cvs] [c6b5ea0] cycles_kernel_split: Cycles kernel split: Fix compilation error after recent changes

Sergey Sharybin noreply at git.blender.org
Mon May 4 16:52:51 CEST 2015


Commit: c6b5ea0021e06387dfc32f3d1e4c13fa2b54215b
Author: Sergey Sharybin
Date:   Mon May 4 19:51:57 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rBc6b5ea0021e06387dfc32f3d1e4c13fa2b54215b

Cycles kernel split: Fix compilation error after recent changes

this includes compilation fix for OSL and some tweaks to code to make
strict compiler flags happy,

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

M	intern/cycles/device/device_opencl.cpp
M	intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
M	intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
M	intern/cycles/kernel/osl/osl_bssrdf.cpp

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

diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index f7df286..cb3b06f 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -2546,7 +2546,7 @@ public:
 			clReleaseProgram(sumAllRadiance_program);
 	}
 
-	void path_trace(RenderTile& rtile, int sample)
+	void path_trace(RenderTile& rtile, int /*sample*/)
 	{
 		/* cast arguments to cl types */
 		cl_mem d_data = CL_MEM_PTR(const_mem_map["__data"]->device_pointer);
@@ -3297,10 +3297,6 @@ public:
 		size_t tile_specific_mem_allocated = 0;
 
 		/* Get required tile info */
-		cl_int d_w = rtile.w;
-		cl_int d_h = rtile.h;
-		cl_mem d_buffer = CL_MEM_PTR(rtile.buffer);
-		cl_mem d_rng_state = CL_MEM_PTR(rtile.rng_state);
 		unsigned int user_set_tile_w = rtile.tile_size.x;
 		unsigned int user_set_tile_h = rtile.tile_size.y;
 
@@ -3321,7 +3317,7 @@ public:
 	}
 
 	/* Calculates the texture memories that has been allocated */
-	size_t get_scene_specific_mem_allocated(cl_mem d_data) {
+	size_t get_scene_specific_mem_allocated(cl_mem /*d_data*/) {
 		size_t scene_specific_mem_allocated = 0;
 		/* Calculate texture memories */
 #define KERNEL_TEX(type, ttype, name) \
@@ -3634,7 +3630,9 @@ The current tile of dimensions %dx%d is split into tiles of dimension %dx%d for
 /* Returns true in case of successful detection of platform and device type,
 * else returns false
 */
-bool get_platform_and_devicetype(const DeviceInfo info, string &platform_name, cl_device_type &device_type) {
+static bool get_platform_and_devicetype(const DeviceInfo info,
+                                        string &platform_name,
+                                        cl_device_type &device_type) {
 	cl_platform_id platform_id;
 	cl_device_id device_id;
 	cl_uint num_platforms;
diff --git a/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp b/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
index 8f9c2ef..43929fb 100644
--- a/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
+++ b/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
@@ -34,6 +34,7 @@
 
 #include <OSL/genclosure.h>
 
+#include "kernel_compat_cpu.h"
 #include "osl_closures.h"
 
 #include "kernel_types.h"
diff --git a/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp b/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
index c585174..497c4f0 100644
--- a/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
+++ b/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
@@ -34,6 +34,7 @@
 
 #include <OSL/genclosure.h>
 
+#include "kernel_compat_cpu.h"
 #include "osl_closures.h"
 
 #include "kernel_types.h"
diff --git a/intern/cycles/kernel/osl/osl_bssrdf.cpp b/intern/cycles/kernel/osl/osl_bssrdf.cpp
index 84ef85e..8899803 100644
--- a/intern/cycles/kernel/osl/osl_bssrdf.cpp
+++ b/intern/cycles/kernel/osl/osl_bssrdf.cpp
@@ -34,6 +34,7 @@
 
 #include <OSL/genclosure.h>
 
+#include "kernel_compat_cpu.h"
 #include "osl_bssrdf.h"
 #include "osl_closures.h"




More information about the Bf-blender-cvs mailing list