Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'intern/cycles/render/scene.h')
-rw-r--r--intern/cycles/render/scene.h8
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;