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/kernel/kernel_textures.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/kernel/kernel_textures.h')
-rw-r--r-- | intern/cycles/kernel/kernel_textures.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/kernel_textures.h index 86979d8c31f..62b0a6f2923 100644 --- a/intern/cycles/kernel/kernel_textures.h +++ b/intern/cycles/kernel/kernel_textures.h @@ -236,7 +236,8 @@ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_149) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_150) /* packed image (opencl) */ -KERNEL_TEX(uchar4, texture_uchar4, __tex_image_packed) +KERNEL_TEX(uchar4, texture_uchar4, __tex_image_byte4_packed) +KERNEL_TEX(float4, texture_float4, __tex_image_float4_packed) KERNEL_TEX(uint4, texture_uint4, __tex_image_packed_info) #undef KERNEL_TEX |