diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-07 19:17:24 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-07 19:17:24 +0300 |
| commit | ade2aaba0906571ed78312a996eac4ec511831e7 (patch) | |
| tree | ed713f869305164decdaa2620ee0368a46e484f9 /intern | |
| parent | 56f6938b5e8bad59fa422341b830555ddec466e9 (diff) | |
| parent | 1dafe759edc3bc9a89f99a894d1c1fb3a14f44a9 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/app/cycles_cubin_cc.cpp | 4 | ||||
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 2 | ||||
| -rw-r--r-- | intern/opensubdiv/opensubdiv_device_context_cuda.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/app/cycles_cubin_cc.cpp b/intern/cycles/app/cycles_cubin_cc.cpp index 73d0cd5130c..3c83bf2dae3 100644 --- a/intern/cycles/app/cycles_cubin_cc.cpp +++ b/intern/cycles/app/cycles_cubin_cc.cpp @@ -162,7 +162,7 @@ bool link_ptxas(CompilationSettings &settings) if (settings.verbose) { ptx += " --verbose"; - printf(ptx.c_str()); + printf("%s\n", ptx.c_str()); } int pxresult = system(ptx.c_str()); @@ -186,7 +186,7 @@ bool init(CompilationSettings &settings) } #endif - int cuewresult = cuewInit(); + int cuewresult = cuewInit(CUEW_INIT_NVRTC); if(cuewresult != CUEW_SUCCESS) { fprintf(stderr, "Error: cuew init fialed (0x%x)\n\n", cuewresult); return false; diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 24ae79e5074..64295838f0c 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -2467,7 +2467,7 @@ bool device_cuda_init(void) return result; initialized = true; - int cuew_result = cuewInit(); + int cuew_result = cuewInit(CUEW_INIT_CUDA); if(cuew_result == CUEW_SUCCESS) { VLOG(1) << "CUEW initialization succeeded"; if(CUDADevice::have_precompiled_kernels()) { diff --git a/intern/opensubdiv/opensubdiv_device_context_cuda.cc b/intern/opensubdiv/opensubdiv_device_context_cuda.cc index 81c52f5d6cf..46b66a6b35e 100644 --- a/intern/opensubdiv/opensubdiv_device_context_cuda.cc +++ b/intern/opensubdiv/opensubdiv_device_context_cuda.cc @@ -187,7 +187,7 @@ bool CudaDeviceContext::HAS_CUDA_VERSION_4_0() cudaInitialized = true; # ifdef OPENSUBDIV_HAS_CUEW - cudaLoadSuccess = cuewInit() == CUEW_SUCCESS; + cudaLoadSuccess = cuewInit(CUEW_INIT_CUDA) == CUEW_SUCCESS; if (!cudaLoadSuccess) { fprintf(stderr, "Loading CUDA failed.\n"); } |