[Bf-blender-cvs] [e243a5c] compositor-2016: Cycles: Fix wrong cuda textures limits
Sergey Sharybin
noreply at git.blender.org
Wed Jun 8 21:49:59 CEST 2016
Commit: e243a5c6fa7a49d9e2035511616c8b3a3af8007a
Author: Sergey Sharybin
Date: Tue May 24 17:02:19 2016 +0200
Branches: compositor-2016
https://developer.blender.org/rBe243a5c6fa7a49d9e2035511616c8b3a3af8007a
Cycles: Fix wrong cuda textures limits
===================================================================
M intern/cycles/render/image.cpp
===================================================================
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index ea18419..32db5d7 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -60,8 +60,8 @@ ImageManager::ImageManager(const DeviceInfo& info)
tex_image_byte_start = TEX_IMAGE_BYTE_START_CPU;
}
/* CUDA */
- else if(device_type == DEVICE_CUDA && !info.has_bindless_textures) {
- if(info.has_bindless_textures) {
+ else if(device_type == DEVICE_CUDA) {
+ if(!info.has_bindless_textures) {
/* Fermi */
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;
More information about the Bf-blender-cvs
mailing list