diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-11-07 13:06:41 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-11-07 13:06:41 +0300 |
| commit | aa2904ea13b5aa72c5eba0c9e094ad8fc4937990 (patch) | |
| tree | ec3b41865309d532a51da8228d61db36581d18fb /intern/cycles | |
| parent | 79b703bb635ea719bbe31c1ece9884d2d298eaef (diff) | |
Cycles: Fix strict compiler warning
Pointer used for math arithmetics in assert().
CUDA device pointer is actually an integer type, not a pointer.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/device/device_optix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/device_optix.cpp b/intern/cycles/device/device_optix.cpp index 3162b72a0dc..831cd8c3148 100644 --- a/intern/cycles/device/device_optix.cpp +++ b/intern/cycles/device/device_optix.cpp @@ -1189,7 +1189,7 @@ class OptiXDevice : public Device { size_t bytes = 0; CUdeviceptr mem = 0; 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)); } |