archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Eevee / DRW : Codestyle

Browse Source
This commit is contained in:
Clément Foucault
2017-09-12 15:03:34 +02:00
parent f2b3e1f712
commit 1e1d34654b
2 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/draw/engines/eevee/shaders/lamps_lib.glsl
View File

@@ -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) {

4
source/blender/draw/intern/draw_manager.c
View File

@@ -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(