diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-31 19:18:13 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-31 19:18:13 +0400 |
| commit | b5595298d36a5023cc33ed41463fd6c032f2ec7b (patch) | |
| tree | e3a404393ff4a8e39a991f9a3d8ca78c0d3033a7 /intern/cycles/kernel/kernel.cpp | |
| parent | 1b4487e813edac9c5b57b6d5c6175c46c4a54b1c (diff) | |
Cycles code refactoring: change displace kernel into more generic shader
evaluate kernel, added background shader evaluate.
Diffstat (limited to 'intern/cycles/kernel/kernel.cpp')
| -rw-r--r-- | intern/cycles/kernel/kernel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel.cpp b/intern/cycles/kernel/kernel.cpp index b4c3839dbd0..e66ddd86cd6 100644 --- a/intern/cycles/kernel/kernel.cpp +++ b/intern/cycles/kernel/kernel.cpp @@ -216,11 +216,11 @@ void kernel_cpu_tonemap(KernelGlobals *kg, uchar4 *rgba, float4 *buffer, int sam kernel_film_tonemap(kg, rgba, buffer, sample, resolution, x, y, offset, stride); } -/* Displacement */ +/* Shader Evaluation */ -void kernel_cpu_displace(KernelGlobals *kg, uint4 *input, float3 *offset, int i) +void kernel_cpu_shader(KernelGlobals *kg, uint4 *input, float3 *output, int type, int i) { - kernel_displace(kg, input, offset, i); + kernel_shader_evaluate(kg, input, output, (ShaderEvalType)type, i); } CCL_NAMESPACE_END |