Skip to content

Commit cb133d4

Browse files
[Impeller] Move BufferView/Texture/Sampler when binding. (flutter#48628)
Most of the time we are passing an rvalue into this functions anyway, so in theory moving should be faster. Right?
1 parent a53ca8a commit cb133d4

5 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎impeller/core/resource_binder.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ struct ResourceBinder {
2929
virtual bool BindResource(ShaderStage stage,
3030
const ShaderUniformSlot& slot,
3131
const ShaderMetadata& metadata,
32-
const BufferView& view) = 0;
32+
BufferView view) = 0;
3333

3434
virtual bool BindResource(ShaderStage stage,
3535
const SampledImageSlot& slot,
3636
const ShaderMetadata& metadata,
37-
const std::shared_ptr<const Texture>& texture,
38-
const std::shared_ptr<const Sampler>& sampler) = 0;
37+
std::shared_ptr<const Texture> texture,
38+
std::shared_ptr<const Sampler> sampler) = 0;
3939
};
4040

4141
} // namespace impeller

‎impeller/renderer/command.cc‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,23 @@ BufferView Command::GetVertexBuffer() const {
3333
bool Command::BindResource(ShaderStage stage,
3434
const ShaderUniformSlot& slot,
3535
const ShaderMetadata& metadata,
36-
const BufferView& view) {
37-
return DoBindResource(stage, slot, &metadata, view);
36+
BufferView view) {
37+
return DoBindResource(stage, slot, &metadata, std::move(view));
3838
}
3939

4040
bool Command::BindResource(
4141
ShaderStage stage,
4242
const ShaderUniformSlot& slot,
4343
const std::shared_ptr<const ShaderMetadata>& metadata,
44-
const BufferView& view) {
45-
return DoBindResource(stage, slot, metadata, view);
44+
BufferView view) {
45+
return DoBindResource(stage, slot, metadata, std::move(view));
4646
}
4747

4848
template <class T>
4949
bool Command::DoBindResource(ShaderStage stage,
5050
const ShaderUniformSlot& slot,
5151
const T metadata,
52-
const BufferView& view) {
52+
BufferView view) {
5353
FML_DCHECK(slot.ext_res_0 != VertexDescriptor::kReservedVertexBufferIndex);
5454
if (!view) {
5555
return false;
@@ -58,11 +58,11 @@ bool Command::DoBindResource(ShaderStage stage,
5858
switch (stage) {
5959
case ShaderStage::kVertex:
6060
vertex_bindings.buffers[slot.ext_res_0] = {
61-
.slot = slot, .view = BufferResource(metadata, view)};
61+
.slot = slot, .view = BufferResource(metadata, std::move(view))};
6262
return true;
6363
case ShaderStage::kFragment:
6464
fragment_bindings.buffers[slot.ext_res_0] = {
65-
.slot = slot, .view = BufferResource(metadata, view)};
65+
.slot = slot, .view = BufferResource(metadata, std::move(view))};
6666
return true;
6767
case ShaderStage::kCompute:
6868
VALIDATION_LOG << "Use ComputeCommands for compute shader stages.";
@@ -78,8 +78,8 @@ bool Command::DoBindResource(ShaderStage stage,
7878
bool Command::BindResource(ShaderStage stage,
7979
const SampledImageSlot& slot,
8080
const ShaderMetadata& metadata,
81-
const std::shared_ptr<const Texture>& texture,
82-
const std::shared_ptr<const Sampler>& sampler) {
81+
std::shared_ptr<const Texture> texture,
82+
std::shared_ptr<const Sampler> sampler) {
8383
if (!sampler || !sampler->IsValid()) {
8484
return false;
8585
}
@@ -94,15 +94,15 @@ bool Command::BindResource(ShaderStage stage,
9494
case ShaderStage::kVertex:
9595
vertex_bindings.sampled_images[slot.sampler_index] = TextureAndSampler{
9696
.slot = slot,
97-
.texture = {&metadata, texture},
98-
.sampler = {&metadata, sampler},
97+
.texture = {&metadata, std::move(texture)},
98+
.sampler = {&metadata, std::move(sampler)},
9999
};
100100
return true;
101101
case ShaderStage::kFragment:
102102
fragment_bindings.sampled_images[slot.sampler_index] = TextureAndSampler{
103103
.slot = slot,
104-
.texture = {&metadata, texture},
105-
.sampler = {&metadata, sampler},
104+
.texture = {&metadata, std::move(texture)},
105+
.sampler = {&metadata, std::move(sampler)},
106106
};
107107
return true;
108108
case ShaderStage::kCompute:

‎impeller/renderer/command.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,19 +189,19 @@ struct Command : public ResourceBinder {
189189
bool BindResource(ShaderStage stage,
190190
const ShaderUniformSlot& slot,
191191
const ShaderMetadata& metadata,
192-
const BufferView& view) override;
192+
BufferView view) override;
193193

194194
bool BindResource(ShaderStage stage,
195195
const ShaderUniformSlot& slot,
196196
const std::shared_ptr<const ShaderMetadata>& metadata,
197-
const BufferView& view);
197+
BufferView view);
198198

199199
// |ResourceBinder|
200200
bool BindResource(ShaderStage stage,
201201
const SampledImageSlot& slot,
202202
const ShaderMetadata& metadata,
203-
const std::shared_ptr<const Texture>& texture,
204-
const std::shared_ptr<const Sampler>& sampler) override;
203+
std::shared_ptr<const Texture> texture,
204+
std::shared_ptr<const Sampler> sampler) override;
205205

206206
BufferView GetVertexBuffer() const;
207207

@@ -212,7 +212,7 @@ struct Command : public ResourceBinder {
212212
bool DoBindResource(ShaderStage stage,
213213
const ShaderUniformSlot& slot,
214214
T metadata,
215-
const BufferView& view);
215+
BufferView view);
216216
};
217217

218218
} // namespace impeller

‎impeller/renderer/compute_command.cc‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace impeller {
1414
bool ComputeCommand::BindResource(ShaderStage stage,
1515
const ShaderUniformSlot& slot,
1616
const ShaderMetadata& metadata,
17-
const BufferView& view) {
17+
BufferView view) {
1818
if (stage != ShaderStage::kCompute) {
1919
VALIDATION_LOG << "Use Command for non-compute shader stages.";
2020
return false;
@@ -23,16 +23,16 @@ bool ComputeCommand::BindResource(ShaderStage stage,
2323
return false;
2424
}
2525

26-
bindings.buffers[slot.ext_res_0] = {.slot = slot, .view = {&metadata, view}};
26+
bindings.buffers[slot.ext_res_0] = {.slot = slot,
27+
.view = {&metadata, std::move(view)}};
2728
return true;
2829
}
2930

30-
bool ComputeCommand::BindResource(
31-
ShaderStage stage,
32-
const SampledImageSlot& slot,
33-
const ShaderMetadata& metadata,
34-
const std::shared_ptr<const Texture>& texture,
35-
const std::shared_ptr<const Sampler>& sampler) {
31+
bool ComputeCommand::BindResource(ShaderStage stage,
32+
const SampledImageSlot& slot,
33+
const ShaderMetadata& metadata,
34+
std::shared_ptr<const Texture> texture,
35+
std::shared_ptr<const Sampler> sampler) {
3636
if (stage != ShaderStage::kCompute) {
3737
VALIDATION_LOG << "Use Command for non-compute shader stages.";
3838
return false;
@@ -49,8 +49,8 @@ bool ComputeCommand::BindResource(
4949

5050
bindings.sampled_images[slot.sampler_index] = TextureAndSampler{
5151
.slot = slot,
52-
.texture = {&metadata, texture},
53-
.sampler = {&metadata, sampler},
52+
.texture = {&metadata, std::move(texture)},
53+
.sampler = {&metadata, std::move(sampler)},
5454
};
5555

5656
return false;

‎impeller/renderer/compute_command.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@ struct ComputeCommand : public ResourceBinder {
6262
bool BindResource(ShaderStage stage,
6363
const ShaderUniformSlot& slot,
6464
const ShaderMetadata& metadata,
65-
const BufferView& view) override;
65+
BufferView view) override;
6666

6767
// |ResourceBinder|
6868
bool BindResource(ShaderStage stage,
6969
const SampledImageSlot& slot,
7070
const ShaderMetadata& metadata,
71-
const std::shared_ptr<const Texture>& texture,
72-
const std::shared_ptr<const Sampler>& sampler) override;
71+
std::shared_ptr<const Texture> texture,
72+
std::shared_ptr<const Sampler> sampler) override;
7373

7474
constexpr explicit operator bool() const {
7575
return pipeline && pipeline->IsValid();

0 commit comments

Comments
 (0)