griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor: Cycles: Make attribute map a bit smaller when not using OSL

Browse Source
This commit is contained in:
Brecht Van Lommel
2025-07-21 14:07:46 +02:00
parent 5ad5527cc3
commit 474debc348
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
intern/cycles/scene/geometry_attributes.cpp
View File

@@ -143,6 +143,7 @@ void GeometryManager::update_svm_attributes(Device * /*unused*/,
{
/* for SVM, the attributes_map table is used to lookup the offset of an
* attribute, based on a unique shader attribute id. */
const bool use_osl = scene->shader_manager->use_osl();
/* compute array stride */
size_t attr_map_size = 0;
@@ -151,21 +152,22 @@ void GeometryManager::update_svm_attributes(Device * /*unused*/,
Geometry *geom = scene->geometry[i];
geom->attr_map_offset = attr_map_size;
#ifdef WITH_OSL
size_t attr_count = 0;
for (const AttributeRequest &req : geom_attributes[i].requests) {
if (req.std != ATTR_STD_NONE &&
scene->shader_manager->get_attribute_id(req.std) != (uint64_t)req.std)
{
attr_count += 2;
}
else {
attr_count += 1;
if (use_osl) {
for (const AttributeRequest &req : geom_attributes[i].requests) {
if (req.std != ATTR_STD_NONE &&
scene->shader_manager->get_attribute_id(req.std) != (uint64_t)req.std)
{
attr_count += 2;
}
else {
attr_count += 1;
}
}
}
#else
const size_t attr_count = geom_attributes[i].size();
#endif
else {
attr_count = geom_attributes[i].size();
}
attr_map_size += (attr_count + 1) * ATTR_PRIM_TYPES;
}
@@ -214,14 +216,14 @@ void GeometryManager::update_svm_attributes(Device * /*unused*/,
emit_attribute_mapping(attr_map, index, id, req);
index += ATTR_PRIM_TYPES;
#ifdef WITH_OSL
/* Some standard attributes are explicitly referenced via their standard ID, so add those
* again in case they were added under a different attribute ID. */
if (req.std != ATTR_STD_NONE && id != (uint64_t)req.std) {
emit_attribute_mapping(attr_map, index, (uint64_t)req.std, req);
index += ATTR_PRIM_TYPES;
if (use_osl) {
/* Some standard attributes are explicitly referenced via their standard ID, so add those
* again in case they were added under a different attribute ID. */
if (req.std != ATTR_STD_NONE && id != (uint64_t)req.std) {
emit_attribute_mapping(attr_map, index, (uint64_t)req.std, req);
index += ATTR_PRIM_TYPES;
}
}
#endif
}
emit_attribute_map_terminator(attr_map, index, false, 0);