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
path: root/intern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-05-25 13:48:40 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-05-25 13:49:02 +0300
commit84c7f427f228aadc2dd9e36e3935773aa3ecc25b (patch)
tree5428188eb4490b80b14cea034346394abf63b42c /intern
parent15911eebdab1e61bc872ecb63956f2fe2727dd85 (diff)
Cycles: Yet another fix for textures limit
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/render/image.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 32db5d7d10e..a3d2d23a205 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -61,8 +61,8 @@ ImageManager::ImageManager(const DeviceInfo& info)
}
/* CUDA */
else if(device_type == DEVICE_CUDA) {
- if(!info.has_bindless_textures) {
- /* Fermi */
+ if(info.has_bindless_textures) {
+ /* Kepler and above */
tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_IMAGES_CUDA_KEPLER;
tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER;
tex_num_images[IMAGE_DATA_TYPE_FLOAT] = TEX_NUM_FLOAT_IMAGES_CUDA_KEPLER;
@@ -72,7 +72,7 @@ ImageManager::ImageManager(const DeviceInfo& info)
tex_image_byte_start = TEX_IMAGE_BYTE_START_CUDA_KEPLER;
}
else {
- /* Kepler and above */
+ /* Fermi */
tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_IMAGES_CUDA;
tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_IMAGES_CUDA;
tex_num_images[IMAGE_DATA_TYPE_FLOAT] = TEX_NUM_FLOAT_IMAGES_CUDA;