diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /intern/cycles/render/image.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
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
Diffstat (limited to 'intern/cycles/render/image.h')
-rw-r--r-- | intern/cycles/render/image.h | 259 |
1 files changed, 119 insertions, 140 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index 1403b9050fd..34f046692f6 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -34,150 +34,129 @@ class RenderStats; class Scene; class ImageMetaData { -public: - /* Must be set by image file or builtin callback. */ - bool is_float, is_half; - int channels; - size_t width, height, depth; - bool builtin_free_cache; - - /* Automatically set. */ - ImageDataType type; - bool is_linear; - - bool operator==(const ImageMetaData& other) const - { - return is_float == other.is_float && - is_half == other.is_half && - channels == other.channels && - width == other.width && - height == other.height && - depth == other.depth && - type == other.type && - is_linear == other.is_linear; - } + public: + /* Must be set by image file or builtin callback. */ + bool is_float, is_half; + int channels; + size_t width, height, depth; + bool builtin_free_cache; + + /* Automatically set. */ + ImageDataType type; + bool is_linear; + + bool operator==(const ImageMetaData &other) const + { + return is_float == other.is_float && is_half == other.is_half && channels == other.channels && + width == other.width && height == other.height && depth == other.depth && + type == other.type && is_linear == other.is_linear; + } }; class ImageManager { -public: - explicit ImageManager(const DeviceInfo& info); - ~ImageManager(); - - int add_image(const string& filename, - void *builtin_data, - bool animated, - float frame, - InterpolationType interpolation, - ExtensionType extension, - bool use_alpha, - ImageMetaData& metadata); - void remove_image(int flat_slot); - void remove_image(const string& filename, - void *builtin_data, - InterpolationType interpolation, - ExtensionType extension, - bool use_alpha); - void tag_reload_image(const string& filename, - void *builtin_data, - InterpolationType interpolation, - ExtensionType extension, - bool use_alpha); - bool get_image_metadata(const string& filename, - void *builtin_data, - ImageMetaData& metadata); - bool get_image_metadata(int flat_slot, - ImageMetaData& metadata); - - void device_update(Device *device, - Scene *scene, - Progress& progress); - void device_update_slot(Device *device, - Scene *scene, - int flat_slot, - Progress *progress); - void device_free(Device *device); - - void device_load_builtin(Device *device, - Scene *scene, - Progress& progress); - void device_free_builtin(Device *device); - - void set_osl_texture_system(void *texture_system); - bool set_animation_frame_update(int frame); - - device_memory *image_memory(int flat_slot); - - void collect_statistics(RenderStats *stats); - - bool need_update; - - /* NOTE: Here pixels_size is a size of storage, which equals to - * width * height * depth. - * Use this to avoid some nasty memory corruptions. - */ - function<void(const string &filename, - void *data, - ImageMetaData& metadata)> builtin_image_info_cb; - function<bool(const string &filename, - void *data, - unsigned char *pixels, - const size_t pixels_size, - const bool free_cache)> builtin_image_pixels_cb; - function<bool(const string &filename, - void *data, - float *pixels, - const size_t pixels_size, - const bool free_cache)> builtin_image_float_pixels_cb; - - struct Image { - string filename; - void *builtin_data; - ImageMetaData metadata; - - bool use_alpha; - bool need_load; - bool animated; - float frame; - InterpolationType interpolation; - ExtensionType extension; - - string mem_name; - device_memory *mem; - - int users; - }; - -private: - int tex_num_images[IMAGE_DATA_NUM_TYPES]; - int max_num_images; - bool has_half_images; - - thread_mutex device_mutex; - int animation_frame; - - vector<Image*> images[IMAGE_DATA_NUM_TYPES]; - void *osl_texture_system; - - bool file_load_image_generic(Image *img, unique_ptr<ImageInput> *in); - - template<TypeDesc::BASETYPE FileFormat, - typename StorageType, - typename DeviceType> - bool file_load_image(Image *img, - ImageDataType type, - int texture_limit, - device_vector<DeviceType>& tex_img); - - void device_load_image(Device *device, - Scene *scene, - ImageDataType type, - int slot, - Progress *progress); - void device_free_image(Device *device, - ImageDataType type, - int slot); + public: + explicit ImageManager(const DeviceInfo &info); + ~ImageManager(); + + int add_image(const string &filename, + void *builtin_data, + bool animated, + float frame, + InterpolationType interpolation, + ExtensionType extension, + bool use_alpha, + ImageMetaData &metadata); + void remove_image(int flat_slot); + void remove_image(const string &filename, + void *builtin_data, + InterpolationType interpolation, + ExtensionType extension, + bool use_alpha); + void tag_reload_image(const string &filename, + void *builtin_data, + InterpolationType interpolation, + ExtensionType extension, + bool use_alpha); + bool get_image_metadata(const string &filename, void *builtin_data, ImageMetaData &metadata); + bool get_image_metadata(int flat_slot, ImageMetaData &metadata); + + void device_update(Device *device, Scene *scene, Progress &progress); + void device_update_slot(Device *device, Scene *scene, int flat_slot, Progress *progress); + void device_free(Device *device); + + void device_load_builtin(Device *device, Scene *scene, Progress &progress); + void device_free_builtin(Device *device); + + void set_osl_texture_system(void *texture_system); + bool set_animation_frame_update(int frame); + + device_memory *image_memory(int flat_slot); + + void collect_statistics(RenderStats *stats); + + bool need_update; + + /* NOTE: Here pixels_size is a size of storage, which equals to + * width * height * depth. + * Use this to avoid some nasty memory corruptions. + */ + function<void(const string &filename, void *data, ImageMetaData &metadata)> + builtin_image_info_cb; + function<bool(const string &filename, + void *data, + unsigned char *pixels, + const size_t pixels_size, + const bool free_cache)> + builtin_image_pixels_cb; + function<bool(const string &filename, + void *data, + float *pixels, + const size_t pixels_size, + const bool free_cache)> + builtin_image_float_pixels_cb; + + struct Image { + string filename; + void *builtin_data; + ImageMetaData metadata; + + bool use_alpha; + bool need_load; + bool animated; + float frame; + InterpolationType interpolation; + ExtensionType extension; + + string mem_name; + device_memory *mem; + + int users; + }; + + private: + int tex_num_images[IMAGE_DATA_NUM_TYPES]; + int max_num_images; + bool has_half_images; + + thread_mutex device_mutex; + int animation_frame; + + vector<Image *> images[IMAGE_DATA_NUM_TYPES]; + void *osl_texture_system; + + bool file_load_image_generic(Image *img, unique_ptr<ImageInput> *in); + + template<TypeDesc::BASETYPE FileFormat, typename StorageType, typename DeviceType> + bool file_load_image(Image *img, + ImageDataType type, + int texture_limit, + device_vector<DeviceType> &tex_img); + + void device_load_image( + Device *device, Scene *scene, ImageDataType type, int slot, Progress *progress); + void device_free_image(Device *device, ImageDataType type, int slot); }; CCL_NAMESPACE_END -#endif /* __IMAGE_H__ */ +#endif /* __IMAGE_H__ */ |