diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-03-07 16:27:18 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-03-07 16:27:18 +0400 |
| commit | 9fba458a7fe535e60f5c6beee9757fe25ffe2d49 (patch) | |
| tree | e625eb73d3da32a01c84385e1976f81d2f8b92bd /intern/cycles/kernel/kernel_textures.h | |
| parent | bdf731f03d727d3862537c59fa11477b77eb60b0 (diff) | |
Cycles: float texture support. Due to GPU limitations there are now 95 byte,
and 5 float image textures. For CPU render this limit will be lifted later
on with image cache support. Patch by Mike Farnsworth.
Also changed color space option in image/environment texture node, to show
options Color and Non-Color Data, instead of sRGB and Linear, this is more
descriptive, and it was not really correct to equate Non-Color Data with
Linear.
Diffstat (limited to 'intern/cycles/kernel/kernel_textures.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_textures.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/kernel_textures.h index ca7ae432efa..8bab735d0d1 100644 --- a/intern/cycles/kernel/kernel_textures.h +++ b/intern/cycles/kernel/kernel_textures.h @@ -142,11 +142,13 @@ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_091) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_092) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_093) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_094) -KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_095) -KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_096) -KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_097) -KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_098) -KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_099) + +/* full-float image */ +KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_095) +KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_096) +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) #undef KERNEL_TEX #undef KERNEL_IMAGE_TEX |