Blender Git Loki
Git Commits -> Revision c18712e
Revision c18712e by Brecht Van Lommel (master) November 18, 2013, 07:48 (GMT) |
Cycles: change __device and similar qualifiers to ccl_device in kernel code. This to avoids build conflicts with libc++ on FreeBSD, these __ prefixed values are reserved for compilers. I apologize to anyone who has patches or branches and has to go through the pain of merging this change, it may be easiest to do these same replacements in your code and then apply/merge the patch. Ref T37477. |
Commit Details:
Full Hash: c18712e86814d176433cea781fe1e68715c23bd4
Parent Commit: 6f67f7c
Lines Changed: +804, -805
87 Modified Paths:
/intern/cycles/kernel/closure/bsdf.h (+3, -3) (Diff)
/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h (+5, -5) (Diff)
/intern/cycles/kernel/closure/bsdf_diffuse.h (+11, -11) (Diff)
/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h (+6, -6) (Diff)
/intern/cycles/kernel/closure/bsdf_hair.h (+10, -10) (Diff)
/intern/cycles/kernel/closure/bsdf_microfacet.h (+12, -12) (Diff)
/intern/cycles/kernel/closure/bsdf_oren_nayar.h (+6, -6) (Diff)
/intern/cycles/kernel/closure/bsdf_phong_ramp.h (+6, -6) (Diff)
/intern/cycles/kernel/closure/bsdf_reflection.h (+5, -5) (Diff)
/intern/cycles/kernel/closure/bsdf_refraction.h (+5, -5) (Diff)
/intern/cycles/kernel/closure/bsdf_toon.h (+12, -12) (Diff)
/intern/cycles/kernel/closure/bsdf_transparent.h (+5, -5) (Diff)
/intern/cycles/kernel/closure/bsdf_util.h (+4, -4) (Diff)
/intern/cycles/kernel/closure/bsdf_ward.h (+5, -5) (Diff)
/intern/cycles/kernel/closure/bsdf_westin.h (+10, -10) (Diff)
/intern/cycles/kernel/closure/bssrdf.h (+13, -13) (Diff)
/intern/cycles/kernel/closure/emissive.h (+3, -3) (Diff)
/intern/cycles/kernel/closure/volume.h (+5, -5) (Diff)
/intern/cycles/kernel/kernel.cl (+16, -16) (Diff)
/intern/cycles/kernel/kernel_accumulate.h (+14, -14) (Diff)
/intern/cycles/kernel/kernel_bvh.h (+20, -20) (Diff)
/intern/cycles/kernel/kernel_bvh_subsurface.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_bvh_traversal.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_camera.h (+8, -8) (Diff)
/intern/cycles/kernel/kernel_compat_cuda.h (+6, -7) (Diff)
/intern/cycles/kernel/kernel_compat_opencl.h (+8, -6) (Diff)
/intern/cycles/kernel/kernel_curve.h (+4, -4) (Diff)
/intern/cycles/kernel/kernel_differential.h (+5, -5) (Diff)
/intern/cycles/kernel/kernel_displace.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_emission.h (+5, -5) (Diff)
/intern/cycles/kernel/kernel_film.h (+9, -9) (Diff)
/intern/cycles/kernel/kernel_globals.h (+4, -4) (Diff)
/intern/cycles/kernel/kernel_jitter.h (+9, -9) (Diff)
/intern/cycles/kernel/kernel_light.h (+19, -19) (Diff)
/intern/cycles/kernel/kernel_montecarlo.h (+12, -12) (Diff)
/intern/cycles/kernel/kernel_object.h (+26, -26) (Diff)
/intern/cycles/kernel/kernel_passes.h (+8, -8) (Diff)
/intern/cycles/kernel/kernel_path.h (+12, -12) (Diff)
/intern/cycles/kernel/kernel_path_state.h (+4, -4) (Diff)
/intern/cycles/kernel/kernel_primitive.h (+6, -6) (Diff)
/intern/cycles/kernel/kernel_projection.h (+12, -12) (Diff)
/intern/cycles/kernel/kernel_random.h (+17, -17) (Diff)
/intern/cycles/kernel/kernel_shader.h (+29, -29) (Diff)
/intern/cycles/kernel/kernel_subsurface.h (+7, -7) (Diff)
/intern/cycles/kernel/kernel_triangle.h (+8, -8) (Diff)
/intern/cycles/kernel/svm/svm.h (+14, -14) (Diff)
/intern/cycles/kernel/svm/svm_attribute.h (+4, -4) (Diff)
/intern/cycles/kernel/svm/svm_blackbody.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_brick.h (+3, -3) (Diff)
/intern/cycles/kernel/svm/svm_brightness.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_camera.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_checker.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_closure.h (+17, -17) (Diff)
/intern/cycles/kernel/svm/svm_convert.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_displace.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_fresnel.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_gamma.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_geometry.h (+6, -6) (Diff)
/intern/cycles/kernel/svm/svm_gradient.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_hsv.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_image.h (+9, -9) (Diff)
/intern/cycles/kernel/svm/svm_invert.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_light_path.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_magic.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_mapping.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_math.h (+5, -5) (Diff)
/intern/cycles/kernel/svm/svm_mix.h (+21, -21) (Diff)
/intern/cycles/kernel/svm/svm_musgrave.h (+7, -7) (Diff)
/intern/cycles/kernel/svm/svm_noise.h (+18, -18) (Diff)
/intern/cycles/kernel/svm/svm_noisetex.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_normal.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_ramp.h (+4, -4) (Diff)
/intern/cycles/kernel/svm/svm_sepcomb_hsv.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_sepcomb_rgb.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_sky.h (+6, -6) (Diff)
/intern/cycles/kernel/svm/svm_texture.h (+17, -17) (Diff)
/intern/cycles/kernel/svm/svm_tex_coord.h (+5, -5) (Diff)
/intern/cycles/kernel/svm/svm_value.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_vector_transform.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_voronoi.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_wave.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_wavelength.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_wireframe.h (+1, -1) (Diff)
/intern/cycles/util/util_color.h (+9, -9) (Diff)
/intern/cycles/util/util_math.h (+151, -151) (Diff)
/intern/cycles/util/util_transform.h (+30, -30) (Diff)
/intern/cycles/util/util_types.h (+43, -45) (Diff)
/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h (+5, -5) (Diff)
/intern/cycles/kernel/closure/bsdf_diffuse.h (+11, -11) (Diff)
/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h (+6, -6) (Diff)
/intern/cycles/kernel/closure/bsdf_hair.h (+10, -10) (Diff)
/intern/cycles/kernel/closure/bsdf_microfacet.h (+12, -12) (Diff)
/intern/cycles/kernel/closure/bsdf_oren_nayar.h (+6, -6) (Diff)
/intern/cycles/kernel/closure/bsdf_phong_ramp.h (+6, -6) (Diff)
/intern/cycles/kernel/closure/bsdf_reflection.h (+5, -5) (Diff)
/intern/cycles/kernel/closure/bsdf_refraction.h (+5, -5) (Diff)
/intern/cycles/kernel/closure/bsdf_toon.h (+12, -12) (Diff)
/intern/cycles/kernel/closure/bsdf_transparent.h (+5, -5) (Diff)
/intern/cycles/kernel/closure/bsdf_util.h (+4, -4) (Diff)
/intern/cycles/kernel/closure/bsdf_ward.h (+5, -5) (Diff)
/intern/cycles/kernel/closure/bsdf_westin.h (+10, -10) (Diff)
/intern/cycles/kernel/closure/bssrdf.h (+13, -13) (Diff)
/intern/cycles/kernel/closure/emissive.h (+3, -3) (Diff)
/intern/cycles/kernel/closure/volume.h (+5, -5) (Diff)
/intern/cycles/kernel/kernel.cl (+16, -16) (Diff)
/intern/cycles/kernel/kernel_accumulate.h (+14, -14) (Diff)
/intern/cycles/kernel/kernel_bvh.h (+20, -20) (Diff)
/intern/cycles/kernel/kernel_bvh_subsurface.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_bvh_traversal.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_camera.h (+8, -8) (Diff)
/intern/cycles/kernel/kernel_compat_cuda.h (+6, -7) (Diff)
/intern/cycles/kernel/kernel_compat_opencl.h (+8, -6) (Diff)
/intern/cycles/kernel/kernel_curve.h (+4, -4) (Diff)
/intern/cycles/kernel/kernel_differential.h (+5, -5) (Diff)
/intern/cycles/kernel/kernel_displace.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_emission.h (+5, -5) (Diff)
/intern/cycles/kernel/kernel_film.h (+9, -9) (Diff)
/intern/cycles/kernel/kernel_globals.h (+4, -4) (Diff)
/intern/cycles/kernel/kernel_jitter.h (+9, -9) (Diff)
/intern/cycles/kernel/kernel_light.h (+19, -19) (Diff)
/intern/cycles/kernel/kernel_montecarlo.h (+12, -12) (Diff)
/intern/cycles/kernel/kernel_object.h (+26, -26) (Diff)
/intern/cycles/kernel/kernel_passes.h (+8, -8) (Diff)
/intern/cycles/kernel/kernel_path.h (+12, -12) (Diff)
/intern/cycles/kernel/kernel_path_state.h (+4, -4) (Diff)
/intern/cycles/kernel/kernel_primitive.h (+6, -6) (Diff)
/intern/cycles/kernel/kernel_projection.h (+12, -12) (Diff)
/intern/cycles/kernel/kernel_random.h (+17, -17) (Diff)
/intern/cycles/kernel/kernel_shader.h (+29, -29) (Diff)
/intern/cycles/kernel/kernel_subsurface.h (+7, -7) (Diff)
/intern/cycles/kernel/kernel_triangle.h (+8, -8) (Diff)
/intern/cycles/kernel/svm/svm.h (+14, -14) (Diff)
/intern/cycles/kernel/svm/svm_attribute.h (+4, -4) (Diff)
/intern/cycles/kernel/svm/svm_blackbody.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_brick.h (+3, -3) (Diff)
/intern/cycles/kernel/svm/svm_brightness.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_camera.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_checker.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_closure.h (+17, -17) (Diff)
/intern/cycles/kernel/svm/svm_convert.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_displace.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_fresnel.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_gamma.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_geometry.h (+6, -6) (Diff)
/intern/cycles/kernel/svm/svm_gradient.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_hsv.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_image.h (+9, -9) (Diff)
/intern/cycles/kernel/svm/svm_invert.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_light_path.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_magic.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_mapping.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_math.h (+5, -5) (Diff)
/intern/cycles/kernel/svm/svm_mix.h (+21, -21) (Diff)
/intern/cycles/kernel/svm/svm_musgrave.h (+7, -7) (Diff)
/intern/cycles/kernel/svm/svm_noise.h (+18, -18) (Diff)
/intern/cycles/kernel/svm/svm_noisetex.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_normal.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_ramp.h (+4, -4) (Diff)
/intern/cycles/kernel/svm/svm_sepcomb_hsv.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_sepcomb_rgb.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_sky.h (+6, -6) (Diff)
/intern/cycles/kernel/svm/svm_texture.h (+17, -17) (Diff)
/intern/cycles/kernel/svm/svm_tex_coord.h (+5, -5) (Diff)
/intern/cycles/kernel/svm/svm_value.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_vector_transform.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_voronoi.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_wave.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_wavelength.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_wireframe.h (+1, -1) (Diff)
/intern/cycles/util/util_color.h (+9, -9) (Diff)
/intern/cycles/util/util_math.h (+151, -151) (Diff)
/intern/cycles/util/util_transform.h (+30, -30) (Diff)
/intern/cycles/util/util_types.h (+43, -45) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021