Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2014-05-11 05:38:39 +0400
committerThomas Dinges <blender@dingto.org>2014-05-11 05:38:39 +0400
commitc08c931fb6f57bdca7865d48ac09a0775590f3ce (patch)
tree8d5bbe8b0e23288d6227545811b3822eebf01fba /intern/cycles/render/scene.cpp
parent8904eaf5047780eaf97eb7dc3acebb1b65f258bd (diff)
Cycles / CUDA: Increase maximum image textures on GPU.
Instead of 95, we can use 145 images now. This only affects Kepler and above (sm30, sm_35 and sm_50). This can be increased further if needed, but let's first test if this does not come with a performance impact. Originally developed during my GSoC 2013.
Diffstat (limited to 'intern/cycles/render/scene.cpp')
-rw-r--r--intern/cycles/render/scene.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index 4a42b2c9e35..686a1bc406e 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -63,8 +63,8 @@ Scene::Scene(const SceneParams& params_, const DeviceInfo& device_info_)
else
shader_manager = ShaderManager::create(this, SceneParams::SVM);
- if (device_info_.type == DEVICE_CPU)
- image_manager->set_extended_image_limits();
+ /* Extended image limits for CPU and GPUs */
+ image_manager->set_extended_image_limits(device_info_);
}
Scene::~Scene()