Skip to content

Commit da04a60

Browse files
jorgep31415facebook-github-bot
authored andcommitted
Move ParamsBindList to Descriptor.* (#4119)
Summary: Pull Request resolved: #4119 `ParamsBindList` wraps a list of `BufferBindInfo`s, which is closely associated to Vulkan descriptor sets. ghstack-source-id: 232319221 exported-using-ghexport Reviewed By: SS-JIA Differential Revision: D59281547 fbshipit-source-id: e9772f1fadc1698077912eeaf6980d47ed862230
1 parent da35965 commit da04a60

File tree

4 files changed

+24
-20
lines changed

4 files changed

+24
-20
lines changed

backends/vulkan/runtime/api/Context.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -274,16 +274,5 @@ UniformParamsBuffer& UniformParamsBuffer::operator=(
274274
return *this;
275275
}
276276

277-
ParamsBindList::ParamsBindList(
278-
std::initializer_list<const BufferBindInfo> init_list) {
279-
bind_infos.resize(init_list.size());
280-
std::copy(init_list.begin(), init_list.end(), bind_infos.begin());
281-
}
282-
283-
void ParamsBindList::append(const ParamsBindList& other) {
284-
bind_infos.insert(
285-
bind_infos.end(), other.bind_infos.begin(), other.bind_infos.end());
286-
}
287-
288277
} // namespace api
289278
} // namespace vkcompute

backends/vulkan/runtime/api/Context.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -266,14 +266,6 @@ class UniformParamsBuffer final {
266266
}
267267
};
268268

269-
struct ParamsBindList final {
270-
std::vector<BufferBindInfo> bind_infos;
271-
272-
ParamsBindList(std::initializer_list<const BufferBindInfo> init_list);
273-
274-
void append(const ParamsBindList& other);
275-
};
276-
277269
class StorageBuffer final {
278270
private:
279271
Context* context_p_;

backends/vulkan/runtime/api/Descriptor.cpp

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace vkcompute {
1616
namespace api {
1717

1818
//
19-
// BufferBinding
19+
// BufferBindInfo
2020
//
2121

2222
BufferBindInfo::BufferBindInfo()
@@ -27,6 +27,21 @@ BufferBindInfo::BufferBindInfo(const VulkanBuffer& buffer_p)
2727
offset(buffer_p.mem_offset()),
2828
range(buffer_p.mem_range()) {}
2929

30+
//
31+
// ParamsBindList
32+
//
33+
34+
ParamsBindList::ParamsBindList(
35+
std::initializer_list<const BufferBindInfo> init_list) {
36+
bind_infos.resize(init_list.size());
37+
std::copy(init_list.begin(), init_list.end(), bind_infos.begin());
38+
}
39+
40+
void ParamsBindList::append(const ParamsBindList& other) {
41+
bind_infos.insert(
42+
bind_infos.end(), other.bind_infos.begin(), other.bind_infos.end());
43+
}
44+
3045
//
3146
// DescriptorSet
3247
//

backends/vulkan/runtime/api/Descriptor.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@ struct BufferBindInfo final {
3636
BufferBindInfo(const VulkanBuffer& buffer_p);
3737
};
3838

39+
struct ParamsBindList final {
40+
std::vector<BufferBindInfo> bind_infos;
41+
42+
ParamsBindList(std::initializer_list<const BufferBindInfo> init_list);
43+
44+
void append(const ParamsBindList& other);
45+
};
46+
3947
class DescriptorSet final {
4048
public:
4149
explicit DescriptorSet(VkDevice, VkDescriptorSet, ShaderLayout::Signature);

0 commit comments

Comments
 (0)