[Bf-blender-cvs] [98a1c684cd8] cycles_texture_cache: Cycles: Fixed build on Linux and OpenCL.

[Stefan Werner]

Commit: 98a1c684cd8c9831db59bac4ffa1fa024249ac11
Author: Stefan Werner
Date:   Mon Oct 15 11:16:32 2018 +0200
Branches: cycles_texture_cache
https://developer.blender.org/rB98a1c684cd8c9831db59bac4ffa1fa024249ac11

Cycles: Fixed build on Linux and OpenCL.

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

M	intern/cycles/kernel/kernel_differential.h
M	intern/cycles/kernel/kernel_light.h
M	intern/cycles/render/nodes.cpp
M	intern/cycles/render/scene.h

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

diff --git a/intern/cycles/kernel/kernel_differential.h b/intern/cycles/kernel/kernel_differential.h
index d1f77f2f89f..0c63b81ba85 100644
--- a/intern/cycles/kernel/kernel_differential.h
+++ b/intern/cycles/kernel/kernel_differential.h
@@ -31,7 +31,7 @@ ccl_device void differential_transfer(ccl_addr_space differential3 *dP_, const d
 	dP_->dy = tmpy - dot(tmpy, Ng)*tmp;
 }
 
-ccl_device void differential_reflect(ccl_addr_space differential3 *dD_, float3 D, const differential3* dD, float3 N, const differential3* dN)
+ccl_device void differential_reflect(differential3 *dD_, float3 D, const ccl_addr_space differential3* dD, float3 N, const differential3* dN)
 {
 	/* ray differential transfer through homogeneous medium, to
 	 * compute dPdx/dy at a shading point from the incoming ray */
diff --git a/intern/cycles/kernel/kernel_light.h b/intern/cycles/kernel/kernel_light.h
index 36587e1f6af..d10744a32e7 100644
--- a/intern/cycles/kernel/kernel_light.h
+++ b/intern/cycles/kernel/kernel_light.h
@@ -769,7 +769,7 @@ ccl_device bool lamp_light_eval(KernelGlobals *kg, int lamp, float3 P, float3 D,
 	return true;
 }
 
-ccl_device void lamp_light_dPdudv(KernelGlobals *kg, int lamp, float u, float v, float3 *dPdu, float3 *dPdv )
+ccl_device void lamp_light_dPdudv(KernelGlobals *kg, int lamp, float u, float v, ccl_addr_space float3 *dPdu, ccl_addr_space float3 *dPdv )
 {
 	const ccl_global KernelLight *klight = &kernel_tex_fetch(__lights, lamp);
 	LightType type = (LightType)klight->type;
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 68d0c75b107..bae60525dfd 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -338,7 +338,7 @@ void ImageTextureNode::compile(SVMCompiler& compiler)
 		}
 		else {
 			/* Blend is a float between 0 and 1. Convert to 16 bit unsigned int to make room for vector_dx and vector_dy. */
-			uint blend = clamp(projection_blend, 0.0f, 1.0f) * 65535.0f;
+			uint blend = clamp((uint)(projection_blend * 65535.0f), 0, 0xffff);
 			compiler.add_node(NODE_TEX_IMAGE_BOX,
 				slot,
 				compiler.encode_uchar4(
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h
index b56e53bac72..7e59fdbe1d3 100644
--- a/intern/cycles/render/scene.h
+++ b/intern/cycles/render/scene.h
@@ -137,7 +137,7 @@ public:
 	
 	bool modified(const TextureCacheParams& params)
 	{
-		return !(use_cache == use_cache
+		return !(use_cache == params.use_cache
 		         && cache_size == params.cache_size
 				 && tile_size == params.tile_size
 				 && diffuse_blur == params.diffuse_blur