[Bf-blender-cvs] [00ae7da] compositor-2016: Cycles: Yet another fix for textures limit
Sergey Sharybin
noreply at git.blender.org
Wed Jun 8 21:50:02 CEST 2016
Commit: 00ae7dae6e5d548c4efb122bb515167e34122f20
Author: Sergey Sharybin
Date: Wed May 25 12:48:40 2016 +0200
Branches: compositor-2016
https://developer.blender.org/rB00ae7dae6e5d548c4efb122bb515167e34122f20
Cycles: Yet another fix for textures limit
===================================================================
M intern/cycles/render/image.cpp
===================================================================
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 32db5d7..a3d2d23 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;
More information about the Bf-blender-cvs
mailing list