forked from bartvdbraak/blender
9bce104c8c
Apparently removing kernel arguments broke NVidia OpenCL. Needs more investigation, for the time being revering changes which caused problem.
60 lines
2.4 KiB
C
60 lines
2.4 KiB
C
/*
|
|
* Copyright 2011-2015 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.
|
|
*/
|
|
|
|
#include "../kernel_compat_opencl.h"
|
|
#include "../kernel_math.h"
|
|
#include "../kernel_types.h"
|
|
#include "../kernel_globals.h"
|
|
|
|
/* Since we process various samples in parallel; The output radiance of different samples
|
|
* are stored in different locations; This kernel combines the output radiance contributed
|
|
* by all different samples and stores them in the RenderTile's output buffer.
|
|
*/
|
|
ccl_device void kernel_sum_all_radiance(
|
|
ccl_constant KernelData *data, /* To get pass_stride to offet into buffer */
|
|
ccl_global float *buffer, /* Output buffer of RenderTile */
|
|
ccl_global float *per_sample_output_buffer, /* Radiance contributed by all samples */
|
|
int parallel_samples, int sw, int sh, int stride,
|
|
int buffer_offset_x,
|
|
int buffer_offset_y,
|
|
int buffer_stride,
|
|
int start_sample)
|
|
{
|
|
int x = get_global_id(0);
|
|
int y = get_global_id(1);
|
|
|
|
if(x < sw && y < sh) {
|
|
buffer += ((buffer_offset_x + x) + (buffer_offset_y + y) * buffer_stride) * (data->film.pass_stride);
|
|
per_sample_output_buffer += ((x + y * stride) * parallel_samples) * (data->film.pass_stride);
|
|
|
|
int sample_stride = (data->film.pass_stride);
|
|
|
|
int sample_iterator = 0;
|
|
int pass_stride_iterator = 0;
|
|
int num_floats = data->film.pass_stride;
|
|
|
|
for(sample_iterator = 0; sample_iterator < parallel_samples; sample_iterator++) {
|
|
for(pass_stride_iterator = 0; pass_stride_iterator < num_floats; pass_stride_iterator++) {
|
|
*(buffer + pass_stride_iterator) =
|
|
(start_sample == 0 && sample_iterator == 0)
|
|
? *(per_sample_output_buffer + pass_stride_iterator)
|
|
: *(buffer + pass_stride_iterator) + *(per_sample_output_buffer + pass_stride_iterator);
|
|
}
|
|
per_sample_output_buffer += sample_stride;
|
|
}
|
|
}
|
|
}
|