diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-30 01:30:17 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-30 01:43:27 +0300 |
| commit | a8b8da55672c2177c55709321df3514355b513f4 (patch) | |
| tree | 97c730a1b39e60ecd15ad5c73b63892329daae1e /intern/cycles/device/device.h | |
| parent | 8ac2d85d2fd3f8b997e9c9bddadada0dc7bdaf37 (diff) | |
Fix T58183: crash with CPU + GPU rendering after profiling changes.
Multi-device was not passing along profiler to the CPU.
Diffstat (limited to 'intern/cycles/device/device.h')
| -rw-r--r-- | intern/cycles/device/device.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index 071f61a7566..55c39188210 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -249,7 +249,7 @@ struct DeviceDrawParams { class Device { friend class device_sub_ptr; protected: - Device(DeviceInfo& info_, Stats &stats_, bool background) : background(background), vertex_buffer(0), info(info_), stats(stats_) {} + Device(DeviceInfo& info_, Stats &stats_, Profiler &profiler_, bool background) : background(background), vertex_buffer(0), info(info_), stats(stats_), profiler(profiler_) {} bool background; string error_msg; @@ -285,6 +285,7 @@ public: /* statistics */ Stats &stats; + Profiler &profiler; /* memory alignment */ virtual int mem_sub_ptr_alignment() { return MIN_ALIGNMENT_CPU_DATA_TYPES; } @@ -323,7 +324,7 @@ public: virtual void unmap_neighbor_tiles(Device * /*sub_device*/, RenderTile * /*tiles*/) {} /* static */ - static Device *create(DeviceInfo& info, Stats &stats, bool background = true); + static Device *create(DeviceInfo& info, Stats &stats, Profiler& profiler, bool background = true); static DeviceType type_from_string(const char *name); static string string_from_type(DeviceType type); |