Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Fix strict compiler warning

Browse Source 
Pointer used for math arithmetics in assert().
CUDA device pointer is actually an integer type, not a pointer.
This commit is contained in:
Sergey Sharybin
2019-11-07 11:06:41 +01:00
parent 79b703bb63
commit aa2904ea13
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/device/device_optix.cpp
View File

@@ -1189,7 +1189,7 @@ class OptiXDevice : public Device {
size_t bytes = 0; size_t bytes = 0;
CUdeviceptr mem = 0; CUdeviceptr mem = 0;
check_result_cuda(cuModuleGetGlobal(&mem, &bytes, cuda_module, name)); check_result_cuda(cuModuleGetGlobal(&mem, &bytes, cuda_module, name));
assert(mem != NULL && bytes == data_size); assert(mem != 0 && bytes == data_size);
check_result_cuda(cuMemcpyHtoD(mem, data, data_size)); check_result_cuda(cuMemcpyHtoD(mem, data, data_size));
} }