Merge branch 'master' into blender2.8

3 files changed, 92 insertions, 83 deletions

diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp
index d76eaf793b4..7d4c3325a15 100644
--- a/intern/cycles/render/buffers.cpp
+++ b/intern/cycles/render/buffers.cpp
@@ -116,7 +116,7 @@ RenderTile::RenderTile()
 
 RenderBuffers::RenderBuffers(Device *device)
 : buffer(device, "RenderBuffers", MEM_READ_WRITE),
-  map_neighbor_copied(false)
+  map_neighbor_copied(false), render_time(0.0f)
 {
 }
 
@@ -264,6 +264,12 @@ bool RenderBuffers::get_pass_rect(PassType type, float exposure, int sample, int
 				}
 			}
 #endif
+			else if(type == PASS_RENDER_TIME) {
+				float val = (float) (1000.0 * render_time/(params.width * params.height * sample));
+				for(int i = 0; i < size; i++, pixels++) {
+					pixels[0] = val;
+				}
+			}
 			else {
 				for(int i = 0; i < size; i++, in += pass_stride, pixels++) {
 					float f = *in;
diff --git a/intern/cycles/render/buffers.h b/intern/cycles/render/buffers.h
index 9fa0cdd4e27..028bfb83735 100644
--- a/intern/cycles/render/buffers.h
+++ b/intern/cycles/render/buffers.h
@@ -75,6 +75,7 @@ public:
 	/* float buffer */
 	device_vector<float> buffer;
 	bool map_neighbor_copied;
+	double render_time;
 
 	explicit RenderBuffers(Device *device);
 	~RenderBuffers();
diff --git a/intern/cycles/render/film.cpp b/intern/cycles/render/film.cpp
index c8213d258d5..6c8c929c2f9 100644
--- a/intern/cycles/render/film.cpp
+++ b/intern/cycles/render/film.cpp
@@ -85,83 +85,81 @@ void Pass::add(PassType type, array<Pass>& passes)
 			pass.components = 1;
 			pass.filter = false;
 			break;
-		case PASS_DIFFUSE_COLOR:
-		case PASS_GLOSSY_COLOR:
-		case PASS_TRANSMISSION_COLOR:
-		case PASS_SUBSURFACE_COLOR:
-			pass.components = 4;
-			break;
-		case PASS_DIFFUSE_INDIRECT:
+
+		case PASS_EMISSION:
+		case PASS_BACKGROUND:
 			pass.components = 4;
 			pass.exposure = true;
-			pass.divide_type = PASS_DIFFUSE_COLOR;
 			break;
-		case PASS_GLOSSY_INDIRECT:
+		case PASS_AO:
 			pass.components = 4;
-			pass.exposure = true;
-			pass.divide_type = PASS_GLOSSY_COLOR;
 			break;
-		case PASS_TRANSMISSION_INDIRECT:
+		case PASS_SHADOW:
 			pass.components = 4;
-			pass.exposure = true;
-			pass.divide_type = PASS_TRANSMISSION_COLOR;
+			pass.exposure = false;
 			break;
-		case PASS_SUBSURFACE_INDIRECT:
+		case PASS_LIGHT:
+			/* This isn't a real pass, used by baking to see whether
+			 * light data is needed or not.
+			 *
+			 * Set components to 0 so pass sort below happens in a
+			 * determined way.
+			 */
+			pass.components = 0;
+			break;
+#ifdef WITH_CYCLES_DEBUG
+		case PASS_BVH_TRAVERSED_NODES:
+		case PASS_BVH_TRAVERSED_INSTANCES:
+		case PASS_BVH_INTERSECTIONS:
+		case PASS_RAY_BOUNCES:
+			pass.components = 1;
+			pass.exposure = false;
+			break;
+#endif
+		case PASS_RENDER_TIME:
+			/* This pass is handled entirely on the host side. */
+			pass.components = 0;
+			break;
+
+		case PASS_DIFFUSE_COLOR:
+		case PASS_GLOSSY_COLOR:
+		case PASS_TRANSMISSION_COLOR:
+		case PASS_SUBSURFACE_COLOR:
 			pass.components = 4;
-			pass.exposure = true;
-			pass.divide_type = PASS_SUBSURFACE_COLOR;
 			break;
 		case PASS_DIFFUSE_DIRECT:
+		case PASS_DIFFUSE_INDIRECT:
 			pass.components = 4;
 			pass.exposure = true;
 			pass.divide_type = PASS_DIFFUSE_COLOR;
 			break;
 		case PASS_GLOSSY_DIRECT:
+		case PASS_GLOSSY_INDIRECT:
 			pass.components = 4;
 			pass.exposure = true;
 			pass.divide_type = PASS_GLOSSY_COLOR;
 			break;
 		case PASS_TRANSMISSION_DIRECT:
+		case PASS_TRANSMISSION_INDIRECT:
 			pass.components = 4;
 			pass.exposure = true;
 			pass.divide_type = PASS_TRANSMISSION_COLOR;
 			break;
 		case PASS_SUBSURFACE_DIRECT:
+		case PASS_SUBSURFACE_INDIRECT:
 			pass.components = 4;
 			pass.exposure = true;
 			pass.divide_type = PASS_SUBSURFACE_COLOR;
 			break;
-
-		case PASS_EMISSION:
-		case PASS_BACKGROUND:
+		case PASS_VOLUME_DIRECT:
+		case PASS_VOLUME_INDIRECT:
 			pass.components = 4;
 			pass.exposure = true;
 			break;
-		case PASS_AO:
-			pass.components = 4;
-			break;
-		case PASS_SHADOW:
-			pass.components = 4;
-			pass.exposure = false;
-			break;
-		case PASS_LIGHT:
-			/* This isn't a real pass, used by baking to see whether
-			 * light data is needed or not.
-			 *
-			 * Set components to 0 so pass sort below happens in a
-			 * determined way.
-			 */
-			pass.components = 0;
-			break;
-#ifdef WITH_CYCLES_DEBUG
-		case PASS_BVH_TRAVERSED_NODES:
-		case PASS_BVH_TRAVERSED_INSTANCES:
-		case PASS_BVH_INTERSECTIONS:
-		case PASS_RAY_BOUNCES:
-			pass.components = 1;
-			pass.exposure = false;
+
+		default:
+			assert(false);
 			break;
-#endif
 	}
 
 	passes.push_back_slow(pass);
@@ -318,7 +316,19 @@ void Film::device_update(Device *device, DeviceScene *dscene, Scene *scene)
 
 	for(size_t i = 0; i < passes.size(); i++) {
 		Pass& pass = passes[i];
-		kfilm->pass_flag |= pass.type;
+
+		if(pass.type == PASS_NONE)
+			continue;
+
+		int pass_flag = (1 << (pass.type % 32));
+		if(pass.type <= PASS_CATEGORY_MAIN_END) {
+			kfilm->pass_flag |= pass_flag;
+		}
+		else {
+			assert(pass.type <= PASS_CATEGORY_LIGHT_END);
+			kfilm->use_light_pass = 1;
+			kfilm->light_pass_flag |= pass_flag;
+		}
 
 		switch(pass.type) {
 			case PASS_COMBINED:
@@ -327,10 +337,6 @@ void Film::device_update(Device *device, DeviceScene *dscene, Scene *scene)
 			case PASS_DEPTH:
 				kfilm->pass_depth = kfilm->pass_stride;
 				break;
-			case PASS_MIST:
-				kfilm->pass_mist = kfilm->pass_stride;
-				kfilm->use_light_pass = 1;
-				break;
 			case PASS_NORMAL:
 				kfilm->pass_normal = kfilm->pass_stride;
 				break;
@@ -349,74 +355,67 @@ void Film::device_update(Device *device, DeviceScene *dscene, Scene *scene)
 			case PASS_MATERIAL_ID:
 				kfilm->pass_material_id = kfilm->pass_stride;
 				break;
+
+			case PASS_MIST:
+				kfilm->pass_mist = kfilm->pass_stride;
+				break;
+			case PASS_EMISSION:
+				kfilm->pass_emission = kfilm->pass_stride;
+				break;
+			case PASS_BACKGROUND:
+				kfilm->pass_background = kfilm->pass_stride;
+				break;
+			case PASS_AO:
+				kfilm->pass_ao = kfilm->pass_stride;
+				break;
+			case PASS_SHADOW:
+				kfilm->pass_shadow = kfilm->pass_stride;
+				break;
+
+			case PASS_LIGHT:
+				break;
+
 			case PASS_DIFFUSE_COLOR:
 				kfilm->pass_diffuse_color = kfilm->pass_stride;
-				kfilm->use_light_pass = 1;
 				break;
 			case PASS_GLOSSY_COLOR:
 				kfilm->pass_glossy_color = kfilm->pass_stride;
-				kfilm->use_light_pass = 1;
 				break;
 			case PASS_TRANSMISSION_COLOR:
 				kfilm->pass_transmission_color = kfilm->pass_stride;
-				kfilm->use_light_pass = 1;
 				break;
 			case PASS_SUBSURFACE_COLOR:
 				kfilm->pass_subsurface_color = kfilm->pass_stride;
-				kfilm->use_light_pass = 1;
 				break;
 			case PASS_DIFFUSE_INDIRECT:
 				kfilm->pass_diffuse_indirect = kfilm->pass_stride;
-				kfilm->use_light_pass = 1;
 				break;
 			case PASS_GLOSSY_INDIRECT:
 				kfilm->pass_glossy_indirect = kfilm->pass_stride;
-				kfilm->use_light_pass = 1;
 				break;
 			case PASS_TRANSMISSION_INDIRECT:
 				kfilm->pass_transmission_indirect = kfilm->pass_stride;
-				kfilm->use_light_pass = 1;
 				break;
 			case PASS_SUBSURFACE_INDIRECT:
 				kfilm->pass_subsurface_indirect = kfilm->pass_stride;
-				kfilm->use_light_pass = 1;
+				break;
+			case PASS_VOLUME_INDIRECT:
+				kfilm->pass_volume_indirect = kfilm->pass_stride;
 				break;
 			case PASS_DIFFUSE_DIRECT:
 				kfilm->pass_diffuse_direct = kfilm->pass_stride;
-				kfilm->use_light_pass = 1;
 				break;
 			case PASS_GLOSSY_DIRECT:
 				kfilm->pass_glossy_direct = kfilm->pass_stride;
-				kfilm->use_light_pass = 1;
 				break;
 			case PASS_TRANSMISSION_DIRECT:
 				kfilm->pass_transmission_direct = kfilm->pass_stride;
-				kfilm->use_light_pass = 1;
 				break;
 			case PASS_SUBSURFACE_DIRECT:
 				kfilm->pass_subsurface_direct = kfilm->pass_stride;
-				kfilm->use_light_pass = 1;
 				break;
-
-			case PASS_EMISSION:
-				kfilm->pass_emission = kfilm->pass_stride;
-				kfilm->use_light_pass = 1;
-				break;
-			case PASS_BACKGROUND:
-				kfilm->pass_background = kfilm->pass_stride;
-				kfilm->use_light_pass = 1;
-				break;
-			case PASS_AO:
-				kfilm->pass_ao = kfilm->pass_stride;
-				kfilm->use_light_pass = 1;
-				break;
-			case PASS_SHADOW:
-				kfilm->pass_shadow = kfilm->pass_stride;
-				kfilm->use_light_pass = 1;
-				break;
-
-			case PASS_LIGHT:
-				kfilm->use_light_pass = 1;
+			case PASS_VOLUME_DIRECT:
+				kfilm->pass_volume_direct = kfilm->pass_stride;
 				break;
 
 #ifdef WITH_CYCLES_DEBUG
@@ -433,8 +432,11 @@ void Film::device_update(Device *device, DeviceScene *dscene, Scene *scene)
 				kfilm->pass_ray_bounces = kfilm->pass_stride;
 				break;
 #endif
+			case PASS_RENDER_TIME:
+				break;
 
-			case PASS_NONE:
+			default:
+				assert(false);
 				break;
 		}