diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-03 14:49:54 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-03 14:49:54 +0400 |
| commit | db1664ed4c44ff56ce286e0007dfd1587109c7a5 (patch) | |
| tree | 9fc331d1dd2a99eaf0f9aaf2c780de21f4c634e2 /intern/cycles/render/session.cpp | |
| parent | 67030aaf84229b4d0dc52fbe07e91c2c9d320b0d (diff) | |
Cycles:
* Compute MD5 hash to deal with nvidia opencl compiler cache not recognizing
changes in #included files, makes it possible to do kernel compile only
once and remember it for the next time blender is started.
* Kernel tweak to compile with ATI/linux. Enabling any more functionality than
simple clay render still chokes the compiler though, without a specific error
message ..
Diffstat (limited to 'intern/cycles/render/session.cpp')
| -rw-r--r-- | intern/cycles/render/session.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index daa10ad4f19..d3482e7f92f 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -35,7 +35,7 @@ Session::Session(const SessionParams& params_) : params(params_), tile_manager(params.progressive, params.passes, params.tile_size, params.min_size) { - device_use_gl = (params.device_type == DEVICE_CUDA && !params.background); + device_use_gl = ((params.device_type == DEVICE_CUDA || params.device_type == DEVICE_OPENCL) && !params.background); device = Device::create(params.device_type, params.background, params.threads); buffers = new RenderBuffers(device); @@ -381,7 +381,7 @@ void Session::run_cpu() void Session::run() { /* load kernels */ - progress.set_status("Loading render kernels"); + progress.set_status("Loading render kernels (may take a few minutes)"); if(!device->load_kernels()) { progress.set_status("Failed loading render kernel, see console for errors"); |