From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- intern/cycles/util/util_profiling.h | 220 ++++++++++++++++++------------------ 1 file changed, 110 insertions(+), 110 deletions(-) (limited to 'intern/cycles/util/util_profiling.h') diff --git a/intern/cycles/util/util_profiling.h b/intern/cycles/util/util_profiling.h index 77cdbb0b325..f5f500239f2 100644 --- a/intern/cycles/util/util_profiling.h +++ b/intern/cycles/util/util_profiling.h @@ -27,42 +27,42 @@ CCL_NAMESPACE_BEGIN enum ProfilingEvent : uint32_t { - PROFILING_UNKNOWN, - PROFILING_RAY_SETUP, - PROFILING_PATH_INTEGRATE, - PROFILING_SCENE_INTERSECT, - PROFILING_INDIRECT_EMISSION, - PROFILING_VOLUME, - PROFILING_SHADER_SETUP, - PROFILING_SHADER_EVAL, - PROFILING_SHADER_APPLY, - PROFILING_AO, - PROFILING_SUBSURFACE, - PROFILING_CONNECT_LIGHT, - PROFILING_SURFACE_BOUNCE, - PROFILING_WRITE_RESULT, - - PROFILING_INTERSECT, - PROFILING_INTERSECT_LOCAL, - PROFILING_INTERSECT_SHADOW_ALL, - PROFILING_INTERSECT_VOLUME, - PROFILING_INTERSECT_VOLUME_ALL, - - PROFILING_CLOSURE_EVAL, - PROFILING_CLOSURE_SAMPLE, - PROFILING_CLOSURE_VOLUME_EVAL, - PROFILING_CLOSURE_VOLUME_SAMPLE, - - PROFILING_DENOISING, - PROFILING_DENOISING_CONSTRUCT_TRANSFORM, - PROFILING_DENOISING_RECONSTRUCT, - PROFILING_DENOISING_DIVIDE_SHADOW, - PROFILING_DENOISING_NON_LOCAL_MEANS, - PROFILING_DENOISING_COMBINE_HALVES, - PROFILING_DENOISING_GET_FEATURE, - PROFILING_DENOISING_DETECT_OUTLIERS, - - PROFILING_NUM_EVENTS, + PROFILING_UNKNOWN, + PROFILING_RAY_SETUP, + PROFILING_PATH_INTEGRATE, + PROFILING_SCENE_INTERSECT, + PROFILING_INDIRECT_EMISSION, + PROFILING_VOLUME, + PROFILING_SHADER_SETUP, + PROFILING_SHADER_EVAL, + PROFILING_SHADER_APPLY, + PROFILING_AO, + PROFILING_SUBSURFACE, + PROFILING_CONNECT_LIGHT, + PROFILING_SURFACE_BOUNCE, + PROFILING_WRITE_RESULT, + + PROFILING_INTERSECT, + PROFILING_INTERSECT_LOCAL, + PROFILING_INTERSECT_SHADOW_ALL, + PROFILING_INTERSECT_VOLUME, + PROFILING_INTERSECT_VOLUME_ALL, + + PROFILING_CLOSURE_EVAL, + PROFILING_CLOSURE_SAMPLE, + PROFILING_CLOSURE_VOLUME_EVAL, + PROFILING_CLOSURE_VOLUME_SAMPLE, + + PROFILING_DENOISING, + PROFILING_DENOISING_CONSTRUCT_TRANSFORM, + PROFILING_DENOISING_RECONSTRUCT, + PROFILING_DENOISING_DIVIDE_SHADOW, + PROFILING_DENOISING_NON_LOCAL_MEANS, + PROFILING_DENOISING_COMBINE_HALVES, + PROFILING_DENOISING_GET_FEATURE, + PROFILING_DENOISING_DETECT_OUTLIERS, + + PROFILING_NUM_EVENTS, }; /* Contains the current execution state of a worker thread. @@ -79,97 +79,97 @@ enum ProfilingEvent : uint32_t { * case of reading an intermediate state could at worst result * in a single incorrect sample. */ struct ProfilingState { - volatile uint32_t event = PROFILING_UNKNOWN; - volatile int32_t shader = -1; - volatile int32_t object = -1; - volatile bool active = false; + volatile uint32_t event = PROFILING_UNKNOWN; + volatile int32_t shader = -1; + volatile int32_t object = -1; + volatile bool active = false; - vector shader_hits; - vector object_hits; + vector shader_hits; + vector object_hits; }; class Profiler { -public: - Profiler(); - ~Profiler(); + public: + Profiler(); + ~Profiler(); - void reset(int num_shaders, int num_objects); + void reset(int num_shaders, int num_objects); - void start(); - void stop(); + void start(); + void stop(); - void add_state(ProfilingState *state); - void remove_state(ProfilingState *state); + void add_state(ProfilingState *state); + void remove_state(ProfilingState *state); - uint64_t get_event(ProfilingEvent event); - bool get_shader(int shader, uint64_t &samples, uint64_t &hits); - bool get_object(int object, uint64_t &samples, uint64_t &hits); + uint64_t get_event(ProfilingEvent event); + bool get_shader(int shader, uint64_t &samples, uint64_t &hits); + bool get_object(int object, uint64_t &samples, uint64_t &hits); -protected: - void run(); + protected: + void run(); - /* Tracks how often the worker was in each ProfilingEvent while sampling, - * so multiplying the values by the sample frequency (currently 1ms) - * gives the approximate time spent in each state. */ - vector event_samples; - vector shader_samples; - vector object_samples; + /* Tracks how often the worker was in each ProfilingEvent while sampling, + * so multiplying the values by the sample frequency (currently 1ms) + * gives the approximate time spent in each state. */ + vector event_samples; + vector shader_samples; + vector object_samples; - /* Tracks the total amounts every object/shader was hit. - * Used to evaluate relative cost, written by the render thread. - * Indexed by the shader and object IDs that the kernel also uses - * to index __object_flag and __shaders. */ - vector shader_hits; - vector object_hits; + /* Tracks the total amounts every object/shader was hit. + * Used to evaluate relative cost, written by the render thread. + * Indexed by the shader and object IDs that the kernel also uses + * to index __object_flag and __shaders. */ + vector shader_hits; + vector object_hits; - volatile bool do_stop_worker; - thread *worker; + volatile bool do_stop_worker; + thread *worker; - thread_mutex mutex; - vector states; + thread_mutex mutex; + vector states; }; class ProfilingHelper { -public: - ProfilingHelper(ProfilingState *state, ProfilingEvent event) - : state(state) - { - previous_event = state->event; - state->event = event; - } - - inline void set_event(ProfilingEvent event) - { - state->event = event; - } - - inline void set_shader(int shader) - { - state->shader = shader; - if(state->active) { - assert(shader < state->shader_hits.size()); - state->shader_hits[shader]++; - } - } - - inline void set_object(int object) - { - state->object = object; - if(state->active) { - assert(object < state->object_hits.size()); - state->object_hits[object]++; - } - } - - ~ProfilingHelper() - { - state->event = previous_event; - } -private: - ProfilingState *state; - uint32_t previous_event; + public: + ProfilingHelper(ProfilingState *state, ProfilingEvent event) : state(state) + { + previous_event = state->event; + state->event = event; + } + + inline void set_event(ProfilingEvent event) + { + state->event = event; + } + + inline void set_shader(int shader) + { + state->shader = shader; + if (state->active) { + assert(shader < state->shader_hits.size()); + state->shader_hits[shader]++; + } + } + + inline void set_object(int object) + { + state->object = object; + if (state->active) { + assert(object < state->object_hits.size()); + state->object_hits[object]++; + } + } + + ~ProfilingHelper() + { + state->event = previous_event; + } + + private: + ProfilingState *state; + uint32_t previous_event; }; CCL_NAMESPACE_END -#endif /* __UTIL_PROFILING_H__ */ +#endif /* __UTIL_PROFILING_H__ */ -- cgit v1.2.3