Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-12-30 17:04:01 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-12-30 17:04:04 +0300
commit3918c8b9a52ae9dcdb0488df92d7d3ca615be8c7 (patch)
tree3740e477610ab3ed020d505cd98308d29f663f5b /intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h
parentc8a551bf13edf711b93ea89cd3fcd244e4206cee (diff)
Cycles: Optionally output luminance from the shader evaluation kernel
This makes it possible to move some parts of evaluation from host to the device and hopefully reduce memory usage by avoid having full RGBA buffer on the host. Reviewers: juicyfruit, lukasstockner97, brecht Reviewed By: lukasstockner97, brecht Differential Revision: https://developer.blender.org/D1702
Diffstat (limited to 'intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h')
-rw-r--r--intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h b/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h
index 693285ec3a8..0249610b381 100644
--- a/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h
+++ b/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h
@@ -99,12 +99,14 @@ void KERNEL_FUNCTION_FULL_NAME(convert_to_half_float)(KernelGlobals *kg,
void KERNEL_FUNCTION_FULL_NAME(shader)(KernelGlobals *kg,
uint4 *input,
float4 *output,
+ float *output_luma,
int type,
int i,
int offset,
int sample)
{
if(type >= SHADER_EVAL_BAKE) {
+ kernel_assert(output_luma == NULL);
kernel_bake_evaluate(kg,
input,
output,
@@ -117,6 +119,7 @@ void KERNEL_FUNCTION_FULL_NAME(shader)(KernelGlobals *kg,
kernel_shader_evaluate(kg,
input,
output,
+ output_luma,
(ShaderEvalType)type,
i,
sample);