Skip to content

Commit f6f881a

Browse files
Jorge Pinedafacebook-github-bot
Jorge Pineda
authored and
facebook-github-bot
committed
Remove unneeded api:: prefix within namespace api (#3554)
Summary: Pull Request resolved: #3554 TSIA ghstack-source-id: 225755563 exported-using-ghexport bypass-github-export-checks bypass-github-pytorch-ci-checks bypass-github-executorch-ci-checks Reviewed By: yipjustin Differential Revision: D57126896 fbshipit-source-id: 2c4467b07730ca3371244fb95067a3b3b654163c
1 parent edaae14 commit f6f881a

6 files changed

Lines changed: 68 additions & 70 deletions

File tree

‎backends/vulkan/runtime/api/Command.cpp‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,14 @@ void CommandBuffer::insert_barrier(PipelineBarrier& pipeline_barrier) {
133133
if (!pipeline_barrier.buffer_barrier_handles.empty()) {
134134
pipeline_barrier.buffer_barrier_handles.clear();
135135
}
136-
for (const api::BufferMemoryBarrier& memory_barrier :
137-
pipeline_barrier.buffers) {
136+
for (const BufferMemoryBarrier& memory_barrier : pipeline_barrier.buffers) {
138137
pipeline_barrier.buffer_barrier_handles.push_back(memory_barrier.handle);
139138
}
140139

141140
if (!pipeline_barrier.image_barrier_handles.empty()) {
142141
pipeline_barrier.image_barrier_handles.clear();
143142
}
144-
for (const api::ImageMemoryBarrier& memory_barrier :
145-
pipeline_barrier.images) {
143+
for (const ImageMemoryBarrier& memory_barrier : pipeline_barrier.images) {
146144
pipeline_barrier.image_barrier_handles.push_back(memory_barrier.handle);
147145
}
148146
vkCmdPipelineBarrier(
@@ -185,11 +183,11 @@ void CommandBuffer::dispatch(const utils::uvec3& global_workgroup_size) {
185183
}
186184

187185
void CommandBuffer::copy_buffer_to_buffer(
188-
const api::VulkanBuffer& source,
189-
const api::VulkanBuffer& destination,
190-
const api::utils::uvec3& copy_range,
191-
const api::utils::uvec3& src_offset,
192-
const api::utils::uvec3& dst_offset) {
186+
const VulkanBuffer& source,
187+
const VulkanBuffer& destination,
188+
const utils::uvec3& copy_range,
189+
const utils::uvec3& src_offset,
190+
const utils::uvec3& dst_offset) {
193191
VK_CHECK_COND(
194192
state_ == CommandBuffer::State::BARRIERS_INSERTED,
195193
"Vulkan CommandBuffer: called copy_buffer_to_buffer() on a command buffer whose state "
@@ -208,11 +206,11 @@ void CommandBuffer::copy_buffer_to_buffer(
208206
}
209207

210208
void CommandBuffer::copy_texture_to_texture(
211-
const api::VulkanImage& source,
212-
const api::VulkanImage& destination,
213-
const api::utils::uvec3& copy_range,
214-
const api::utils::uvec3& src_offset,
215-
const api::utils::uvec3& dst_offset) {
209+
const VulkanImage& source,
210+
const VulkanImage& destination,
211+
const utils::uvec3& copy_range,
212+
const utils::uvec3& src_offset,
213+
const utils::uvec3& dst_offset) {
216214
VK_CHECK_COND(
217215
state_ == CommandBuffer::State::BARRIERS_INSERTED,
218216
"Vulkan CommandBuffer: called copy_texture_to_texture() on a command buffer whose state "
@@ -253,11 +251,11 @@ void CommandBuffer::copy_texture_to_texture(
253251
}
254252

255253
void CommandBuffer::copy_texture_to_buffer(
256-
const api::VulkanImage& source,
257-
const api::VulkanBuffer& destination,
258-
const api::utils::uvec3& copy_range,
259-
const api::utils::uvec3& src_offset,
260-
const api::utils::uvec3& dst_offset) {
254+
const VulkanImage& source,
255+
const VulkanBuffer& destination,
256+
const utils::uvec3& copy_range,
257+
const utils::uvec3& src_offset,
258+
const utils::uvec3& dst_offset) {
261259
VK_CHECK_COND(
262260
state_ == CommandBuffer::State::BARRIERS_INSERTED,
263261
"Vulkan CommandBuffer: called copy_texture_to_buffer() on a command buffer whose state "
@@ -291,11 +289,11 @@ void CommandBuffer::copy_texture_to_buffer(
291289
}
292290

293291
void CommandBuffer::copy_buffer_to_texture(
294-
const api::VulkanBuffer& source,
295-
const api::VulkanImage& destination,
296-
const api::utils::uvec3& copy_range,
297-
const api::utils::uvec3& src_offset,
298-
const api::utils::uvec3& dst_offset) {
292+
const VulkanBuffer& source,
293+
const VulkanImage& destination,
294+
const utils::uvec3& copy_range,
295+
const utils::uvec3& src_offset,
296+
const utils::uvec3& dst_offset) {
299297
VK_CHECK_COND(
300298
state_ == CommandBuffer::State::BARRIERS_INSERTED,
301299
"Vulkan CommandBuffer: called copy_buffer_to_texture() on a command buffer whose state "

‎backends/vulkan/runtime/api/Command.h‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -94,32 +94,32 @@ class CommandBuffer final {
9494
void dispatch(const utils::uvec3&);
9595

9696
void copy_buffer_to_buffer(
97-
const api::VulkanBuffer&,
98-
const api::VulkanBuffer&,
99-
const api::utils::uvec3&,
100-
const api::utils::uvec3&,
101-
const api::utils::uvec3&);
97+
const VulkanBuffer&,
98+
const VulkanBuffer&,
99+
const utils::uvec3&,
100+
const utils::uvec3&,
101+
const utils::uvec3&);
102102

103103
void copy_texture_to_texture(
104-
const api::VulkanImage&,
105-
const api::VulkanImage&,
106-
const api::utils::uvec3&,
107-
const api::utils::uvec3&,
108-
const api::utils::uvec3&);
104+
const VulkanImage&,
105+
const VulkanImage&,
106+
const utils::uvec3&,
107+
const utils::uvec3&,
108+
const utils::uvec3&);
109109

110110
void copy_texture_to_buffer(
111-
const api::VulkanImage&,
112-
const api::VulkanBuffer&,
113-
const api::utils::uvec3&,
114-
const api::utils::uvec3&,
115-
const api::utils::uvec3&);
111+
const VulkanImage&,
112+
const VulkanBuffer&,
113+
const utils::uvec3&,
114+
const utils::uvec3&,
115+
const utils::uvec3&);
116116

117117
void copy_buffer_to_texture(
118-
const api::VulkanBuffer&,
119-
const api::VulkanImage&,
120-
const api::utils::uvec3&,
121-
const api::utils::uvec3&,
122-
const api::utils::uvec3&);
118+
const VulkanBuffer&,
119+
const VulkanImage&,
120+
const utils::uvec3&,
121+
const utils::uvec3&,
122+
const utils::uvec3&);
123123

124124
void write_timestamp(VkQueryPool, const uint32_t) const;
125125
void reset_querypool(VkQueryPool, const uint32_t, const uint32_t) const;

‎backends/vulkan/runtime/api/Context.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ UniformParamsBuffer& UniformParamsBuffer::operator=(
236236
}
237237

238238
ParamsBindList::ParamsBindList(
239-
std::initializer_list<const api::BufferBindInfo> init_list) {
239+
std::initializer_list<const BufferBindInfo> init_list) {
240240
bind_infos.resize(init_list.size());
241241
std::copy(init_list.begin(), init_list.end(), bind_infos.begin());
242242
}

‎backends/vulkan/runtime/api/Context.h‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,9 @@ class Context final {
196196
PipelineBarrier&,
197197
const S&,
198198
const D&,
199-
const api::utils::uvec3&,
200-
const api::utils::uvec3&,
201-
const api::utils::uvec3&,
199+
const utils::uvec3&,
200+
const utils::uvec3&,
201+
const utils::uvec3&,
202202
VkFence fence_handle);
203203

204204
template <typename... Arguments>
@@ -267,9 +267,9 @@ class UniformParamsBuffer final {
267267
};
268268

269269
struct ParamsBindList final {
270-
std::vector<api::BufferBindInfo> bind_infos;
270+
std::vector<BufferBindInfo> bind_infos;
271271

272-
ParamsBindList(std::initializer_list<const api::BufferBindInfo> init_list);
272+
ParamsBindList(std::initializer_list<const BufferBindInfo> init_list);
273273
};
274274

275275
class StorageBuffer final {
@@ -376,18 +376,18 @@ inline void record_copy(
376376
CommandBuffer& cmd,
377377
const S& source,
378378
const D& destination,
379-
const api::utils::uvec3& copy_range,
380-
const api::utils::uvec3& src_offset,
381-
const api::utils::uvec3& dst_offset) = delete;
379+
const utils::uvec3& copy_range,
380+
const utils::uvec3& src_offset,
381+
const utils::uvec3& dst_offset) = delete;
382382

383383
template <>
384384
inline void record_copy<VulkanBuffer, VulkanBuffer>(
385385
CommandBuffer& cmd,
386386
const VulkanBuffer& source,
387387
const VulkanBuffer& destination,
388-
const api::utils::uvec3& copy_range,
389-
const api::utils::uvec3& src_offset,
390-
const api::utils::uvec3& dst_offset) {
388+
const utils::uvec3& copy_range,
389+
const utils::uvec3& src_offset,
390+
const utils::uvec3& dst_offset) {
391391
cmd.copy_buffer_to_buffer(
392392
source, destination, copy_range, src_offset, dst_offset);
393393
}
@@ -397,9 +397,9 @@ inline void record_copy<VulkanImage, VulkanImage>(
397397
CommandBuffer& cmd,
398398
const VulkanImage& source,
399399
const VulkanImage& destination,
400-
const api::utils::uvec3& copy_range,
401-
const api::utils::uvec3& src_offset,
402-
const api::utils::uvec3& dst_offset) {
400+
const utils::uvec3& copy_range,
401+
const utils::uvec3& src_offset,
402+
const utils::uvec3& dst_offset) {
403403
cmd.copy_texture_to_texture(
404404
source, destination, copy_range, src_offset, dst_offset);
405405
}
@@ -409,9 +409,9 @@ inline void record_copy<VulkanImage, VulkanBuffer>(
409409
CommandBuffer& cmd,
410410
const VulkanImage& source,
411411
const VulkanBuffer& destination,
412-
const api::utils::uvec3& copy_range,
413-
const api::utils::uvec3& src_offset,
414-
const api::utils::uvec3& dst_offset) {
412+
const utils::uvec3& copy_range,
413+
const utils::uvec3& src_offset,
414+
const utils::uvec3& dst_offset) {
415415
cmd.copy_texture_to_buffer(
416416
source, destination, copy_range, src_offset, dst_offset);
417417
}
@@ -421,9 +421,9 @@ inline void record_copy<VulkanBuffer, VulkanImage>(
421421
CommandBuffer& cmd,
422422
const VulkanBuffer& source,
423423
const VulkanImage& destination,
424-
const api::utils::uvec3& copy_range,
425-
const api::utils::uvec3& src_offset,
426-
const api::utils::uvec3& dst_offset) {
424+
const utils::uvec3& copy_range,
425+
const utils::uvec3& src_offset,
426+
const utils::uvec3& dst_offset) {
427427
cmd.copy_buffer_to_texture(
428428
source, destination, copy_range, src_offset, dst_offset);
429429
}
@@ -440,9 +440,9 @@ inline bool Context::submit_copy(
440440
PipelineBarrier& pipeline_barrier,
441441
const S& source,
442442
const D& destination,
443-
const api::utils::uvec3& copy_range,
444-
const api::utils::uvec3& src_offset,
445-
const api::utils::uvec3& dst_offset,
443+
const utils::uvec3& copy_range,
444+
const utils::uvec3& src_offset,
445+
const utils::uvec3& dst_offset,
446446
VkFence fence_handle) {
447447
// If any of the provided arguments does not have memory associated with it,
448448
// then exit early as there is no work to be done. However, if a fence has

‎backends/vulkan/runtime/api/Pipeline.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ uint32_t SpecVar::val_size() const {
137137
}
138138

139139
uint32_t SpecVar::val_offset() const {
140-
return api::utils::safe_downcast<uint32_t>(offsetof(SpecVar, value));
140+
return utils::safe_downcast<uint32_t>(offsetof(SpecVar, value));
141141
}
142142

143143
bool operator==(const SpecVar& lhs, const SpecVar& rhs) {

‎backends/vulkan/runtime/api/Pipeline.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class SpecVarList final {
7171
}
7272

7373
inline uint32_t size() const {
74-
return api::utils::safe_downcast<uint32_t>(vars.size());
74+
return utils::safe_downcast<uint32_t>(vars.size());
7575
}
7676

7777
inline uint32_t data_nbytes() const {

0 commit comments

Comments
 (0)