Make clang-tidy happy.

Author: manon-traverse

lib/API/DX/Device.cpp

@@ -148,20 +148,19 @@ static D3D12_FILTER getDXFilterMode(FilterMode MinFilter, FilterMode MagFilter,
       return MagFilter == FilterMode::Nearest
                  ? D3D12_FILTER_COMPARISON_MIN_MAG_MIP_POINT
                  : D3D12_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT;
-    else
-      return MagFilter == FilterMode::Nearest
-                 ? D3D12_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT
-                 : D3D12_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT;
-  } else {
-    if (MinFilter == FilterMode::Nearest)
-      return MagFilter == FilterMode::Nearest
-                 ? D3D12_FILTER_MIN_MAG_MIP_POINT
-                 : D3D12_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT;
-    else
-      return MagFilter == FilterMode::Nearest
-                 ? D3D12_FILTER_MIN_LINEAR_MAG_MIP_POINT
-                 : D3D12_FILTER_MIN_MAG_LINEAR_MIP_POINT;
+
+    return MagFilter == FilterMode::Nearest
+               ? D3D12_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT
+               : D3D12_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT;
   }
+  if (MinFilter == FilterMode::Nearest)
+    return MagFilter == FilterMode::Nearest
+               ? D3D12_FILTER_MIN_MAG_MIP_POINT
+               : D3D12_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT;
+
+  return MagFilter == FilterMode::Nearest
+             ? D3D12_FILTER_MIN_LINEAR_MAG_MIP_POINT
+             : D3D12_FILTER_MIN_MAG_LINEAR_MIP_POINT;
 }
 
 static D3D12_TEXTURE_ADDRESS_MODE getDXTextureAddressMode(AddressMode Mode) {

lib/Support/OffloadMigration.cpp

@@ -325,7 +325,7 @@ llvm::Error createResources(Device &Dev, Pipeline &P,
       assert(Inserted.second && "TLAS bound to multiple resources NYI");
       (void)Inserted;
     } else if (R.isSampler()) {
-      SamplerCreateDesc Desc = {
+      const SamplerCreateDesc Desc = {
           R.SamplerPtr->MinFilter,    R.SamplerPtr->MagFilter,
           R.SamplerPtr->Address,      R.SamplerPtr->MinLOD,
           R.SamplerPtr->MaxLOD,       R.SamplerPtr->MipLODBias,