Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-02-07 19:17:24 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-02-07 19:17:24 +0300
commitade2aaba0906571ed78312a996eac4ec511831e7 (patch)
treeed713f869305164decdaa2620ee0368a46e484f9 /intern/cycles/app
parent56f6938b5e8bad59fa422341b830555ddec466e9 (diff)
parent1dafe759edc3bc9a89f99a894d1c1fb3a14f44a9 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/app')
-rw-r--r--intern/cycles/app/cycles_cubin_cc.cpp4
1 files changed, 2 insertions, 2 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;