Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Cleanup, whitespace after keyword

Browse Source
This commit is contained in:
Sergey Sharybin
2018-08-30 17:34:11 +02:00
parent caa12b17e2
commit 94ea566b5a
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/blender_sync.cpp
View File

@@ -682,7 +682,7 @@ SceneParams BlenderSync::get_scene_params(BL::Scene& b_scene,
/* TODO(sergey): Once OSL supports per-microarchitecture optimization get /* TODO(sergey): Once OSL supports per-microarchitecture optimization get
* rid of this. * rid of this.
*/ */
if (params.shadingsystem == SHADINGSYSTEM_OSL) { if(params.shadingsystem == SHADINGSYSTEM_OSL) {
params.bvh_layout = BVH_LAYOUT_BVH4; params.bvh_layout = BVH_LAYOUT_BVH4;
} }
else { else {

2
intern/cycles/device/device_cpu.cpp
View File

@@ -1031,7 +1031,7 @@ void device_cpu_info(vector<DeviceInfo>& devices)
if(system_cpu_support_sse2()) { if(system_cpu_support_sse2()) {
info.bvh_layout_mask |= BVH_LAYOUT_BVH4; info.bvh_layout_mask |= BVH_LAYOUT_BVH4;
} }
if (system_cpu_support_avx2()) { if(system_cpu_support_avx2()) {
info.bvh_layout_mask |= BVH_LAYOUT_BVH8; info.bvh_layout_mask |= BVH_LAYOUT_BVH8;
} }
info.has_volume_decoupled = true; info.has_volume_decoupled = true;

6
intern/cycles/util/util_debug.cpp
View File

@@ -57,13 +57,13 @@ void DebugFlags::CPU::reset()
#undef STRINGIFY #undef STRINGIFY
#undef CHECK_CPU_FLAGS #undef CHECK_CPU_FLAGS
if (getenv("CYCLES_BVH2") != NULL) { if(getenv("CYCLES_BVH2") != NULL) {
bvh_layout = BVH_LAYOUT_BVH2; bvh_layout = BVH_LAYOUT_BVH2;
} }
else if (getenv("CYCLES_BVH4") != NULL) { else if(getenv("CYCLES_BVH4") != NULL) {
bvh_layout = BVH_LAYOUT_BVH4; bvh_layout = BVH_LAYOUT_BVH4;
} }
else if (getenv("CYCLES_BVH8") != NULL) { else if(getenv("CYCLES_BVH8") != NULL) {
bvh_layout = BVH_LAYOUT_BVH8; bvh_layout = BVH_LAYOUT_BVH8;
} }
else { else {