Cycles code refactoring: change displace kernel into more generic shader

evaluate kernel, added background shader evaluate.
2011-12-31 15:18:13 +00:00
parent 1b4487e813
commit b5595298d3
13 changed files with 112 additions and 63 deletions
--- 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