[Bf-blender-cvs] [1e1d34654b4] blender2.8: Eevee / DRW : Codestyle

[Clément Foucault]

Commit: 1e1d34654b4d314bfd4925557f6378455df88a61
Author: Clément Foucault
Date:   Tue Sep 12 15:03:34 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB1e1d34654b4d314bfd4925557f6378455df88a61

Eevee / DRW : Codestyle

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

M	source/blender/draw/engines/eevee/shaders/lamps_lib.glsl
M	source/blender/draw/intern/draw_manager.c

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

diff --git a/source/blender/draw/engines/eevee/shaders/lamps_lib.glsl b/source/blender/draw/engines/eevee/shaders/lamps_lib.glsl
index 24b94f6d380..676aa2c9748 100644
--- a/source/blender/draw/engines/eevee/shaders/lamps_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/lamps_lib.glsl
@@ -121,19 +121,12 @@ float shadow_cascade(ShadowData sd, ShadowCascadeData scd, float texid, vec3 W)
 
 	vec4 vis = vec4(1.0);
 	float range = abs(sd.sh_far - sd.sh_near); /* Same factor as in get_cascade_world_distance(). */
-	/* Branching is reaally slooow on intel */
-	// if (weights.x > 0.0) {
-		vis.x = evaluate_cascade(sd, scd.shadowmat[0], W, range, texid + 0);
-	// }
-	// if (weights.y > 0.0) {
-		vis.y = evaluate_cascade(sd, scd.shadowmat[1], W, range, texid + 1);
-	// }
-	// if (weights.z > 0.0) {
-		vis.z = evaluate_cascade(sd, scd.shadowmat[2], W, range, texid + 2);
-	// }
-	// if (weights.w > 0.0) {
-		vis.w = evaluate_cascade(sd, scd.shadowmat[3], W, range, texid + 3);
-	// }
+
+	/* Branching using (weights > 0.0) is reaally slooow on intel so avoid it for now. */
+	vis.x = evaluate_cascade(sd, scd.shadowmat[0], W, range, texid + 0);
+	vis.y = evaluate_cascade(sd, scd.shadowmat[1], W, range, texid + 1);
+	vis.z = evaluate_cascade(sd, scd.shadowmat[2], W, range, texid + 2);
+	vis.w = evaluate_cascade(sd, scd.shadowmat[3], W, range, texid + 3);
 
 	float weight_sum = dot(vec4(1.0), weights);
 	if (weight_sum > 0.9999) {
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index aad1f6d9e45..79e65b1ed72 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -949,9 +949,6 @@ void DRW_shgroup_call_add(DRWShadingGroup *shgroup, Gwn_Batch *geom, float (*obm
 	}
 
 	call->geometry = geom;
-
-
-
 }
 
 void DRW_shgroup_call_object_add(DRWShadingGroup *shgroup, Gwn_Batch *geom, Object *ob)
@@ -975,7 +972,6 @@ void DRW_shgroup_call_object_add(DRWShadingGroup *shgroup, Gwn_Batch *geom, Obje
 	copy_m4_m4(call->obmat, ob->obmat);
 	call->geometry = geom;
 	call->ob_data = ob->data;
-
 }
 
 void DRW_shgroup_call_generate_add(