[Bf-blender-cvs] [e08f00a2ec4] soc-2022-many-lights-sampling: create light tree interior and leaf node arrays on device
Jebbly
noreply at git.blender.org
Fri Jun 10 16:33:00 CEST 2022
Commit: e08f00a2ec4bae3a5e677666060d959c198cb9c5
Author: Jebbly
Date: Wed Jun 8 22:21:38 2022 -0400
Branches: soc-2022-many-lights-sampling
https://developer.blender.org/rBe08f00a2ec4bae3a5e677666060d959c198cb9c5
create light tree interior and leaf node arrays on device
===================================================================
M intern/cycles/scene/scene.cpp
M intern/cycles/scene/scene.h
===================================================================
diff --git a/intern/cycles/scene/scene.cpp b/intern/cycles/scene/scene.cpp
index 4edfc079d06..27ded40fa7a 100644
--- a/intern/cycles/scene/scene.cpp
+++ b/intern/cycles/scene/scene.cpp
@@ -71,7 +71,8 @@ DeviceScene::DeviceScene(Device *device)
lights(device, "__lights", MEM_GLOBAL),
light_background_marginal_cdf(device, "__light_background_marginal_cdf", MEM_GLOBAL),
light_background_conditional_cdf(device, "__light_background_conditional_cdf", MEM_GLOBAL),
- light_tree(device, "__light_tree", MEM_GLOBAL),
+ light_tree_interior_nodes(device, "__light_tree_interior_nodes", MEM_GLOBAL),
+ light_tree_leaf_nodes(device, "__light_tree_leaf_nodes", MEM_GLOBAL),
particles(device, "__particles", MEM_GLOBAL),
svm_nodes(device, "__svm_nodes", MEM_GLOBAL),
shaders(device, "__shaders", MEM_GLOBAL),
diff --git a/intern/cycles/scene/scene.h b/intern/cycles/scene/scene.h
index 2abd3241f26..c3a689c2c19 100644
--- a/intern/cycles/scene/scene.h
+++ b/intern/cycles/scene/scene.h
@@ -110,7 +110,8 @@ class DeviceScene {
device_vector<KernelLight> lights;
device_vector<float2> light_background_marginal_cdf;
device_vector<float2> light_background_conditional_cdf;
- device_vector<float4> light_tree;
+ device_vector<float4> light_tree_interior_nodes;
+ device_vector<float4> light_tree_leaf_nodes;
/* particles */
device_vector<KernelParticle> particles;
More information about the Bf-blender-cvs
mailing list