diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-02-26 19:31:33 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-03-11 19:07:17 +0300 |
commit | f01bc597a8e6bf5df19f1af0c422918c96b25e41 (patch) | |
tree | 14e118d55e360186227c7d04d4f1ab6052acf2bf /intern/cycles/kernel/kernels/opencl | |
parent | 9910803574c4472e348ce140a49fc4fb212f9ee7 (diff) |
Cleanup: stop encoding image data type in slot index
This is legacy code from when we had a fixed number of textures.
Diffstat (limited to 'intern/cycles/kernel/kernels/opencl')
-rw-r--r-- | intern/cycles/kernel/kernels/opencl/kernel_opencl_image.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernels/opencl/kernel_opencl_image.h b/intern/cycles/kernel/kernels/opencl/kernel_opencl_image.h index b6390679331..f7dea383b82 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_opencl_image.h +++ b/intern/cycles/kernel/kernels/opencl/kernel_opencl_image.h @@ -47,7 +47,7 @@ ccl_device_inline float4 svm_image_texture_read(KernelGlobals *kg, int id, int offset) { - const int texture_type = kernel_tex_type(id); + const int texture_type = info->data_type; /* Float4 */ if (texture_type == IMAGE_DATA_TYPE_FLOAT4) { |