diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-08-08 14:12:04 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2017-08-08 14:12:04 +0300 |
| commit | ec8ae4d5e9f735ab5aeb149dea8aa47ab8f8f977 (patch) | |
| tree | ea5ca862e3ee999fa65ebfefd46d19ba7ef034cd /intern/cycles/render/mesh.cpp | |
| parent | b53e35c655d40769e46cbe91929531fbe20d2977 (diff) | |
Cycles: Pack kernel textures into buffers for OpenCL
Image textures were being packed into a single buffer for OpenCL, which
limited the amount of memory available for images to the size of one
buffer (usually 4gb on AMD hardware). By packing textures into multiple
buffers that limit is removed, while simultaneously reducing the number
of buffers that need to be passed to each kernel.
Benchmarks were within 2%.
Fixes T51554.
Differential Revision: https://developer.blender.org/D2745
Diffstat (limited to 'intern/cycles/render/mesh.cpp')
| -rw-r--r-- | intern/cycles/render/mesh.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp index 03825f780e0..84537bf5993 100644 --- a/intern/cycles/render/mesh.cpp +++ b/intern/cycles/render/mesh.cpp @@ -1925,16 +1925,7 @@ void MeshManager::device_update_displacement_images(Device *device, if(node->special_type != SHADER_SPECIAL_TYPE_IMAGE_SLOT) { continue; } - if(device->info.pack_images) { - /* If device requires packed images we need to update all - * images now, even if they're not used for displacement. - */ - image_manager->device_update(device, - dscene, - scene, - progress); - return; - } + ImageSlotTextureNode *image_node = static_cast<ImageSlotTextureNode*>(node); int slot = image_node->slot; if(slot != -1) { |