diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-29 16:03:48 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-29 16:03:48 +0400 |
commit | a2e4ebd36a319dc18f362b1f75863b8ee93eed7d (patch) | |
tree | bcf041e53375766661de3d0a199930369b3d1466 /intern/cycles/render/image.h | |
parent | 07d1fba3676c950b0cc3ab1dfb1f2de614c62697 (diff) |
Cycles code internals: add CPU kernel support for 3D image textures.
Diffstat (limited to 'intern/cycles/render/image.h')
-rw-r--r-- | intern/cycles/render/image.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index 85b6b512bae..a52ab2853b9 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -50,6 +50,7 @@ public: ~ImageManager(); int add_image(const string& filename, void *builtin_data, bool animated, bool& is_float, bool& is_linear, InterpolationType interpolation); + void remove_image(int slot); void remove_image(const string& filename, void *builtin_data, InterpolationType interpolation); bool is_float_image(const string& filename, void *builtin_data, bool& is_linear); @@ -63,15 +64,9 @@ public: bool need_update; - boost::function<void(const string &filename, void *data, bool &is_float, int &width, int &height, int &channels)> builtin_image_info_cb; + boost::function<void(const string &filename, void *data, bool &is_float, int &width, int &height, int &depth, int &channels)> builtin_image_info_cb; boost::function<bool(const string &filename, void *data, unsigned char *pixels)> builtin_image_pixels_cb; boost::function<bool(const string &filename, void *data, float *pixels)> builtin_image_float_pixels_cb; -private: - int tex_num_images; - int tex_num_float_images; - int tex_image_byte_start; - thread_mutex device_mutex; - int animation_frame; struct Image { string filename; @@ -84,6 +79,13 @@ private: int users; }; +private: + int tex_num_images; + int tex_num_float_images; + int tex_image_byte_start; + thread_mutex device_mutex; + int animation_frame; + vector<Image*> images; vector<Image*> float_images; void *osl_texture_system; |