diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-04-16 21:48:33 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-04-16 21:49:59 +0300 |
| commit | 557544f2c452303ff4b4d3af96551841e4d79040 (patch) | |
| tree | 06e0409ce904eecda37a6784977d652087c34afc /intern/cycles/render/scene.h | |
| parent | b973911feeec1bf487b35245005406fb32018cbf (diff) | |
Cycles: Refactor Image Texture limits.
Instead of treating Fermi GPU limits as default,
and overriding them for other devices,
we now nicely set them for each platform.
* Due to setting values for all platforms,
we don't have to offset the slot id for OpenCL anymore,
as the image manager wont add float images for OpenCL now.
* Bugfix: TEX_NUM_FLOAT_IMAGES was always 5, even for CPU,
so the code in svm_image.h clamped float textures with alpha on CPU after the 5th slot.
Reviewers: #cycles, brecht
Reviewed By: #cycles, brecht
Subscribers: brecht
Differential Revision: https://developer.blender.org/D1925
Diffstat (limited to 'intern/cycles/render/scene.h')
| -rw-r--r-- | intern/cycles/render/scene.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h index db70ae3c176..d30a0cb45fe 100644 --- a/intern/cycles/render/scene.h +++ b/intern/cycles/render/scene.h @@ -109,8 +109,8 @@ public: device_vector<uint> sobol_directions; /* cpu images */ - device_vector<uchar4> tex_image[TEX_EXTENDED_NUM_IMAGES_CPU]; - device_vector<float4> tex_float_image[TEX_EXTENDED_NUM_FLOAT_IMAGES]; + device_vector<uchar4> tex_image[TEX_NUM_BYTE_IMAGES_CPU]; + device_vector<float4> tex_float_image[TEX_NUM_FLOAT_IMAGES_CPU]; /* opencl images */ device_vector<uchar4> tex_image_packed; |