diff options
author | Thomas Dinges <blender@dingto.org> | 2016-05-28 00:35:29 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2016-06-08 22:45:40 +0300 |
commit | 8c03ff072dcb6057f14def3ee4b1d47da79ad30f (patch) | |
tree | 08b1a787b7caec1bc25505b17932c3c044a588f4 /intern/cycles/render/image.h | |
parent | f7c0551c9b0304a05097cfc810a20226b95e995b (diff) |
Cleanup: Further tweaks for consistency and simplifications.
Now I can start adding half float without adding even bigger mess to all these functions. ;)
Diffstat (limited to 'intern/cycles/render/image.h')
-rw-r--r-- | intern/cycles/render/image.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index 2ab16dd8967..8735133fd91 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -96,9 +96,8 @@ public: private: int tex_num_images[IMAGE_DATA_NUM_TYPES]; - int tex_image_byte4_start; - int tex_image_float_start; - int tex_image_byte_start; + int tex_start_images[IMAGE_DATA_NUM_TYPES]; + thread_mutex device_mutex; int animation_frame; |