diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-15 02:26:55 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-15 02:26:55 +0400 |
| commit | 089abdecf7b14b97c460aa7697fa9191db281d92 (patch) | |
| tree | 947c8f46a48eaca4901c1d7ade993f931b0ba39c /intern/cycles/device | |
| parent | f97d7b234daaed836172a7caaa5b8d590c7513e5 (diff) | |
Cycles: attempted fixes for OS X preview render problem, and disable
kernel cache there now as well since it seems to give issues there.
Diffstat (limited to 'intern/cycles/device')
| -rw-r--r-- | intern/cycles/device/device.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/device/device_network.h | 4 | ||||
| -rw-r--r-- | intern/cycles/device/device_opencl.cpp | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index ab57d7cfe86..6ba50154dac 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -108,7 +108,7 @@ void Device::draw_pixels(device_memory& rgba, int y, int w, int h, int width, in /* for multi devices, this assumes the ineffecient method that we allocate all pixels on the device even though we only render to a subset */ - pixels += sizeof(uint8_t)*4*y*w; + pixels += 4*y*w; glDrawPixels(w, h, GL_RGBA, GL_UNSIGNED_BYTE, pixels); diff --git a/intern/cycles/device/device_network.h b/intern/cycles/device/device_network.h index ebb1e43a7a7..775517586d3 100644 --- a/intern/cycles/device/device_network.h +++ b/intern/cycles/device/device_network.h @@ -19,6 +19,8 @@ #ifndef __DEVICE_NETWORK_H__ #define __DEVICE_NETWORK_H__ +#ifdef WITH_NETWORK + #include <boost/archive/text_iarchive.hpp> #include <boost/archive/text_oarchive.hpp> #include <boost/array.hpp> @@ -300,5 +302,7 @@ private: CCL_NAMESPACE_END +#endif + #endif /* __DEVICE_NETWORK_H__ */ diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index a41238ffe09..b58dfe7f168 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -353,19 +353,23 @@ public: string clbin = string_printf("cycles_kernel_%s_%s.clbin", device_md5.c_str(), kernel_md5.c_str());; clbin = path_user_get(path_join("cache", clbin)); +#ifndef __APPLE__ if(path_exists(clbin)) { /* if exists already, try use it */ if(!load_binary(kernel_path, clbin)) return false; } else { +#endif /* compile kernel */ if(!compile_kernel(kernel_path, kernel_md5)) return false; +#ifndef __APPLE__ /* save binary for reuse */ save_binary(clbin); } +#endif /* find kernels */ ckPathTraceKernel = clCreateKernel(cpProgram, "kernel_ocl_path_trace", &ciErr); |