[Bf-blender-cvs] [1fd8c3e] openvdb: Merge branch 'openvdb' into cvdb_ray_isect

Kévin Dietrich noreply at git.blender.org
Sun Nov 13 21:44:18 CET 2016


Commit: 1fd8c3e3f1685d829e1f1049b8b40a0c1221d65e
Author: Kévin Dietrich
Date:   Wed May 11 12:48:58 2016 +0200
Branches: openvdb
https://developer.blender.org/rB1fd8c3e3f1685d829e1f1049b8b40a0c1221d65e

Merge branch 'openvdb' into cvdb_ray_isect

===================================================================



===================================================================

diff --cc intern/cycles/kernel/kernel_textures.h
index b78636d,62b0a6f..c0faa84
--- a/intern/cycles/kernel/kernel_textures.h
+++ b/intern/cycles/kernel/kernel_textures.h
@@@ -72,174 -72,172 +72,175 @@@ KERNEL_TEX(float, texture_float, __look
  /* sobol */
  KERNEL_TEX(uint, texture_uint, __sobol_directions)
  
 +/* volume */
 +KERNEL_TEX(uint, texture_uint, __vol_shader)
 +
  /* 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)
- 
- KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float3d_000)
- KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float3d_001)
- KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float3d_002)
- KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float3d_003)
- KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float3d_004)
+ KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float4_000)
+ KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float4_001)
+ KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float4_002)
+ KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float4_003)
+ KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float4_004)
+ 
+ KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float4_3d_000)
+ KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float4_3d_001)
+ KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float4_3d_002)
+ KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float4_3d_003)
+ KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float4_3d_004)
  
  /* image */
- 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)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_008)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_009)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_010)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_011)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_012)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_013)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_014)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_015)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_016)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_017)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_018)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_019)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_020)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_021)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_022)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_023)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_024)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_025)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_026)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_027)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_028)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_029)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_030)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_031)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_032)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_033)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_034)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_035)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_036)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_037)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_038)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_039)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_040)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_041)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_042)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_043)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_044)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_045)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_046)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_047)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_048)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_049)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_050)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_051)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_052)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_053)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_054)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_055)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_056)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_057)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_058)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_059)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_060)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_061)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_062)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_063)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_064)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_065)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_066)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_067)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_068)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_069)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_070)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_071)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_072)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_073)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_074)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_075)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_076)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_077)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_078)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_079)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_080)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_081)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_082)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_083)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_084)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_085)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_086)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_087)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_088)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_089)
- KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_090)
- 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_byte4_005)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_006)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_007)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_008)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_009)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_010)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_011)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_012)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_013)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_014)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_015)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_016)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_017)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_018)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_019)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_020)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_021)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_022)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_023)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_024)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_025)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_026)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_027)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_028)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_029)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_030)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_031)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_032)
+ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_033)
+ KERNEL_IMAGE_TEX(uchar4, t

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list