[Bf-blender-cvs] [cd1c6214a0b] cycles_oneapi: Cycles: restore default message for compile time in oneAPI backend

[Xavier Hallade]

Commit: cd1c6214a0b7d9c06fc1b7ca9138c9ef31d1223a
Author: Xavier Hallade
Date:   Thu Jun 2 12:04:25 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rBcd1c6214a0b7d9c06fc1b7ca9138c9ef31d1223a

Cycles: restore default message for compile time in oneAPI backend

release builds will use precompiled binaries so users shouldn't run
into lenghty recompilation.

===================================================================

M	intern/cycles/device/device.h
M	intern/cycles/device/oneapi/device_impl.cpp
M	intern/cycles/device/oneapi/device_impl.h
M	intern/cycles/scene/scene.cpp

===================================================================

diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h
index a0c7ecdd04b..340be85e853 100644
--- a/intern/cycles/device/device.h
+++ b/intern/cycles/device/device.h
@@ -157,12 +157,6 @@ class Device {
     return true;
   }
 
-  /* Message, which will be shown during loading/compiling of kernels */
-  virtual string load_kernels_message(uint /*kernel_features*/)
-  {
-    return "Loading render kernels (may take a few minutes the first time)";
-  }
-
   /* GPU device only functions.
    * These may not be used on CPU or multi-devices. */
 
diff --git a/intern/cycles/device/oneapi/device_impl.cpp b/intern/cycles/device/oneapi/device_impl.cpp
index 35a02575322..58e7c4bd6b8 100644
--- a/intern/cycles/device/oneapi/device_impl.cpp
+++ b/intern/cycles/device/oneapi/device_impl.cpp
@@ -91,11 +91,6 @@ BVHLayoutMask OneapiDevice::get_bvh_layout_mask() const
   return BVH_LAYOUT_BVH2;
 }
 
-string OneapiDevice::load_kernels_message(const uint /*requested_features*/)
-{
-  return "Loading render kernels (may take a few dozens of minutes)";
-}
-
 bool OneapiDevice::load_kernels(const uint requested_features)
 {
   assert(device_queue);
diff --git a/intern/cycles/device/oneapi/device_impl.h b/intern/cycles/device/oneapi/device_impl.h
index 501a262230e..41eb53cd00a 100644
--- a/intern/cycles/device/oneapi/device_impl.h
+++ b/intern/cycles/device/oneapi/device_impl.h
@@ -41,8 +41,6 @@ class OneapiDevice : public Device {
 
   bool load_kernels(const uint requested_features) override;
 
-  string load_kernels_message(const uint requested_features) override;
-
   void load_texture_info();
 
   void generic_alloc(device_memory &mem);
diff --git a/intern/cycles/scene/scene.cpp b/intern/cycles/scene/scene.cpp
index 2345eee7045..b35242139ea 100644
--- a/intern/cycles/scene/scene.cpp
+++ b/intern/cycles/scene/scene.cpp
@@ -628,7 +628,7 @@ bool Scene::load_kernels(Progress &progress, bool lock_scene)
   const uint kernel_features = dscene.data.kernel_features;
 
   if (!kernels_loaded || loaded_kernel_features != kernel_features) {
-    progress.set_status(device->load_kernels_message(kernel_features));
+    progress.set_status("Loading render kernels (may take a few minutes the first time)");
 
     scoped_timer timer;