Cleanup: make HIP and CUDA code more consistent

Ref D12834

1 files changed, 7 insertions, 10 deletions

diff --git a/intern/cycles/device/hip/queue.cpp b/intern/cycles/device/hip/queue.cpp
index 6cb29670f94..a612f59fb32 100644
--- a/intern/cycles/device/hip/queue.cpp
+++ b/intern/cycles/device/hip/queue.cpp
@@ -41,22 +41,19 @@ HIPDeviceQueue::~HIPDeviceQueue()
 
 int HIPDeviceQueue::num_concurrent_states(const size_t state_size) const
 {
-  int num_states = 0;
   const int max_num_threads = hip_device_->get_num_multiprocessors() *
                               hip_device_->get_max_num_threads_per_multiprocessor();
-  if (max_num_threads == 0) {
-    num_states = 1048576;  // 65536 * 16
-  }
-  else {
-    num_states = max_num_threads * 16;
-  }
+  int num_states = ((max_num_threads == 0) ? 65536 : max_num_threads) * 16;
 
   const char *factor_str = getenv("CYCLES_CONCURRENT_STATES_FACTOR");
   if (factor_str) {
-    float factor = (float)atof(factor_str);
-    if (!factor)
+    const float factor = (float)atof(factor_str);
+    if (factor != 0.0f) {
+      num_states = max((int)(num_states * factor), 1024);
+    }
+    else {
       VLOG(3) << "CYCLES_CONCURRENT_STATES_FACTOR evaluated to 0";
-    num_states = max((int)(num_states * factor), 1024);
+    }
   }
 
   VLOG(3) << "GPU queue concurrent states: " << num_states << ", using up to "