[Bf-blender-cvs] [54aec4629ec] master: Cleanup: Remove unused code in Cycles

[Thomas Dinges]

Commit: 54aec4629ecd5d679daff167fc9eb7b7d99a3daa
Author: Thomas Dinges
Date:   Mon Dec 12 18:15:41 2022 +0100
Branches: master
https://developer.blender.org/rB54aec4629ecd5d679daff167fc9eb7b7d99a3daa

Cleanup: Remove unused code in Cycles

* preempt_attr was copied from CUDA, but not used in HIP.
* Remove shadowed variable before conditional in EnvironmentTextureNode code.

Differential Revision: https://developer.blender.org/D16741

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

M	intern/cycles/device/hip/device.cpp
M	intern/cycles/scene/light.cpp

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

diff --git a/intern/cycles/device/hip/device.cpp b/intern/cycles/device/hip/device.cpp
index 518239f9877..d3566347834 100644
--- a/intern/cycles/device/hip/device.cpp
+++ b/intern/cycles/device/hip/device.cpp
@@ -163,10 +163,10 @@ void device_hip_info(vector<DeviceInfo> &devices)
     /* If device has a kernel timeout and no compute preemption, we assume
      * it is connected to a display and will freeze the display while doing
      * computations. */
-    int timeout_attr = 0, preempt_attr = 0;
+    int timeout_attr = 0;
     hipDeviceGetAttribute(&timeout_attr, hipDeviceAttributeKernelExecTimeout, num);
 
-    if (timeout_attr && !preempt_attr) {
+    if (timeout_attr) {
       VLOG_INFO << "Device is recognized as display.";
       info.description += " (Display)";
       info.display_device = true;
diff --git a/intern/cycles/scene/light.cpp b/intern/cycles/scene/light.cpp
index f6e9098cd2b..b8addeaffd6 100644
--- a/intern/cycles/scene/light.cpp
+++ b/intern/cycles/scene/light.cpp
@@ -726,7 +726,6 @@ void LightManager::device_update_background(Device *device,
   foreach (ShaderNode *node, shader->graph->nodes) {
     if (node->type == EnvironmentTextureNode::get_node_type()) {
       EnvironmentTextureNode *env = (EnvironmentTextureNode *)node;
-      ImageMetaData metadata;
       if (!env->handle.empty()) {
         ImageMetaData metadata = env->handle.metadata();
         environment_res.x = max(environment_res.x, (int)metadata.width);