From f79930b74c5ae5d4d87abaf65103fff8010ab2e2 Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Tue, 4 Apr 2023 15:32:49 -0700 Subject: [PATCH] [Impeller] Update API name to indicate descriptor set registrations. (flutter/engine#40922) [Impeller] Update API name to indicate descriptor set registrations. --- engine/src/flutter/impeller/renderer/pipeline_builder.h | 4 ++-- engine/src/flutter/impeller/renderer/vertex_descriptor.cc | 2 +- engine/src/flutter/impeller/renderer/vertex_descriptor.h | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/engine/src/flutter/impeller/renderer/pipeline_builder.h b/engine/src/flutter/impeller/renderer/pipeline_builder.h index ad003493061..b27c4bc753b 100644 --- a/engine/src/flutter/impeller/renderer/pipeline_builder.h +++ b/engine/src/flutter/impeller/renderer/pipeline_builder.h @@ -93,7 +93,7 @@ struct PipelineBuilder { << VertexShader::kLabel << "'."; return false; } - if (!vertex_descriptor->SetDescriptorSetLayouts( + if (!vertex_descriptor->RegisterDescriptorSetLayouts( VertexShader::kDescriptorSetLayouts)) { VALIDATION_LOG << "Cound not configure vertex descriptor set layout for" " pipeline named '" @@ -101,7 +101,7 @@ struct PipelineBuilder { return false; } - if (!vertex_descriptor->SetDescriptorSetLayouts( + if (!vertex_descriptor->RegisterDescriptorSetLayouts( FragmentShader::kDescriptorSetLayouts)) { VALIDATION_LOG << "Cound not configure vertex descriptor set layout for" " pipeline named '" diff --git a/engine/src/flutter/impeller/renderer/vertex_descriptor.cc b/engine/src/flutter/impeller/renderer/vertex_descriptor.cc index 963a7478a16..97dff83913a 100644 --- a/engine/src/flutter/impeller/renderer/vertex_descriptor.cc +++ b/engine/src/flutter/impeller/renderer/vertex_descriptor.cc @@ -20,7 +20,7 @@ bool VertexDescriptor::SetStageInputs( return true; } -bool VertexDescriptor::SetDescriptorSetLayouts( +bool VertexDescriptor::RegisterDescriptorSetLayouts( const DescriptorSetLayout desc_set_layout[], size_t count) { desc_set_layouts_.reserve(desc_set_layouts_.size() + count); diff --git a/engine/src/flutter/impeller/renderer/vertex_descriptor.h b/engine/src/flutter/impeller/renderer/vertex_descriptor.h index 19d9b9d1bfd..e62b4d2552e 100644 --- a/engine/src/flutter/impeller/renderer/vertex_descriptor.h +++ b/engine/src/flutter/impeller/renderer/vertex_descriptor.h @@ -37,16 +37,16 @@ class VertexDescriptor final : public Comparable { } template - bool SetDescriptorSetLayouts( + bool RegisterDescriptorSetLayouts( const std::array& inputs) { - return SetDescriptorSetLayouts(inputs.data(), inputs.size()); + return RegisterDescriptorSetLayouts(inputs.data(), inputs.size()); } bool SetStageInputs(const ShaderStageIOSlot* const stage_inputs[], size_t count); - bool SetDescriptorSetLayouts(const DescriptorSetLayout desc_set_layout[], - size_t count); + bool RegisterDescriptorSetLayouts(const DescriptorSetLayout desc_set_layout[], + size_t count); const std::vector& GetStageInputs() const;