diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-09-04 17:29:07 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-09-04 17:29:07 +0400 |
| commit | adea12cb01e4c4f18f345dfbbf49e9e622192e4e (patch) | |
| tree | b43018344c696e4d59437fabc7f17f5b9d6a8e80 /intern/cycles/kernel/kernel_textures.h | |
| parent | 68563134d4800be4eb46aa6b598fd719cdaf2980 (diff) | |
Cycles: merge of changes from tomato branch.
Regular rendering now works tiled, and supports save buffers to save memory
during render and cache render results.
Brick texture node by Thomas.
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture
Image texture Blended Box Mapping.
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture
http://mango.blender.org/production/blended_box/
Various bug fixes by Sergey and Campbell.
* Fix for reading freed memory in some node setups.
* Fix incorrect memory read when synchronizing mesh motion.
* Fix crash appearing when direct light usage is different on different layers.
* Fix for vector pass gives wrong result in some circumstances.
* Fix for wrong resolution used for rendering Render Layer node.
* Option to cancel rendering when doing initial synchronization.
* No more texture limit when using CPU render.
* Many fixes for new tiled rendering.
Diffstat (limited to 'intern/cycles/kernel/kernel_textures.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_textures.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/kernel_textures.h index c1b8eed3dff..4855a948c6e 100644 --- a/intern/cycles/kernel/kernel_textures.h +++ b/intern/cycles/kernel/kernel_textures.h @@ -66,12 +66,14 @@ KERNEL_TEX(float, texture_float, __filter_table) /* sobol */ KERNEL_TEX(uint, texture_uint, __sobol_directions) +/* full-float image */ +KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_000) +KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_001) +KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_002) +KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_003) +KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_004) + /* image */ -KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_000) -KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_001) -KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_002) -KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_003) -KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_004) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_005) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_006) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_007) @@ -162,13 +164,11 @@ 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) - -/* 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) +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) /* packed image (opencl) */ KERNEL_TEX(uchar4, texture_uchar4, __tex_image_packed) |