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.cpp | |
| 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.cpp')
| -rw-r--r-- | intern/cycles/render/scene.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp index ece4919dedb..29163c53109 100644 --- a/intern/cycles/render/scene.cpp +++ b/intern/cycles/render/scene.cpp @@ -54,7 +54,7 @@ Scene::Scene(const SceneParams& params_, const DeviceInfo& device_info_) mesh_manager = new MeshManager(); object_manager = new ObjectManager(); integrator = new Integrator(); - image_manager = new ImageManager(); + image_manager = new ImageManager(device_info_); particle_system_manager = new ParticleSystemManager(); curve_system_manager = new CurveSystemManager(); bake_manager = new BakeManager(); @@ -64,9 +64,6 @@ Scene::Scene(const SceneParams& params_, const DeviceInfo& device_info_) shader_manager = ShaderManager::create(this, params.shadingsystem); else shader_manager = ShaderManager::create(this, SHADINGSYSTEM_SVM); - - /* Extended image limits for CPU and GPUs */ - image_manager->set_extended_image_limits(device_info_); } Scene::~Scene() |