[Bf-blender-cvs] [e835404] cycles_hair_bvh: Merge branch 'master' into cycles_hair_bvh
Sergey Sharybin
noreply at git.blender.org
Wed May 11 16:51:42 CEST 2016
Commit: e83540498bbc01e33cc5c9f70676d1683fde36e9
Author: Sergey Sharybin
Date: Wed May 11 13:00:15 2016 +0200
Branches: cycles_hair_bvh
https://developer.blender.org/rBe83540498bbc01e33cc5c9f70676d1683fde36e9
Merge branch 'master' into cycles_hair_bvh
===================================================================
===================================================================
diff --cc intern/cycles/kernel/svm/svm_image.h
index a9c5993,faff4ce..927ba6b
--- a/intern/cycles/kernel/svm/svm_image.h
+++ b/intern/cycles/kernel/svm/svm_image.h
@@@ -156,159 -161,159 +161,159 @@@ ccl_device float4 svm_image_texture(Ker
* and we cannot use all since we still need some for other storage */
switch(id) {
- case 0: r = kernel_tex_image_interp(__tex_image_float_000, x, y); break;
- case 1: r = kernel_tex_image_interp(__tex_image_float_001, x, y); break;
- case 2: r = kernel_tex_image_interp(__tex_image_float_002, x, y); break;
- case 3: r = kernel_tex_image_interp(__tex_image_float_003, x, y); break;
- case 4: r = kernel_tex_image_interp(__tex_image_float_004, x, y); break;
- case 5: r = kernel_tex_image_interp(__tex_image_005, x, y); break;
- case 6: r = kernel_tex_image_interp(__tex_image_006, x, y); break;
- case 7: r = kernel_tex_image_interp(__tex_image_007, x, y); break;
- case 8: r = kernel_tex_image_interp(__tex_image_008, x, y); break;
- case 9: r = kernel_tex_image_interp(__tex_image_009, x, y); break;
- case 10: r = kernel_tex_image_interp(__tex_image_010, x, y); break;
- case 11: r = kernel_tex_image_interp(__tex_image_011, x, y); break;
- case 12: r = kernel_tex_image_interp(__tex_image_012, x, y); break;
- case 13: r = kernel_tex_image_interp(__tex_image_013, x, y); break;
- case 14: r = kernel_tex_image_interp(__tex_image_014, x, y); break;
- case 15: r = kernel_tex_image_interp(__tex_image_015, x, y); break;
- case 16: r = kernel_tex_image_interp(__tex_image_016, x, y); break;
- case 17: r = kernel_tex_image_interp(__tex_image_017, x, y); break;
- case 18: r = kernel_tex_image_interp(__tex_image_018, x, y); break;
- case 19: r = kernel_tex_image_interp(__tex_image_019, x, y); break;
- case 20: r = kernel_tex_image_interp(__tex_image_020, x, y); break;
- case 21: r = kernel_tex_image_interp(__tex_image_021, x, y); break;
- case 22: r = kernel_tex_image_interp(__tex_image_022, x, y); break;
- case 23: r = kernel_tex_image_interp(__tex_image_023, x, y); break;
- case 24: r = kernel_tex_image_interp(__tex_image_024, x, y); break;
- case 25: r = kernel_tex_image_interp(__tex_image_025, x, y); break;
- case 26: r = kernel_tex_image_interp(__tex_image_026, x, y); break;
- case 27: r = kernel_tex_image_interp(__tex_image_027, x, y); break;
- case 28: r = kernel_tex_image_interp(__tex_image_028, x, y); break;
- case 29: r = kernel_tex_image_interp(__tex_image_029, x, y); break;
- case 30: r = kernel_tex_image_interp(__tex_image_030, x, y); break;
- case 31: r = kernel_tex_image_interp(__tex_image_031, x, y); break;
- case 32: r = kernel_tex_image_interp(__tex_image_032, x, y); break;
- case 33: r = kernel_tex_image_interp(__tex_image_033, x, y); break;
- case 34: r = kernel_tex_image_interp(__tex_image_034, x, y); break;
- case 35: r = kernel_tex_image_interp(__tex_image_035, x, y); break;
- case 36: r = kernel_tex_image_interp(__tex_image_036, x, y); break;
- case 37: r = kernel_tex_image_interp(__tex_image_037, x, y); break;
- case 38: r = kernel_tex_image_interp(__tex_image_038, x, y); break;
- case 39: r = kernel_tex_image_interp(__tex_image_039, x, y); break;
- case 40: r = kernel_tex_image_interp(__tex_image_040, x, y); break;
- case 41: r = kernel_tex_image_interp(__tex_image_041, x, y); break;
- case 42: r = kernel_tex_image_interp(__tex_image_042, x, y); break;
- case 43: r = kernel_tex_image_interp(__tex_image_043, x, y); break;
- case 44: r = kernel_tex_image_interp(__tex_image_044, x, y); break;
- case 45: r = kernel_tex_image_interp(__tex_image_045, x, y); break;
- case 46: r = kernel_tex_image_interp(__tex_image_046, x, y); break;
- case 47: r = kernel_tex_image_interp(__tex_image_047, x, y); break;
- case 48: r = kernel_tex_image_interp(__tex_image_048, x, y); break;
- case 49: r = kernel_tex_image_interp(__tex_image_049, x, y); break;
- case 50: r = kernel_tex_image_interp(__tex_image_050, x, y); break;
- case 51: r = kernel_tex_image_interp(__tex_image_051, x, y); break;
- case 52: r = kernel_tex_image_interp(__tex_image_052, x, y); break;
- case 53: r = kernel_tex_image_interp(__tex_image_053, x, y); break;
- case 54: r = kernel_tex_image_interp(__tex_image_054, x, y); break;
- case 55: r = kernel_tex_image_interp(__tex_image_055, x, y); break;
- case 56: r = kernel_tex_image_interp(__tex_image_056, x, y); break;
- case 57: r = kernel_tex_image_interp(__tex_image_057, x, y); break;
- case 58: r = kernel_tex_image_interp(__tex_image_058, x, y); break;
- case 59: r = kernel_tex_image_interp(__tex_image_059, x, y); break;
- case 60: r = kernel_tex_image_interp(__tex_image_060, x, y); break;
- case 61: r = kernel_tex_image_interp(__tex_image_061, x, y); break;
- case 62: r = kernel_tex_image_interp(__tex_image_062, x, y); break;
- case 63: r = kernel_tex_image_interp(__tex_image_063, x, y); break;
- case 64: r = kernel_tex_image_interp(__tex_image_064, x, y); break;
- case 65: r = kernel_tex_image_interp(__tex_image_065, x, y); break;
- case 66: r = kernel_tex_image_interp(__tex_image_066, x, y); break;
- case 67: r = kernel_tex_image_interp(__tex_image_067, x, y); break;
- case 68: r = kernel_tex_image_interp(__tex_image_068, x, y); break;
- case 69: r = kernel_tex_image_interp(__tex_image_069, x, y); break;
- case 70: r = kernel_tex_image_interp(__tex_image_070, x, y); break;
- case 71: r = kernel_tex_image_interp(__tex_image_071, x, y); break;
- case 72: r = kernel_tex_image_interp(__tex_image_072, x, y); break;
- case 73: r = kernel_tex_image_interp(__tex_image_073, x, y); break;
- case 74: r = kernel_tex_image_interp(__tex_image_074, x, y); break;
- case 75: r = kernel_tex_image_interp(__tex_image_075, x, y); break;
- case 76: r = kernel_tex_image_interp(__tex_image_076, x, y); break;
- case 77: r = kernel_tex_image_interp(__tex_image_077, x, y); break;
- case 78: r = kernel_tex_image_interp(__tex_image_078, x, y); break;
- case 79: r = kernel_tex_image_interp(__tex_image_079, x, y); break;
- case 80: r = kernel_tex_image_interp(__tex_image_080, x, y); break;
- case 81: r = kernel_tex_image_interp(__tex_image_081, x, y); break;
- case 82: r = kernel_tex_image_interp(__tex_image_082, x, y); break;
- case 83: r = kernel_tex_image_interp(__tex_image_083, x, y); break;
- case 84: r = kernel_tex_image_interp(__tex_image_084, x, y); break;
- case 85: r = kernel_tex_image_interp(__tex_image_085, x, y); break;
+ case 0: r = kernel_tex_image_interp(__tex_image_float4_000, x, y); break;
+ case 1: r = kernel_tex_image_interp(__tex_image_float4_001, x, y); break;
+ case 2: r = kernel_tex_image_interp(__tex_image_float4_002, x, y); break;
+ case 3: r = kernel_tex_image_interp(__tex_image_float4_003, x, y); break;
+ case 4: r = kernel_tex_image_interp(__tex_image_float4_004, x, y); break;
+ case 5: r = kernel_tex_image_interp(__tex_image_byte4_005, x, y); break;
+ case 6: r = kernel_tex_image_interp(__tex_image_byte4_006, x, y); break;
+ case 7: r = kernel_tex_image_interp(__tex_image_byte4_007, x, y); break;
+ case 8: r = kernel_tex_image_interp(__tex_image_byte4_008, x, y); break;
+ case 9: r = kernel_tex_image_interp(__tex_image_byte4_009, x, y); break;
+ case 10: r = kernel_tex_image_interp(__tex_image_byte4_010, x, y); break;
+ case 11: r = kernel_tex_image_interp(__tex_image_byte4_011, x, y); break;
+ case 12: r = kernel_tex_image_interp(__tex_image_byte4_012, x, y); break;
+ case 13: r = kernel_tex_image_interp(__tex_image_byte4_013, x, y); break;
+ case 14: r = kernel_tex_image_interp(__tex_image_byte4_014, x, y); break;
+ case 15: r = kernel_tex_image_interp(__tex_image_byte4_015, x, y); break;
+ case 16: r = kernel_tex_image_interp(__tex_image_byte4_016, x, y); break;
+ case 17: r = kernel_tex_image_interp(__tex_image_byte4_017, x, y); break;
+ case 18: r = kernel_tex_image_interp(__tex_image_byte4_018, x, y); break;
+ case 19: r = kernel_tex_image_interp(__tex_image_byte4_019, x, y); break;
+ case 20: r = kernel_tex_image_interp(__tex_image_byte4_020, x, y); break;
+ case 21: r = kernel_tex_image_interp(__tex_image_byte4_021, x, y); break;
+ case 22: r = kernel_tex_image_interp(__tex_image_byte4_022, x, y); break;
+ case 23: r = kernel_tex_image_interp(__tex_image_byte4_023, x, y); break;
+ case 24: r = kernel_tex_image_interp(__tex_image_byte4_024, x, y); break;
+ case 25: r = kernel_tex_image_interp(__tex_image_byte4_025, x, y); break;
+ case 26: r = kernel_tex_image_interp(__tex_image_byte4_026, x, y); break;
+ case 27: r = kernel_tex_image_interp(__tex_image_byte4_027, x, y); break;
+ case 28: r = kernel_tex_image_interp(__tex_image_byte4_028, x, y); break;
+ case 29: r = kernel_tex_image_interp(__tex_image_byte4_029, x, y); break;
+ case 30: r = kernel_tex_image_interp(__tex_image_byte4_030, x, y); break;
+ case 31: r = kernel_tex_image_interp(__tex_image_byte4_031, x, y); break;
+ case 32: r = kernel_tex_image_interp(__tex_image_byte4_032, x, y); break;
+ case 33: r = kernel_tex_image_interp(__tex_image_byte4_033, x, y); break;
+ case 34: r = kernel_tex_image_interp(__tex_image_byte4_034, x, y); break;
+ case 35: r = kernel_tex_image_interp(__tex_image_byte4_035, x, y); break;
+ case 36: r = kernel_tex_image_interp(__tex_image_byte4_036, x, y); break;
+ case 37: r = kernel_tex_image_interp(__tex_image_byte4_037, x, y); break;
+ case 38: r = kernel_tex_image_interp(__tex_image_byte4_038, x, y); break;
+ case 39: r = kernel_tex_image_interp(__tex_image_byte4_039, x, y); break;
+ case 40: r = kernel_tex_image_interp(__tex_image_byte4_040, x, y); break;
+ case 41: r = kernel_tex_image_interp(__tex_image_byte4_041, x, y); break;
+ case 42: r = kernel_tex_image_interp(__tex_image_byte4_042, x, y); break;
+ case 43: r = kernel_tex_image_interp(__tex_image_byte4_043, x, y); break;
+ case 44: r = kernel_tex_image_interp(__tex_image_byte4_044, x, y); break;
+ case 45: r = kernel_tex_image_interp(__tex_image_byte4_045, x, y); break;
+ case 46: r = kernel_tex_image_interp(__tex_image_byte4_046, x, y); break;
+ case 47: r = kernel_tex_image_i
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list