Blender Git Loki

Git Commits -> Revision dd2dca2

Revision dd2dca2 by Martijn Berger (master)
March 7, 2014, 22:16 (GMT)
Add support for multiple interpolation modes on cycles image textures

All textures are sampled bi-linear currently with the exception of OSL there texture sampling is fixed and set to smart bi-cubic.

This patch adds user control to this setting.

Added:
- bits to DNA / RNA in the form of an enum for supporting multiple interpolations types
- changes to the image texture node drawing code ( add enum)
- to ImageManager (this needs to know to allocate second texture when interpolation type is different)
- to node compiler (pass on interpolation type)
- to device tex_alloc this also needs to get the concept of multiple interpolation types
- implementation for doing non interpolated lookup for cuda and cpu
- implementation where we pass this along to osl ( this makes OSL also do linear untill I add smartcubic to the interface / DNA/ RNA)

Reviewers: brecht, dingto

Reviewed By: brecht

CC: dingto, venomgfx

Differential Revision: https://developer.blender.org/D317

Commit Details:

Full Hash: dd2dca2f7e77e7521d13b78e875ffa58a90846f2
Parent Commit: ef51b69
Lines Changed: +146, -49

20 Modified Paths:

/intern/cycles/blender/blender_shader.cpp (+1, -0) (Diff)
/intern/cycles/device/device.h (+1, -1) (Diff)
/intern/cycles/device/device_cpu.cpp (+2, -2) (Diff)
/intern/cycles/device/device_cuda.cpp (+12, -4) (Diff)
/intern/cycles/device/device_multi.cpp (+1, -1) (Diff)
/intern/cycles/device/device_network.cpp (+2, -2) (Diff)
/intern/cycles/device/device_opencl.cpp (+1, -1) (Diff)
/intern/cycles/kernel/kernel.cpp (+3, -1) (Diff)
/intern/cycles/kernel/kernel.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_compat_cpu.h (+11, -7) (Diff)
/intern/cycles/kernel/shaders/node_image_texture.osl (+7, -6) (Diff)
/intern/cycles/kernel/svm/svm_image.h (+12, -5) (Diff)
/intern/cycles/render/image.cpp (+30, -11) (Diff)
/intern/cycles/render/image.h (+4, -2) (Diff)
/intern/cycles/render/nodes.cpp (+23, -4) (Diff)
/intern/cycles/render/nodes.h (+1, -0) (Diff)
/intern/cycles/util/util_types.h (+10, -0) (Diff)
/source/blender/editors/space_node/drawnode.c (+1, -0) (Diff)
/source/blender/makesdna/DNA_node_types.h (+7, -1) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+16, -0) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021