diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-13 16:32:44 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-13 16:32:44 +0400 |
| commit | dd9c1b7fbf501ef58c9952150698fb5ce3c45903 (patch) | |
| tree | f52d353e3dc36a33a3a8b6609fa8a2ffe39b2d4c /intern/cycles/render/image.h | |
| parent | f9642926303ec89679e61076ca9e4b9f0be3afe9 (diff) | |
Cycles: OpenCL image texture support, fix an attribute node issue and refactor
feature enabling #defines a bit.
Diffstat (limited to 'intern/cycles/render/image.h')
| -rw-r--r-- | intern/cycles/render/image.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index cc01b4a8e4c..2b5e53cabe1 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -47,6 +47,7 @@ public: void device_free(Device *device, DeviceScene *dscene); void set_osl_texture_system(void *texture_system); + void set_pack_images(bool pack_images_); bool need_update; @@ -61,12 +62,15 @@ private: vector<Image*> images; vector<Image*> float_images; void *osl_texture_system; + bool pack_images; bool file_load_image(Image *img, device_vector<uchar4>& tex_img); bool file_load_float_image(Image *img, device_vector<float4>& tex_img); void device_load_image(Device *device, DeviceScene *dscene, int slot, Progress *progess); void device_free_image(Device *device, DeviceScene *dscene, int slot); + + void device_pack_images(Device *device, DeviceScene *dscene, Progress& progess); }; CCL_NAMESPACE_END |