diff options
author | Thomas Dinges <blender@dingto.org> | 2016-05-06 14:42:50 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2016-05-06 15:37:35 +0300 |
commit | 3807bcb3a845475ac938a331329d3fd92d90c3e4 (patch) | |
tree | 98fc2b7357cd7ac02c9e16317f4bc8ec8a4f9100 /intern/cycles/kernel/svm/svm_image.h | |
parent | 36d8a70b00c2c0a1bc28ffad4cc2e283a77d7bab (diff) |
Cleanup: Rename texture slots to float4 and byte, to distinguish from future float (single channel) and half_float slots.
Should be no functional changes, tested CPU and CUDA.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_image.h')
-rw-r--r-- | intern/cycles/kernel/svm/svm_image.h | 316 |
1 files changed, 158 insertions, 158 deletions
diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h index 07ab2f28577..d950fc45b11 100644 --- a/intern/cycles/kernel/svm/svm_image.h +++ b/intern/cycles/kernel/svm/svm_image.h @@ -16,13 +16,13 @@ CCL_NAMESPACE_BEGIN -/* Float textures on various devices. */ +/* Float4 textures on various devices. */ #if defined(__KERNEL_CPU__) - #define TEX_NUM_FLOAT_IMAGES TEX_NUM_FLOAT_IMAGES_CPU + #define TEX_NUM_FLOAT4_IMAGES TEX_NUM_FLOAT4_IMAGES_CPU #elif defined(__KERNEL_CUDA__) - #define TEX_NUM_FLOAT_IMAGES TEX_NUM_FLOAT_IMAGES_CUDA + #define TEX_NUM_FLOAT4_IMAGES TEX_NUM_FLOAT4_IMAGES_CUDA #else - #define TEX_NUM_FLOAT_IMAGES TEX_NUM_FLOAT_IMAGES_OPENCL + #define TEX_NUM_FLOAT4_IMAGES TEX_NUM_FLOAT4_IMAGES_OPENCL #endif #ifdef __KERNEL_OPENCL__ @@ -115,7 +115,7 @@ ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, r.y *= invw; r.z *= invw; - if(id >= TEX_NUM_FLOAT_IMAGES) { + if(id >= TEX_NUM_FLOAT4_IMAGES) { r.x = min(r.x, 1.0f); r.y = min(r.y, 1.0f); r.z = min(r.z, 1.0f); @@ -156,159 +156,159 @@ ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, * 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 86: r = kernel_tex_image_interp(__tex_image_086, x, y); break; - case 87: r = kernel_tex_image_interp(__tex_image_087, x, y); break; - case 88: r = kernel_tex_image_interp(__tex_image_088, x, y); break; - case 89: r = kernel_tex_image_interp(__tex_image_089, x, y); break; - case 90: r = kernel_tex_image_interp(__tex_image_090, x, y); break; - case 91: r = kernel_tex_image_interp(__tex_image_091, x, y); break; - case 92: r = kernel_tex_image_interp(__tex_image_092, 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_byte_005, x, y); break; + case 6: r = kernel_tex_image_interp(__tex_image_byte_006, x, y); break; + case 7: r = kernel_tex_image_interp(__tex_image_byte_007, x, y); break; + case 8: r = kernel_tex_image_interp(__tex_image_byte_008, x, y); break; + case 9: r = kernel_tex_image_interp(__tex_image_byte_009, x, y); break; + case 10: r = kernel_tex_image_interp(__tex_image_byte_010, x, y); break; + case 11: r = kernel_tex_image_interp(__tex_image_byte_011, x, y); break; + case 12: r = kernel_tex_image_interp(__tex_image_byte_012, x, y); break; + case 13: r = kernel_tex_image_interp(__tex_image_byte_013, x, y); break; + case 14: r = kernel_tex_image_interp(__tex_image_byte_014, x, y); break; + case 15: r = kernel_tex_image_interp(__tex_image_byte_015, x, y); break; + case 16: r = kernel_tex_image_interp(__tex_image_byte_016, x, y); break; + case 17: r = kernel_tex_image_interp(__tex_image_byte_017, x, y); break; + case 18: r = kernel_tex_image_interp(__tex_image_byte_018, x, y); break; + case 19: r = kernel_tex_image_interp(__tex_image_byte_019, x, y); break; + case 20: r = kernel_tex_image_interp(__tex_image_byte_020, x, y); break; + case 21: r = kernel_tex_image_interp(__tex_image_byte_021, x, y); break; + case 22: r = kernel_tex_image_interp(__tex_image_byte_022, x, y); break; + case 23: r = kernel_tex_image_interp(__tex_image_byte_023, x, y); break; + case 24: r = kernel_tex_image_interp(__tex_image_byte_024, x, y); break; + case 25: r = kernel_tex_image_interp(__tex_image_byte_025, x, y); break; + case 26: r = kernel_tex_image_interp(__tex_image_byte_026, x, y); break; + case 27: r = kernel_tex_image_interp(__tex_image_byte_027, x, y); break; + case 28: r = kernel_tex_image_interp(__tex_image_byte_028, x, y); break; + case 29: r = kernel_tex_image_interp(__tex_image_byte_029, x, y); break; + case 30: r = kernel_tex_image_interp(__tex_image_byte_030, x, y); break; + case 31: r = kernel_tex_image_interp(__tex_image_byte_031, x, y); break; + case 32: r = kernel_tex_image_interp(__tex_image_byte_032, x, y); break; + case 33: r = kernel_tex_image_interp(__tex_image_byte_033, x, y); break; + case 34: r = kernel_tex_image_interp(__tex_image_byte_034, x, y); break; + case 35: r = kernel_tex_image_interp(__tex_image_byte_035, x, y); break; + case 36: r = kernel_tex_image_interp(__tex_image_byte_036, x, y); break; + case 37: r = kernel_tex_image_interp(__tex_image_byte_037, x, y); break; + case 38: r = kernel_tex_image_interp(__tex_image_byte_038, x, y); break; + case 39: r = kernel_tex_image_interp(__tex_image_byte_039, x, y); break; + case 40: r = kernel_tex_image_interp(__tex_image_byte_040, x, y); break; + case 41: r = kernel_tex_image_interp(__tex_image_byte_041, x, y); break; + case 42: r = kernel_tex_image_interp(__tex_image_byte_042, x, y); break; + case 43: r = kernel_tex_image_interp(__tex_image_byte_043, x, y); break; + case 44: r = kernel_tex_image_interp(__tex_image_byte_044, x, y); break; + case 45: r = kernel_tex_image_interp(__tex_image_byte_045, x, y); break; + case 46: r = kernel_tex_image_interp(__tex_image_byte_046, x, y); break; + case 47: r = kernel_tex_image_interp(__tex_image_byte_047, x, y); break; + case 48: r = kernel_tex_image_interp(__tex_image_byte_048, x, y); break; + case 49: r = kernel_tex_image_interp(__tex_image_byte_049, x, y); break; + case 50: r = kernel_tex_image_interp(__tex_image_byte_050, x, y); break; + case 51: r = kernel_tex_image_interp(__tex_image_byte_051, x, y); break; + case 52: r = kernel_tex_image_interp(__tex_image_byte_052, x, y); break; + case 53: r = kernel_tex_image_interp(__tex_image_byte_053, x, y); break; + case 54: r = kernel_tex_image_interp(__tex_image_byte_054, x, y); break; + case 55: r = kernel_tex_image_interp(__tex_image_byte_055, x, y); break; + case 56: r = kernel_tex_image_interp(__tex_image_byte_056, x, y); break; + case 57: r = kernel_tex_image_interp(__tex_image_byte_057, x, y); break; + case 58: r = kernel_tex_image_interp(__tex_image_byte_058, x, y); break; + case 59: r = kernel_tex_image_interp(__tex_image_byte_059, x, y); break; + case 60: r = kernel_tex_image_interp(__tex_image_byte_060, x, y); break; + case 61: r = kernel_tex_image_interp(__tex_image_byte_061, x, y); break; + case 62: r = kernel_tex_image_interp(__tex_image_byte_062, x, y); break; + case 63: r = kernel_tex_image_interp(__tex_image_byte_063, x, y); break; + case 64: r = kernel_tex_image_interp(__tex_image_byte_064, x, y); break; + case 65: r = kernel_tex_image_interp(__tex_image_byte_065, x, y); break; + case 66: r = kernel_tex_image_interp(__tex_image_byte_066, x, y); break; + case 67: r = kernel_tex_image_interp(__tex_image_byte_067, x, y); break; + case 68: r = kernel_tex_image_interp(__tex_image_byte_068, x, y); break; + case 69: r = kernel_tex_image_interp(__tex_image_byte_069, x, y); break; + case 70: r = kernel_tex_image_interp(__tex_image_byte_070, x, y); break; + case 71: r = kernel_tex_image_interp(__tex_image_byte_071, x, y); break; + case 72: r = kernel_tex_image_interp(__tex_image_byte_072, x, y); break; + case 73: r = kernel_tex_image_interp(__tex_image_byte_073, x, y); break; + case 74: r = kernel_tex_image_interp(__tex_image_byte_074, x, y); break; + case 75: r = kernel_tex_image_interp(__tex_image_byte_075, x, y); break; + case 76: r = kernel_tex_image_interp(__tex_image_byte_076, x, y); break; + case 77: r = kernel_tex_image_interp(__tex_image_byte_077, x, y); break; + case 78: r = kernel_tex_image_interp(__tex_image_byte_078, x, y); break; + case 79: r = kernel_tex_image_interp(__tex_image_byte_079, x, y); break; + case 80: r = kernel_tex_image_interp(__tex_image_byte_080, x, y); break; + case 81: r = kernel_tex_image_interp(__tex_image_byte_081, x, y); break; + case 82: r = kernel_tex_image_interp(__tex_image_byte_082, x, y); break; + case 83: r = kernel_tex_image_interp(__tex_image_byte_083, x, y); break; + case 84: r = kernel_tex_image_interp(__tex_image_byte_084, x, y); break; + case 85: r = kernel_tex_image_interp(__tex_image_byte_085, x, y); break; + case 86: r = kernel_tex_image_interp(__tex_image_byte_086, x, y); break; + case 87: r = kernel_tex_image_interp(__tex_image_byte_087, x, y); break; + case 88: r = kernel_tex_image_interp(__tex_image_byte_088, x, y); break; + case 89: r = kernel_tex_image_interp(__tex_image_byte_089, x, y); break; + case 90: r = kernel_tex_image_interp(__tex_image_byte_090, x, y); break; + case 91: r = kernel_tex_image_interp(__tex_image_byte_091, x, y); break; + case 92: r = kernel_tex_image_interp(__tex_image_byte_092, x, y); break; # if defined(__CUDA_ARCH__) && (__CUDA_ARCH__ >= 300) - case 93: r = kernel_tex_image_interp(__tex_image_093, x, y); break; - case 94: r = kernel_tex_image_interp(__tex_image_094, x, y); break; - case 95: r = kernel_tex_image_interp(__tex_image_095, x, y); break; - case 96: r = kernel_tex_image_interp(__tex_image_096, x, y); break; - case 97: r = kernel_tex_image_interp(__tex_image_097, x, y); break; - case 98: r = kernel_tex_image_interp(__tex_image_098, x, y); break; - case 99: r = kernel_tex_image_interp(__tex_image_099, x, y); break; - case 100: r = kernel_tex_image_interp(__tex_image_100, x, y); break; - case 101: r = kernel_tex_image_interp(__tex_image_101, x, y); break; - case 102: r = kernel_tex_image_interp(__tex_image_102, x, y); break; - case 103: r = kernel_tex_image_interp(__tex_image_103, x, y); break; - case 104: r = kernel_tex_image_interp(__tex_image_104, x, y); break; - case 105: r = kernel_tex_image_interp(__tex_image_105, x, y); break; - case 106: r = kernel_tex_image_interp(__tex_image_106, x, y); break; - case 107: r = kernel_tex_image_interp(__tex_image_107, x, y); break; - case 108: r = kernel_tex_image_interp(__tex_image_108, x, y); break; - case 109: r = kernel_tex_image_interp(__tex_image_109, x, y); break; - case 110: r = kernel_tex_image_interp(__tex_image_110, x, y); break; - case 111: r = kernel_tex_image_interp(__tex_image_111, x, y); break; - case 112: r = kernel_tex_image_interp(__tex_image_112, x, y); break; - case 113: r = kernel_tex_image_interp(__tex_image_113, x, y); break; - case 114: r = kernel_tex_image_interp(__tex_image_114, x, y); break; - case 115: r = kernel_tex_image_interp(__tex_image_115, x, y); break; - case 116: r = kernel_tex_image_interp(__tex_image_116, x, y); break; - case 117: r = kernel_tex_image_interp(__tex_image_117, x, y); break; - case 118: r = kernel_tex_image_interp(__tex_image_118, x, y); break; - case 119: r = kernel_tex_image_interp(__tex_image_119, x, y); break; - case 120: r = kernel_tex_image_interp(__tex_image_120, x, y); break; - case 121: r = kernel_tex_image_interp(__tex_image_121, x, y); break; - case 122: r = kernel_tex_image_interp(__tex_image_122, x, y); break; - case 123: r = kernel_tex_image_interp(__tex_image_123, x, y); break; - case 124: r = kernel_tex_image_interp(__tex_image_124, x, y); break; - case 125: r = kernel_tex_image_interp(__tex_image_125, x, y); break; - case 126: r = kernel_tex_image_interp(__tex_image_126, x, y); break; - case 127: r = kernel_tex_image_interp(__tex_image_127, x, y); break; - case 128: r = kernel_tex_image_interp(__tex_image_128, x, y); break; - case 129: r = kernel_tex_image_interp(__tex_image_129, x, y); break; - case 130: r = kernel_tex_image_interp(__tex_image_130, x, y); break; - case 131: r = kernel_tex_image_interp(__tex_image_131, x, y); break; - case 132: r = kernel_tex_image_interp(__tex_image_132, x, y); break; - case 133: r = kernel_tex_image_interp(__tex_image_133, x, y); break; - case 134: r = kernel_tex_image_interp(__tex_image_134, x, y); break; - case 135: r = kernel_tex_image_interp(__tex_image_135, x, y); break; - case 136: r = kernel_tex_image_interp(__tex_image_136, x, y); break; - case 137: r = kernel_tex_image_interp(__tex_image_137, x, y); break; - case 138: r = kernel_tex_image_interp(__tex_image_138, x, y); break; - case 139: r = kernel_tex_image_interp(__tex_image_139, x, y); break; - case 140: r = kernel_tex_image_interp(__tex_image_140, x, y); break; - case 141: r = kernel_tex_image_interp(__tex_image_141, x, y); break; - case 142: r = kernel_tex_image_interp(__tex_image_142, x, y); break; - case 143: r = kernel_tex_image_interp(__tex_image_143, x, y); break; - case 144: r = kernel_tex_image_interp(__tex_image_144, x, y); break; - case 145: r = kernel_tex_image_interp(__tex_image_145, x, y); break; - case 146: r = kernel_tex_image_interp(__tex_image_146, x, y); break; - case 147: r = kernel_tex_image_interp(__tex_image_147, x, y); break; - case 148: r = kernel_tex_image_interp(__tex_image_148, x, y); break; - case 149: r = kernel_tex_image_interp(__tex_image_149, x, y); break; - case 150: r = kernel_tex_image_interp(__tex_image_150, x, y); break; + case 93: r = kernel_tex_image_interp(__tex_image_byte_093, x, y); break; + case 94: r = kernel_tex_image_interp(__tex_image_byte_094, x, y); break; + case 95: r = kernel_tex_image_interp(__tex_image_byte_095, x, y); break; + case 96: r = kernel_tex_image_interp(__tex_image_byte_096, x, y); break; + case 97: r = kernel_tex_image_interp(__tex_image_byte_097, x, y); break; + case 98: r = kernel_tex_image_interp(__tex_image_byte_098, x, y); break; + case 99: r = kernel_tex_image_interp(__tex_image_byte_099, x, y); break; + case 100: r = kernel_tex_image_interp(__tex_image_byte_100, x, y); break; + case 101: r = kernel_tex_image_interp(__tex_image_byte_101, x, y); break; + case 102: r = kernel_tex_image_interp(__tex_image_byte_102, x, y); break; + case 103: r = kernel_tex_image_interp(__tex_image_byte_103, x, y); break; + case 104: r = kernel_tex_image_interp(__tex_image_byte_104, x, y); break; + case 105: r = kernel_tex_image_interp(__tex_image_byte_105, x, y); break; + case 106: r = kernel_tex_image_interp(__tex_image_byte_106, x, y); break; + case 107: r = kernel_tex_image_interp(__tex_image_byte_107, x, y); break; + case 108: r = kernel_tex_image_interp(__tex_image_byte_108, x, y); break; + case 109: r = kernel_tex_image_interp(__tex_image_byte_109, x, y); break; + case 110: r = kernel_tex_image_interp(__tex_image_byte_110, x, y); break; + case 111: r = kernel_tex_image_interp(__tex_image_byte_111, x, y); break; + case 112: r = kernel_tex_image_interp(__tex_image_byte_112, x, y); break; + case 113: r = kernel_tex_image_interp(__tex_image_byte_113, x, y); break; + case 114: r = kernel_tex_image_interp(__tex_image_byte_114, x, y); break; + case 115: r = kernel_tex_image_interp(__tex_image_byte_115, x, y); break; + case 116: r = kernel_tex_image_interp(__tex_image_byte_116, x, y); break; + case 117: r = kernel_tex_image_interp(__tex_image_byte_117, x, y); break; + case 118: r = kernel_tex_image_interp(__tex_image_byte_118, x, y); break; + case 119: r = kernel_tex_image_interp(__tex_image_byte_119, x, y); break; + case 120: r = kernel_tex_image_interp(__tex_image_byte_120, x, y); break; + case 121: r = kernel_tex_image_interp(__tex_image_byte_121, x, y); break; + case 122: r = kernel_tex_image_interp(__tex_image_byte_122, x, y); break; + case 123: r = kernel_tex_image_interp(__tex_image_byte_123, x, y); break; + case 124: r = kernel_tex_image_interp(__tex_image_byte_124, x, y); break; + case 125: r = kernel_tex_image_interp(__tex_image_byte_125, x, y); break; + case 126: r = kernel_tex_image_interp(__tex_image_byte_126, x, y); break; + case 127: r = kernel_tex_image_interp(__tex_image_byte_127, x, y); break; + case 128: r = kernel_tex_image_interp(__tex_image_byte_128, x, y); break; + case 129: r = kernel_tex_image_interp(__tex_image_byte_129, x, y); break; + case 130: r = kernel_tex_image_interp(__tex_image_byte_130, x, y); break; + case 131: r = kernel_tex_image_interp(__tex_image_byte_131, x, y); break; + case 132: r = kernel_tex_image_interp(__tex_image_byte_132, x, y); break; + case 133: r = kernel_tex_image_interp(__tex_image_byte_133, x, y); break; + case 134: r = kernel_tex_image_interp(__tex_image_byte_134, x, y); break; + case 135: r = kernel_tex_image_interp(__tex_image_byte_135, x, y); break; + case 136: r = kernel_tex_image_interp(__tex_image_byte_136, x, y); break; + case 137: r = kernel_tex_image_interp(__tex_image_byte_137, x, y); break; + case 138: r = kernel_tex_image_interp(__tex_image_byte_138, x, y); break; + case 139: r = kernel_tex_image_interp(__tex_image_byte_139, x, y); break; + case 140: r = kernel_tex_image_interp(__tex_image_byte_140, x, y); break; + case 141: r = kernel_tex_image_interp(__tex_image_byte_141, x, y); break; + case 142: r = kernel_tex_image_interp(__tex_image_byte_142, x, y); break; + case 143: r = kernel_tex_image_interp(__tex_image_byte_143, x, y); break; + case 144: r = kernel_tex_image_interp(__tex_image_byte_144, x, y); break; + case 145: r = kernel_tex_image_interp(__tex_image_byte_145, x, y); break; + case 146: r = kernel_tex_image_interp(__tex_image_byte_146, x, y); break; + case 147: r = kernel_tex_image_interp(__tex_image_byte_147, x, y); break; + case 148: r = kernel_tex_image_interp(__tex_image_byte_148, x, y); break; + case 149: r = kernel_tex_image_interp(__tex_image_byte_149, x, y); break; + case 150: r = kernel_tex_image_interp(__tex_image_byte_150, x, y); break; # endif default: @@ -322,7 +322,7 @@ ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, if(use_alpha && alpha != 1.0f && alpha != 0.0f) { r_ssef = r_ssef / ssef(alpha); - if(id >= TEX_NUM_FLOAT_IMAGES) + if(id >= TEX_NUM_FLOAT4_IMAGES) r_ssef = min(r_ssef, ssef(1.0f)); r.w = alpha; } @@ -338,7 +338,7 @@ ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, r.y *= invw; r.z *= invw; - if(id >= TEX_NUM_FLOAT_IMAGES) { + if(id >= TEX_NUM_FLOAT4_IMAGES) { r.x = min(r.x, 1.0f); r.y = min(r.y, 1.0f); r.z = min(r.z, 1.0f); |