From 688e5c6d3895a8f6b5aec06977c9dcb4b00e0a76 Mon Sep 17 00:00:00 2001
From: Lukas Stockner <lukasstockner97>
Date: Mon, 11 Jan 2021 20:42:47 +0100
Subject: Fix T82351: Cycles: Tile stealing glitches with adaptive sampling

In my testing this works, but it requires me to remove the min(start_sample...) part in the
adaptive sampling kernel, and I assume there's a reason why it was there?

Reviewed By: brecht

Maniphest Tasks: T82351

Differential Revision: https://developer.blender.org/D9445
---
 intern/cycles/device/device_task.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'intern/cycles/device/device_task.h')

diff --git a/intern/cycles/device/device_task.h b/intern/cycles/device/device_task.h
index f819f84eb43..f9b47c59e95 100644
--- a/intern/cycles/device/device_task.h
+++ b/intern/cycles/device/device_task.h
@@ -117,8 +117,7 @@ class AdaptiveSampling {
  public:
   AdaptiveSampling();
 
-  int align_static_samples(int samples) const;
-  int align_dynamic_samples(int offset, int samples) const;
+  int align_samples(int sample, int num_samples) const;
   bool need_filter(int sample) const;
 
   bool use;
-- 
cgit v1.2.3