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.h | |
| 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.h')
| -rw-r--r-- | intern/cycles/kernel/kernel.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel.h b/intern/cycles/kernel/kernel.h index 78247504b39..20d43c91169 100644 --- a/intern/cycles/kernel/kernel.h +++ b/intern/cycles/kernel/kernel.h @@ -40,14 +40,16 @@ void kernel_cpu_path_trace(KernelGlobals *kg, float4 *buffer, unsigned int *rng_ int sample, int x, int y, int offset, int stride); void kernel_cpu_tonemap(KernelGlobals *kg, uchar4 *rgba, float4 *buffer, int sample, int resolution, int x, int y, int offset, int stride); -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); #ifdef WITH_OPTIMIZED_KERNEL void kernel_cpu_optimized_path_trace(KernelGlobals *kg, float4 *buffer, unsigned int *rng_state, int sample, int x, int y, int offset, int stride); void kernel_cpu_optimized_tonemap(KernelGlobals *kg, uchar4 *rgba, float4 *buffer, int sample, int resolution, int x, int y, int offset, int stride); -void kernel_cpu_optimized_displace(KernelGlobals *kg, uint4 *input, float3 *offset, int i); +void kernel_cpu_optimized_shader(KernelGlobals *kg, uint4 *input, float3 *output, + int type, int i); #endif CCL_NAMESPACE_END |