diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-13 16:32:44 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-13 16:32:44 +0400 |
| commit | dd9c1b7fbf501ef58c9952150698fb5ce3c45903 (patch) | |
| tree | f52d353e3dc36a33a3a8b6609fa8a2ffe39b2d4c /intern/cycles/kernel/kernel_textures.h | |
| parent | f9642926303ec89679e61076ca9e4b9f0be3afe9 (diff) | |
Cycles: OpenCL image texture support, fix an attribute node issue and refactor
feature enabling #defines a bit.
Diffstat (limited to 'intern/cycles/kernel/kernel_textures.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_textures.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/kernel_textures.h index f4de4c100c4..4ab2574c8ad 100644 --- a/intern/cycles/kernel/kernel_textures.h +++ b/intern/cycles/kernel/kernel_textures.h @@ -7,7 +7,6 @@ #define KERNEL_IMAGE_TEX(type, ttype, name) #endif - /* bvh */ KERNEL_TEX(float4, texture_float4, __bvh_nodes) KERNEL_TEX(float4, texture_float4, __tri_woop) @@ -151,6 +150,10 @@ KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_097) KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_098) KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_099) +/* packed image (opencl) */ +KERNEL_TEX(uchar4, texture_uchar4, __tex_image_packed) +KERNEL_TEX(uint4, texture_uint4, __tex_image_packed_info) + #undef KERNEL_TEX #undef KERNEL_IMAGE_TEX |