~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to intern/cycles/kernel/kernel_textures.h

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2012-04-28 12:11:12 UTC
  • mto: (14.1.6 experimental) (1.5.1)
  • mto: This revision was merged to the branch mainline in revision 34.
  • Revision ID: package-import@ubuntu.com-20120428121112-2zi0vp8b6vejda8i
Tags: upstream-2.63
ImportĀ upstreamĀ versionĀ 2.63

Show diffs side-by-side

added added

removed removed

Lines of Context:
142
142
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_092)
143
143
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_093)
144
144
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_094)
145
 
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_095)
146
 
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_096)
147
 
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_097)
148
 
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_098)
149
 
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_099)
 
145
 
 
146
/* full-float image */
 
147
KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_095)
 
148
KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_096)
 
149
KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_097)
 
150
KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_098)
 
151
KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_099)
150
152
 
151
153
#undef KERNEL_TEX
152
154
#undef KERNEL_IMAGE_TEX