Sergey Sharybin
d26d3cfe19
The issue was caused by splitting happening twice. Fixed by checking for split flag which is assigned to the both states during split. The tricky part was to write catcher data at the moment of split: the transparency and shadow catcher sample count is to be accumulated at that point. Now it is happening in the `intersect_closest` kernel. The downside is that render buffer is to be passed to the kernel, but the benefit is that extra split bounce check is not needed now. Had to move the passes write to shadow catcher header, since include of `film/passes.h` causes all the fun of requirement to have BSDF data structures available. Differential Revision: https://developer.blender.org/D13177
114 lines
4.0 KiB
C++
114 lines
4.0 KiB
C++
/*
|
|
* Copyright 2011-2021 Blender Foundation
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "kernel/integrator/init_from_camera.h"
|
|
#include "kernel/integrator/intersect_closest.h"
|
|
#include "kernel/integrator/intersect_shadow.h"
|
|
#include "kernel/integrator/intersect_subsurface.h"
|
|
#include "kernel/integrator/intersect_volume_stack.h"
|
|
#include "kernel/integrator/shade_background.h"
|
|
#include "kernel/integrator/shade_light.h"
|
|
#include "kernel/integrator/shade_shadow.h"
|
|
#include "kernel/integrator/shade_surface.h"
|
|
#include "kernel/integrator/shade_volume.h"
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
ccl_device void integrator_megakernel(KernelGlobals kg,
|
|
IntegratorState state,
|
|
ccl_global float *ccl_restrict render_buffer)
|
|
{
|
|
/* Each kernel indicates the next kernel to execute, so here we simply
|
|
* have to check what that kernel is and execute it. */
|
|
while (true) {
|
|
/* Handle any shadow paths before we potentially create more shadow paths. */
|
|
const uint32_t shadow_queued_kernel = INTEGRATOR_STATE(
|
|
&state->shadow, shadow_path, queued_kernel);
|
|
if (shadow_queued_kernel) {
|
|
switch (shadow_queued_kernel) {
|
|
case DEVICE_KERNEL_INTEGRATOR_INTERSECT_SHADOW:
|
|
integrator_intersect_shadow(kg, &state->shadow);
|
|
break;
|
|
case DEVICE_KERNEL_INTEGRATOR_SHADE_SHADOW:
|
|
integrator_shade_shadow(kg, &state->shadow, render_buffer);
|
|
break;
|
|
default:
|
|
kernel_assert(0);
|
|
break;
|
|
}
|
|
continue;
|
|
}
|
|
|
|
/* Handle any AO paths before we potentially create more AO paths. */
|
|
const uint32_t ao_queued_kernel = INTEGRATOR_STATE(&state->ao, shadow_path, queued_kernel);
|
|
if (ao_queued_kernel) {
|
|
switch (ao_queued_kernel) {
|
|
case DEVICE_KERNEL_INTEGRATOR_INTERSECT_SHADOW:
|
|
integrator_intersect_shadow(kg, &state->ao);
|
|
break;
|
|
case DEVICE_KERNEL_INTEGRATOR_SHADE_SHADOW:
|
|
integrator_shade_shadow(kg, &state->ao, render_buffer);
|
|
break;
|
|
default:
|
|
kernel_assert(0);
|
|
break;
|
|
}
|
|
continue;
|
|
}
|
|
|
|
/* Then handle regular path kernels. */
|
|
const uint32_t queued_kernel = INTEGRATOR_STATE(state, path, queued_kernel);
|
|
if (queued_kernel) {
|
|
switch (queued_kernel) {
|
|
case DEVICE_KERNEL_INTEGRATOR_INTERSECT_CLOSEST:
|
|
integrator_intersect_closest(kg, state, render_buffer);
|
|
break;
|
|
case DEVICE_KERNEL_INTEGRATOR_SHADE_BACKGROUND:
|
|
integrator_shade_background(kg, state, render_buffer);
|
|
break;
|
|
case DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE:
|
|
integrator_shade_surface(kg, state, render_buffer);
|
|
break;
|
|
case DEVICE_KERNEL_INTEGRATOR_SHADE_VOLUME:
|
|
integrator_shade_volume(kg, state, render_buffer);
|
|
break;
|
|
case DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_RAYTRACE:
|
|
integrator_shade_surface_raytrace(kg, state, render_buffer);
|
|
break;
|
|
case DEVICE_KERNEL_INTEGRATOR_SHADE_LIGHT:
|
|
integrator_shade_light(kg, state, render_buffer);
|
|
break;
|
|
case DEVICE_KERNEL_INTEGRATOR_INTERSECT_SUBSURFACE:
|
|
integrator_intersect_subsurface(kg, state);
|
|
break;
|
|
case DEVICE_KERNEL_INTEGRATOR_INTERSECT_VOLUME_STACK:
|
|
integrator_intersect_volume_stack(kg, state);
|
|
break;
|
|
default:
|
|
kernel_assert(0);
|
|
break;
|
|
}
|
|
continue;
|
|
}
|
|
|
|
break;
|
|
}
|
|
}
|
|
|
|
CCL_NAMESPACE_END
|