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
142 lines
6.2 KiB
C++
142 lines
6.2 KiB
C++
/*
|
|
* Copyright 2011-2013 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.
|
|
*/
|
|
|
|
/* Templated common declaration part of all CPU kernels. */
|
|
|
|
/* --------------------------------------------------------------------
|
|
* Integrator.
|
|
*/
|
|
|
|
#define KERNEL_INTEGRATOR_FUNCTION(name) \
|
|
void KERNEL_FUNCTION_FULL_NAME(integrator_##name)(const KernelGlobalsCPU *ccl_restrict kg, \
|
|
IntegratorStateCPU *state)
|
|
|
|
#define KERNEL_INTEGRATOR_SHADE_FUNCTION(name) \
|
|
void KERNEL_FUNCTION_FULL_NAME(integrator_##name)(const KernelGlobalsCPU *ccl_restrict kg, \
|
|
IntegratorStateCPU *state, \
|
|
ccl_global float *render_buffer)
|
|
|
|
#define KERNEL_INTEGRATOR_INIT_FUNCTION(name) \
|
|
bool KERNEL_FUNCTION_FULL_NAME(integrator_##name)(const KernelGlobalsCPU *ccl_restrict kg, \
|
|
IntegratorStateCPU *state, \
|
|
KernelWorkTile *tile, \
|
|
ccl_global float *render_buffer)
|
|
|
|
KERNEL_INTEGRATOR_INIT_FUNCTION(init_from_camera);
|
|
KERNEL_INTEGRATOR_INIT_FUNCTION(init_from_bake);
|
|
KERNEL_INTEGRATOR_SHADE_FUNCTION(intersect_closest);
|
|
KERNEL_INTEGRATOR_FUNCTION(intersect_shadow);
|
|
KERNEL_INTEGRATOR_FUNCTION(intersect_subsurface);
|
|
KERNEL_INTEGRATOR_FUNCTION(intersect_volume_stack);
|
|
KERNEL_INTEGRATOR_SHADE_FUNCTION(shade_background);
|
|
KERNEL_INTEGRATOR_SHADE_FUNCTION(shade_light);
|
|
KERNEL_INTEGRATOR_SHADE_FUNCTION(shade_shadow);
|
|
KERNEL_INTEGRATOR_SHADE_FUNCTION(shade_surface);
|
|
KERNEL_INTEGRATOR_SHADE_FUNCTION(shade_volume);
|
|
KERNEL_INTEGRATOR_SHADE_FUNCTION(megakernel);
|
|
|
|
#undef KERNEL_INTEGRATOR_FUNCTION
|
|
#undef KERNEL_INTEGRATOR_INIT_FUNCTION
|
|
#undef KERNEL_INTEGRATOR_SHADE_FUNCTION
|
|
|
|
#define KERNEL_FILM_CONVERT_FUNCTION(name) \
|
|
void KERNEL_FUNCTION_FULL_NAME(film_convert_##name)(const KernelFilmConvert *kfilm_convert, \
|
|
const float *buffer, \
|
|
float *pixel, \
|
|
const int width, \
|
|
const int buffer_stride, \
|
|
const int pixel_stride); \
|
|
void KERNEL_FUNCTION_FULL_NAME(film_convert_half_rgba_##name)( \
|
|
const KernelFilmConvert *kfilm_convert, \
|
|
const float *buffer, \
|
|
half4 *pixel, \
|
|
const int width, \
|
|
const int buffer_stride);
|
|
|
|
KERNEL_FILM_CONVERT_FUNCTION(depth)
|
|
KERNEL_FILM_CONVERT_FUNCTION(mist)
|
|
KERNEL_FILM_CONVERT_FUNCTION(sample_count)
|
|
KERNEL_FILM_CONVERT_FUNCTION(float)
|
|
|
|
KERNEL_FILM_CONVERT_FUNCTION(light_path)
|
|
KERNEL_FILM_CONVERT_FUNCTION(float3)
|
|
|
|
KERNEL_FILM_CONVERT_FUNCTION(motion)
|
|
KERNEL_FILM_CONVERT_FUNCTION(cryptomatte)
|
|
KERNEL_FILM_CONVERT_FUNCTION(shadow_catcher)
|
|
KERNEL_FILM_CONVERT_FUNCTION(shadow_catcher_matte_with_shadow)
|
|
KERNEL_FILM_CONVERT_FUNCTION(combined)
|
|
KERNEL_FILM_CONVERT_FUNCTION(float4)
|
|
|
|
#undef KERNEL_FILM_CONVERT_FUNCTION
|
|
|
|
/* --------------------------------------------------------------------
|
|
* Shader evaluation.
|
|
*/
|
|
|
|
void KERNEL_FUNCTION_FULL_NAME(shader_eval_background)(const KernelGlobalsCPU *kg,
|
|
const KernelShaderEvalInput *input,
|
|
float *output,
|
|
const int offset);
|
|
void KERNEL_FUNCTION_FULL_NAME(shader_eval_displace)(const KernelGlobalsCPU *kg,
|
|
const KernelShaderEvalInput *input,
|
|
float *output,
|
|
const int offset);
|
|
void KERNEL_FUNCTION_FULL_NAME(shader_eval_curve_shadow_transparency)(
|
|
const KernelGlobalsCPU *kg,
|
|
const KernelShaderEvalInput *input,
|
|
float *output,
|
|
const int offset);
|
|
|
|
/* --------------------------------------------------------------------
|
|
* Adaptive sampling.
|
|
*/
|
|
|
|
bool KERNEL_FUNCTION_FULL_NAME(adaptive_sampling_convergence_check)(
|
|
const KernelGlobalsCPU *kg,
|
|
ccl_global float *render_buffer,
|
|
int x,
|
|
int y,
|
|
float threshold,
|
|
bool reset,
|
|
int offset,
|
|
int stride);
|
|
|
|
void KERNEL_FUNCTION_FULL_NAME(adaptive_sampling_filter_x)(const KernelGlobalsCPU *kg,
|
|
ccl_global float *render_buffer,
|
|
int y,
|
|
int start_x,
|
|
int width,
|
|
int offset,
|
|
int stride);
|
|
void KERNEL_FUNCTION_FULL_NAME(adaptive_sampling_filter_y)(const KernelGlobalsCPU *kg,
|
|
ccl_global float *render_buffer,
|
|
int x,
|
|
int start_y,
|
|
int height,
|
|
int offset,
|
|
int stride);
|
|
|
|
/* --------------------------------------------------------------------
|
|
* Cryptomatte.
|
|
*/
|
|
|
|
void KERNEL_FUNCTION_FULL_NAME(cryptomatte_postprocess)(const KernelGlobalsCPU *kg,
|
|
ccl_global float *render_buffer,
|
|
int pixel_index);
|
|
|
|
#undef KERNEL_ARCH
|