[Bf-blender-cvs] [024262b] soc-2016-cycles_images: Some further fixes for Bindless, 3D Textures still don't work though.

[Thomas Dinges]

Commit: 024262bf9124985ad8c898fccf18c7bd3a508890
Author: Thomas Dinges
Date:   Tue May 17 00:45:00 2016 +0200
Branches: soc-2016-cycles_images
https://developer.blender.org/rB024262bf9124985ad8c898fccf18c7bd3a508890

Some further fixes for Bindless, 3D Textures still don't work though.

===================================================================

M	intern/cycles/device/device_cuda.cpp

===================================================================

diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 9aa7d56..a3c4999 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -566,7 +566,7 @@ public:
 
 					cuda_assert(cuMemcpy3D(&param));
 				}
-				if(mem.data_height > 1) {
+				else if(mem.data_height > 1) {
 					CUDA_MEMCPY2D param;
 					memset(&param, 0, sizeof(param));
 					param.dstMemoryType = CU_MEMORYTYPE_ARRAY;
@@ -623,6 +623,11 @@ public:
 				CUtexObject tex = 0;
 				cuda_assert(cuTexObjectCreate(&tex, &resDesc, &texDesc, NULL));
 				*bindless_slot = tex;
+
+				mem.device_pointer = (device_ptr)handle;
+				mem.device_size = size;
+
+				stats.mem_alloc(size);
 			}
 		}
 		/* Geforce 4xx and 5xx */