Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit c6e9383

Browse files
[Impeller] clang-tidy fixes (#42503)
1 parent 704d84b commit c6e9383

File tree

10 files changed

+15
-13
lines changed

10 files changed

+15
-13
lines changed

impeller/renderer/backend/gles/render_pass_gles.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void ConfigureStencil(const ProcTableGLES& gl,
100100
gl.Enable(GL_STENCIL_TEST);
101101
const auto& front = pipeline.GetFrontStencilAttachmentDescriptor();
102102
const auto& back = pipeline.GetBackStencilAttachmentDescriptor();
103-
if (front == back) {
103+
if (front.has_value() && front == back) {
104104
ConfigureStencil(GL_FRONT_AND_BACK, gl, *front, stencil_reference);
105105
} else if (front.has_value()) {
106106
ConfigureStencil(GL_FRONT, gl, *front, stencil_reference);

impeller/renderer/backend/vulkan/command_encoder_vk.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ namespace impeller {
1414

1515
class TrackedObjectsVK {
1616
public:
17-
explicit TrackedObjectsVK(std::weak_ptr<const DeviceHolder> device_holder,
18-
const std::shared_ptr<CommandPoolVK>& pool)
17+
explicit TrackedObjectsVK(
18+
const std::weak_ptr<const DeviceHolder>& device_holder,
19+
const std::shared_ptr<CommandPoolVK>& pool)
1920
: desc_pool_(device_holder) {
2021
if (!pool) {
2122
return;
@@ -96,7 +97,7 @@ class TrackedObjectsVK {
9697
};
9798

9899
CommandEncoderVK::CommandEncoderVK(
99-
std::weak_ptr<const DeviceHolder> device_holder,
100+
const std::weak_ptr<const DeviceHolder>& device_holder,
100101
const std::shared_ptr<QueueVK>& queue,
101102
const std::shared_ptr<CommandPoolVK>& pool,
102103
std::shared_ptr<FenceWaiterVK> fence_waiter)

impeller/renderer/backend/vulkan/command_encoder_vk.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class CommandEncoderVK {
7979
std::shared_ptr<TrackedObjectsVK> tracked_objects_;
8080
bool is_valid_ = false;
8181

82-
CommandEncoderVK(std::weak_ptr<const DeviceHolder> device_holder,
82+
CommandEncoderVK(const std::weak_ptr<const DeviceHolder>& device_holder,
8383
const std::shared_ptr<QueueVK>& queue,
8484
const std::shared_ptr<CommandPoolVK>& pool,
8585
std::shared_ptr<FenceWaiterVK> fence_waiter);

impeller/renderer/backend/vulkan/context_vk.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ void ContextVK::Setup(Settings settings) {
227227
VALIDATION_LOG << "No valid Vulkan device found.";
228228
return;
229229
}
230-
device_holder->physical_device = std::move(physical_device.value());
230+
device_holder->physical_device = physical_device.value();
231231
}
232232

233233
//----------------------------------------------------------------------------

impeller/renderer/backend/vulkan/descriptor_pool_vk.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
namespace impeller {
1111

1212
DescriptorPoolVK::DescriptorPoolVK(
13-
std::weak_ptr<const DeviceHolder> device_holder)
13+
const std::weak_ptr<const DeviceHolder>& device_holder)
1414
: device_holder_(device_holder) {
1515
FML_DCHECK(device_holder.lock());
1616
}

impeller/renderer/backend/vulkan/descriptor_pool_vk.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ namespace impeller {
2727
///
2828
class DescriptorPoolVK {
2929
public:
30-
explicit DescriptorPoolVK(std::weak_ptr<const DeviceHolder> device_holder);
30+
explicit DescriptorPoolVK(
31+
const std::weak_ptr<const DeviceHolder>& device_holder);
3132

3233
~DescriptorPoolVK();
3334

impeller/renderer/backend/vulkan/fence_waiter_vk.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace impeller {
1313

1414
FenceWaiterVK::FenceWaiterVK(std::weak_ptr<DeviceHolder> device_holder)
15-
: device_holder_(device_holder) {
15+
: device_holder_(std::move(device_holder)) {
1616
waiter_thread_ = std::make_unique<std::thread>([&]() { Main(); });
1717
is_valid_ = true;
1818
}
@@ -81,7 +81,7 @@ void FenceWaiterVK::Main() {
8181
}
8282

8383
std::optional<std::vector<vk::Fence>> FenceWaiterVK::TrimAndCreateWaitSetLocked(
84-
std::shared_ptr<DeviceHolder> device_holder) {
84+
const std::shared_ptr<DeviceHolder>& device_holder) {
8585
if (terminate_) {
8686
return std::nullopt;
8787
}

impeller/renderer/backend/vulkan/fence_waiter_vk.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class FenceWaiterVK {
4747
void Main();
4848

4949
std::optional<std::vector<vk::Fence>> TrimAndCreateWaitSetLocked(
50-
std::shared_ptr<DeviceHolder> device_holder);
50+
const std::shared_ptr<DeviceHolder>& device_holder);
5151

5252
FML_DISALLOW_COPY_AND_ASSIGN(FenceWaiterVK);
5353
};

impeller/renderer/backend/vulkan/pipeline_vk.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ PipelineVK::PipelineVK(std::weak_ptr<DeviceHolder> device_holder,
1414
vk::UniquePipelineLayout layout,
1515
vk::UniqueDescriptorSetLayout descriptor_set_layout)
1616
: Pipeline(std::move(library), desc),
17-
device_holder_(device_holder),
17+
device_holder_(std::move(device_holder)),
1818
pipeline_(std::move(pipeline)),
1919
render_pass_(std::move(render_pass)),
2020
layout_(std::move(layout)),

impeller/renderer/backend/vulkan/shader_library_vk.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static std::string VKShaderNameToShaderKeyName(const std::string& name,
5555
ShaderLibraryVK::ShaderLibraryVK(
5656
std::weak_ptr<DeviceHolder> device_holder,
5757
const std::vector<std::shared_ptr<fml::Mapping>>& shader_libraries_data)
58-
: device_holder_(device_holder) {
58+
: device_holder_(std::move(device_holder)) {
5959
TRACE_EVENT0("impeller", "CreateShaderLibrary");
6060
bool success = true;
6161
auto iterator = [&](auto type, //

0 commit comments

Comments
 (0)