diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-30 01:54:30 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-30 01:54:30 +0300 |
| commit | 63c06531707c14c3c93c9f84d39a77aaf75c3634 (patch) | |
| tree | 700445b404cc5ebfa09fea62c53b9a64db049b9e /intern/cycles/device/device.h | |
| parent | 679b156756e070a779e97af7d5a34ddf0b164836 (diff) | |
| parent | a8b8da55672c2177c55709321df3514355b513f4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device/device.h')
| -rw-r--r-- | intern/cycles/device/device.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index c620914aab4..fc9e57dc565 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -255,10 +255,10 @@ protected: FALLBACK_SHADER_STATUS_SUCCESS, }; - Device(DeviceInfo& info_, Stats &stats_, bool background) : background(background), + Device(DeviceInfo& info_, Stats &stats_, Profiler &profiler_, bool background) : background(background), vertex_buffer(0), fallback_status(FALLBACK_SHADER_STATUS_NONE), fallback_shader_program(0), - info(info_), stats(stats_) {} + info(info_), stats(stats_), profiler(profiler_) {} bool background; string error_msg; @@ -298,6 +298,7 @@ public: /* statistics */ Stats &stats; + Profiler &profiler; /* memory alignment */ virtual int mem_sub_ptr_alignment() { return MIN_ALIGNMENT_CPU_DATA_TYPES; } @@ -337,7 +338,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); |