diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-05-09 13:51:42 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-05-11 22:58:34 +0300 |
| commit | 4a4f043bc4235c046d2b58e00f2b80665ded11bf (patch) | |
| tree | 58f68254573aece49f2b6ab67ffcb8ba1fc9c08f /intern/cycles/render/scene.h | |
| parent | 544b76ac9cf79bcc64b9f8248984f1d408d32eb8 (diff) | |
Cycles: Add support for single channel float textures on CPU.
Until now, single channel textures were packed into a float4, wasting 3 floats per pixel. Memory usage of such textures is now reduced by 3/4.
Voxel Attributes such as density, flame and heat benefit from this, but also Bumpmaps with one channel.
This commit also includes some cleanup and code deduplication for image loading.
Example Smoke render from Cosmos Laundromat: http://www.pasteall.org/pic/show.php?id=102972
Memory here went down from ~600MB to ~300MB.
Reviewers: #cycles, brecht
Differential Revision: https://developer.blender.org/D1981
Diffstat (limited to 'intern/cycles/render/scene.h')
| -rw-r--r-- | intern/cycles/render/scene.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h index 455053fb3f6..34050851d8e 100644 --- a/intern/cycles/render/scene.h +++ b/intern/cycles/render/scene.h @@ -111,6 +111,7 @@ public: /* cpu images */ device_vector<uchar4> tex_byte4_image[TEX_NUM_BYTE4_IMAGES_CPU]; device_vector<float4> tex_float4_image[TEX_NUM_FLOAT4_IMAGES_CPU]; + device_vector<float> tex_float_image[TEX_NUM_FLOAT_IMAGES_CPU]; /* opencl images */ device_vector<uchar4> tex_image_byte4_packed; |