[Bf-blender-cvs] [a1447e9] temp-cycles-microdisplacement: Merge remote-tracking branch 'origin/master' into temp-cycles-microdisplacement

[Lukas Stockner]

Commit: a1447e96be65e33374bcec5df5dc6b88b4349b92
Author: Lukas Stockner
Date:   Thu May 12 18:00:42 2016 +0200
Branches: temp-cycles-microdisplacement
https://developer.blender.org/rBa1447e96be65e33374bcec5df5dc6b88b4349b92

Merge remote-tracking branch 'origin/master' into temp-cycles-microdisplacement

Conflicts:
	intern/cycles/kernel/kernel_globals.h

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



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

diff --cc intern/cycles/kernel/kernel_globals.h
index 10e53b1,c44ea1b..552a3e1
--- a/intern/cycles/kernel/kernel_globals.h
+++ b/intern/cycles/kernel/kernel_globals.h
@@@ -31,15 -31,11 +31,17 @@@ struct OSLThreadData
  struct OSLShadingSystem;
  #  endif
  
 +struct GeomCache;
 +struct GeomCacheThreadData;
 +
 +#  define MAX_BYTE_IMAGES   1024
 +#  define MAX_FLOAT4_IMAGES  1024
 +
  typedef struct KernelGlobals {
- 	texture_image_uchar4 texture_byte_images[MAX_BYTE_IMAGES];
- 	texture_image_float4 texture_float4_images[MAX_FLOAT4_IMAGES];
+ 	texture_image_uchar4 texture_byte4_images[TEX_NUM_BYTE4_IMAGES_CPU];
+ 	texture_image_float4 texture_float4_images[TEX_NUM_FLOAT4_IMAGES_CPU];
+ 	texture_image_float texture_float_images[TEX_NUM_FLOAT_IMAGES_CPU];
+ 	texture_image_uchar texture_byte_images[TEX_NUM_BYTE_IMAGES_CPU];
  
  #  define KERNEL_TEX(type, ttype, name) ttype name;
  #  define KERNEL_IMAGE_TEX(type, ttype, name)
diff --cc intern/cycles/render/attribute.h
index 9579e42,01102d2..d9dd782
--- a/intern/cycles/render/attribute.h
+++ b/intern/cycles/render/attribute.h
@@@ -131,12 -130,12 +131,12 @@@ public
  	AttributeStandard std;
  
  	/* temporary variables used by MeshManager */
 -	TypeDesc triangle_type, curve_type;
 -	AttributeElement triangle_element, curve_element;
 -	int triangle_offset, curve_offset;
 +	TypeDesc triangle_type, curve_type, subd_type;
 +	AttributeElement triangle_element, curve_element, subd_element;
 +	int triangle_offset, curve_offset, subd_offset;
  
- 	AttributeRequest(ustring name_);
- 	AttributeRequest(AttributeStandard std);
+ 	explicit AttributeRequest(ustring name_);
+ 	explicit AttributeRequest(AttributeStandard std);
  };
  
  /* AttributeRequestSet
diff --cc intern/cycles/subd/subd_dice.h
index d3d1977,49f786e..ec57003
--- a/intern/cycles/subd/subd_dice.h
+++ b/intern/cycles/subd/subd_dice.h
@@@ -103,10 -111,8 +103,10 @@@ public
  		int tv1;
  	};
  
- 	QuadDice(const SubdParams& params);
+ 	explicit QuadDice(const SubdParams& params);
  
 +	void diced_size(SubPatch& sub, EdgeFactors& ef, uint* num_verts, uint* num_tris);
 +	void calc_size(EdgeFactors& ef, int Mu, int Mv, uint* num_verts, uint* num_tris);
  	void reserve(EdgeFactors& ef, int Mu, int Mv);
  	float3 eval_projected(SubPatch& sub, float u, float v);
  
@@@ -159,10 -165,8 +159,10 @@@ public
  		int tw;
  	};
  
- 	TriangleDice(const SubdParams& params);
+ 	explicit TriangleDice(const SubdParams& params);
  
 +	void diced_size(SubPatch& sub, EdgeFactors& ef, uint* num_verts, uint* num_tris);
 +	void calc_size(EdgeFactors& ef, int M, uint* num_verts, uint* num_tris);
  	void reserve(EdgeFactors& ef, int M);
  
  	float2 map_uv(SubPatch& sub, float2 uv);