~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
40
40
#define __device
41
41
#define __device_inline __device
42
42
#define __device_noinline  __device __noinline
 
43
#define __may_alias
43
44
 
44
45
/* no assert in opencl */
45
46
#define kernel_assert(cond)
78
79
 
79
80
#define make_float2(x, y) ((float2)(x, y))
80
81
#ifdef __CL_NO_FLOAT3__
81
 
#define make_float3(x, y, z) ((float4)(x, y, z, 0.0))
 
82
#define make_float3(x, y, z) ((float4)(x, y, z, 0.0f))
82
83
#else
83
84
#define make_float3(x, y, z) ((float3)(x, y, z))
84
85
#endif