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

Cleanup: add ImageHandle to centralize image ownership logic

Browse Source
This commit is contained in:
Brecht Van Lommel
2020-03-08 10:42:11 +01:00
committed by Brecht Van Lommel
parent ec3eeee46b
commit d8aa613d94
12 changed files with 343 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
intern/cycles/render/attribute.cpp
View File

@@ -28,13 +28,10 @@ CCL_NAMESPACE_BEGIN
Attribute::~Attribute()
{
/* for voxel data, we need to remove the image from the image manager */
/* For voxel data, we need to free the image handle. */
if (element == ATTR_ELEMENT_VOXEL) {
VoxelAttribute *voxel_data = data_voxel();
if (voxel_data && voxel_data->slot != -1) {
voxel_data->manager->remove_image(voxel_data->slot);
}
ImageHandle &handle = data_voxel();
handle.~ImageHandle();
}
}
@@ -123,15 +120,13 @@ void Attribute::add(const Transform &f)
buffer.push_back(data[i]);
}
void Attribute::add(const VoxelAttribute &f)
void Attribute::add(const ImageHandle &handle)
{
assert(data_sizeof() == sizeof(VoxelAttribute));
assert(data_sizeof() == sizeof(ImageHandle));
assert(buffer.size() == 0);
char *data = (char *)&f;
size_t size = sizeof(f);
for (size_t i = 0; i < size; i++)
buffer.push_back(data[i]);
buffer.resize(sizeof(ImageHandle));
new (buffer.data()) ImageHandle(handle);
}
void Attribute::add(const char *data)
@@ -145,7 +140,7 @@ void Attribute::add(const char *data)
size_t Attribute::data_sizeof() const
{
if (element == ATTR_ELEMENT_VOXEL)
return sizeof(VoxelAttribute);
return sizeof(ImageHandle);
else if (element == ATTR_ELEMENT_CORNER_BYTE)
return sizeof(uchar4);
else if (type == TypeDesc::TypeFloat)