diff options
author | Thomas Dinges <blender@dingto.org> | 2017-04-27 12:11:08 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2017-04-27 12:11:08 +0300 |
commit | a00f54332da1fc47a4d31e57f0291193ec48abd0 (patch) | |
tree | 12ed908f268264a6f555834bef70258766247360 /intern/cycles/render/scene.h | |
parent | ec25060a05e394560ec92388b347c45bd9eba0ed (diff) |
Cleanup: Some style and code tweaks to Image Code after changes.
Whitespace and order of switch/case etc. Let's try to stick to float4/byte4/half4/float/byte/half order as defined in "ImageDataType".
Diffstat (limited to 'intern/cycles/render/scene.h')
-rw-r--r-- | intern/cycles/render/scene.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h index 02015f3403c..b02f9f35393 100644 --- a/intern/cycles/render/scene.h +++ b/intern/cycles/render/scene.h @@ -114,18 +114,18 @@ public: device_vector<uint> sobol_directions; /* cpu images */ - std::vector<device_vector<uchar4>* > tex_byte4_image; std::vector<device_vector<float4>* > tex_float4_image; + std::vector<device_vector<uchar4>* > tex_byte4_image; + std::vector<device_vector<half4>* > tex_half4_image; std::vector<device_vector<float>* > tex_float_image; std::vector<device_vector<uchar>* > tex_byte_image; - std::vector<device_vector<half4>* > tex_half4_image; std::vector<device_vector<half>* > tex_half_image; /* opencl images */ - device_vector<uchar4> tex_image_byte4_packed; device_vector<float4> tex_image_float4_packed; - device_vector<uchar> tex_image_byte_packed; + device_vector<uchar4> tex_image_byte4_packed; device_vector<float> tex_image_float_packed; + device_vector<uchar> tex_image_byte_packed; device_vector<uint4> tex_image_packed_info; KernelData data; |