diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-05-09 18:06:22 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-05-10 03:53:50 +0300 |
| commit | 76481eaeff77e46555f8a0458d860911a9a57a9c (patch) | |
| tree | aa3e872c967d4744ad7504a5e54f1003da441984 /intern/cycles/render/scene.h | |
| parent | dc82c2cd4817c6c84a4dd7e313eb2659a8830d59 (diff) | |
Cycles: Add support for float4 textures on OpenCL.
Title says it all, this adds OpenCL float4 texture support.
There is a bug in the code still, I get a "Out of ressources error" on nvidia hardware here, not sure whats wrong yet.
Will investigate further, but maybe someone else has an idea. :)
Reviewers: #cycles, brecht
Subscribers: brecht, candreacchio
Differential Revision: https://developer.blender.org/D1983
Diffstat (limited to 'intern/cycles/render/scene.h')
| -rw-r--r-- | intern/cycles/render/scene.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h index b05e5a61ee9..455053fb3f6 100644 --- a/intern/cycles/render/scene.h +++ b/intern/cycles/render/scene.h @@ -113,7 +113,8 @@ public: device_vector<float4> tex_float4_image[TEX_NUM_FLOAT4_IMAGES_CPU]; /* opencl images */ - device_vector<uchar4> tex_image_packed; + device_vector<uchar4> tex_image_byte4_packed; + device_vector<float4> tex_image_float4_packed; device_vector<uint4> tex_image_packed_info; KernelData data; |