[Bf-blender-cvs] [e556670] master: Cycles: Do cuda pointer arithmetic in integers, don't use pointer arithmetic
Sergey Sharybin
noreply at git.blender.org
Tue Oct 14 17:54:37 CEST 2014
Commit: e556670b363beef59703e5f4142794058117015b
Author: Sergey Sharybin
Date: Tue Oct 14 17:52:23 2014 +0200
Branches: master
https://developer.blender.org/rBe556670b363beef59703e5f4142794058117015b
Cycles: Do cuda pointer arithmetic in integers, don't use pointer arithmetic
This should hopefully fix https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765187
===================================================================
M intern/cycles/device/device_cuda.cpp
===================================================================
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 44be777..844fb3b 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -363,7 +363,7 @@ public:
cuda_push_context();
if(mem.device_pointer) {
cuda_assert(cuMemcpyDtoH((uchar*)mem.data_pointer + offset,
- (CUdeviceptr)((uchar*)mem.device_pointer + offset), size));
+ (CUdeviceptr)(mem.device_pointer + offset), size));
}
else {
memset((char*)mem.data_pointer + offset, 0, size);
More information about the Bf-blender-cvs
mailing list