bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cycles: cleanup warning

Browse Source
This commit is contained in:
Dalai Felinto 2020-03-06 15:26:54 +01:00
parent 17f08cff6a
commit c60366c01f
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
intern/cycles/device/device_cpu.cpp
View File

@ -830,7 +830,7 @@ class CPUDevice : public Device {
return true; return true;
} }
bool adaptive_sampling_filter(KernelGlobals *kg, RenderTile &tile, int sample) bool adaptive_sampling_filter(KernelGlobals *kg, RenderTile &tile)
{ {
WorkTile wtile; WorkTile wtile;
wtile.x = tile.x; wtile.x = tile.x;
@ -848,11 +848,10 @@ class CPUDevice : public Device {
for (int x = tile.x; x < tile.x + tile.w; ++x) { for (int x = tile.x; x < tile.x + tile.w; ++x) {
any |= kernel_do_adaptive_filter_y(kg, x, &wtile); any |= kernel_do_adaptive_filter_y(kg, x, &wtile);
} }
return (!any); return (!any);
} }
void adaptive_sampling_post(const DeviceTask &task, const RenderTile &tile, KernelGlobals *kg) void adaptive_sampling_post(const RenderTile &tile, KernelGlobals *kg)
{ {
float *render_buffer = (float *)tile.buffer; float *render_buffer = (float *)tile.buffer;
for (int y = tile.y; y < tile.y + tile.h; y++) { for (int y = tile.y; y < tile.y + tile.h; y++) {
@ -911,7 +910,7 @@ class CPUDevice : public Device {
task.update_progress(&tile, tile.w * tile.h); task.update_progress(&tile, tile.w * tile.h);
if (task.adaptive_sampling.use && task.adaptive_sampling.need_filter(sample)) { if (task.adaptive_sampling.use && task.adaptive_sampling.need_filter(sample)) {
const bool stop = adaptive_sampling_filter(kg, tile, sample); const bool stop = adaptive_sampling_filter(kg, tile);
if (stop) { if (stop) {
tile.sample = end_sample; tile.sample = end_sample;
break; break;
@ -923,7 +922,7 @@ class CPUDevice : public Device {
} }
if (task.adaptive_sampling.use) { if (task.adaptive_sampling.use) {
adaptive_sampling_post(task, tile, kg); adaptive_sampling_post(tile, kg);
} }
} }

2
intern/cycles/device/device_optix.cpp
View File

@ -672,7 +672,7 @@ class OptiXDevice : public CUDADevice {
// Run the adaptive sampling kernels at selected samples aligned to step samples. // Run the adaptive sampling kernels at selected samples aligned to step samples.
uint filter_sample = wtile.start_sample + wtile.num_samples - 1; uint filter_sample = wtile.start_sample + wtile.num_samples - 1;
if (task.adaptive_sampling.use && task.adaptive_sampling.need_filter(filter_sample)) { if (task.adaptive_sampling.use && task.adaptive_sampling.need_filter(filter_sample)) {
adaptive_sampling_filter(filter_sample, &wtile, d_wtile_ptr, cuda_stream[thread_index]); adaptive_sampling_filter(&wtile, d_wtile_ptr, cuda_stream[thread_index]);
} }
// Wait for launch to finish // Wait for launch to finish