Skip to content

Commit 697589c

Browse files
author
kevyuu
committed
Remove virtual from final classes
1 parent 9c87925 commit 697589c

19 files changed

+43
-43
lines changed

‎include/nbl/asset/ICPUAccelerationStructure.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ class ICPUBottomLevelAccelerationStructure final : public IPreHashed, public IBo
231231
return !m_geometryPrimitiveCount || !m_triangleGeoms && !m_AABBGeoms;
232232
}
233233

234-
inline virtual bool valid() const override
234+
inline bool valid() const override
235235
{
236236
if (!validBuildFlags(m_buildFlags)) return false;
237237

@@ -275,7 +275,7 @@ class ICPUBottomLevelAccelerationStructure final : public IPreHashed, public IBo
275275
core::smart_refctd_dynamic_array<uint32_t> m_geometryPrimitiveCount = nullptr;
276276
core::bitflag<BUILD_FLAGS> m_buildFlags = BUILD_FLAGS::PREFER_FAST_TRACE_BIT;
277277

278-
inline virtual void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override {}
278+
inline void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override {}
279279
};
280280

281281
class ICPUTopLevelAccelerationStructure final : public IAsset, public ITopLevelAccelerationStructure
@@ -379,7 +379,7 @@ class ICPUTopLevelAccelerationStructure final : public IAsset, public ITopLevelA
379379
return cp;
380380
}
381381

382-
inline virtual bool valid() const override
382+
inline bool valid() const override
383383
{
384384
if (!validBuildFlags(m_buildFlags)) return false;
385385
if (!m_instances) return false;
@@ -399,7 +399,7 @@ class ICPUTopLevelAccelerationStructure final : public IAsset, public ITopLevelA
399399
hlsl::acceleration_structures::top_level::BuildRangeInfo m_buildRangeInfo;
400400
core::bitflag<BUILD_FLAGS> m_buildFlags = BUILD_FLAGS::PREFER_FAST_BUILD_BIT;
401401

402-
inline virtual void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
402+
inline void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
403403
{
404404
if (!m_instances) return;
405405
for (const auto& instance : *m_instances)

‎include/nbl/asset/ICPUAnimationLibrary.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ class ICPUAnimationLibrary final : public IAnimationLibrary<ICPUBuffer>, public
9595

9696
constexpr static inline auto AssetType = ET_ANIMATION_LIBRARY;
9797
inline E_TYPE getAssetType() const override { return AssetType; }
98-
inline virtual bool valid() const override { return true; }
98+
inline bool valid() const override { return true; }
9999

100100
private:
101101

102-
virtual void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
102+
inline void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
103103
{
104104
if (!visit(m_keyframeStorageBinding.buffer.get())) return;
105105
if (!visit(m_timestampStorageBinding.buffer.get())) return;

‎include/nbl/asset/ICPUBuffer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class ICPUBuffer final : public asset::IBuffer, public IPreHashed
110110
return true;
111111
}
112112

113-
inline virtual bool valid() const override
113+
inline bool valid() const override
114114
{
115115
if (!m_data) return false;
116116
if (!m_mem_resource) return false;
@@ -137,7 +137,7 @@ class ICPUBuffer final : public asset::IBuffer, public IPreHashed
137137
discardContent_impl();
138138
}
139139

140-
inline virtual void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override {}
140+
inline void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override {}
141141

142142
void* m_data;
143143
core::smart_refctd_ptr<core::refctd_memory_resource> m_mem_resource;

‎include/nbl/asset/ICPUBufferView.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ICPUBufferView : public IBufferView<ICPUBuffer>, public IAsset
4646
m_size = _size;
4747
}
4848

49-
inline virtual bool valid() const override
49+
inline bool valid() const override
5050
{
5151
if (!m_buffer->valid()) return false;
5252
if (m_offset >= m_buffer->getSize()) return false;
@@ -61,7 +61,7 @@ class ICPUBufferView : public IBufferView<ICPUBuffer>, public IAsset
6161

6262
private:
6363

64-
inline virtual void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
64+
inline void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
6565
{
6666
if (!visit(m_buffer.get())) return;
6767
}

‎include/nbl/asset/ICPUComputePipeline.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class ICPUComputePipeline final : public ICPUPipeline<IComputePipeline<ICPUPipel
8888
base_t(layout, {})
8989
{}
9090

91-
virtual void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
91+
inline void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
9292
{
9393
if (!visit(m_layout.get())) return;
9494
if (!visit(m_specInfo.shader.get())) return;

‎include/nbl/asset/ICPUDescriptorSet.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class NBL_API2 ICPUDescriptorSet final : public IDescriptorSet<ICPUDescriptorSet
7777

7878
core::smart_refctd_ptr<IAsset> clone(uint32_t _depth = ~0u) const override;
7979

80-
inline virtual bool valid() const override {
80+
inline bool valid() const override {
8181
if (!m_layout->valid()) return false;
8282
return true;
8383
}
@@ -90,7 +90,7 @@ class NBL_API2 ICPUDescriptorSet final : public IDescriptorSet<ICPUDescriptorSet
9090

9191
core::smart_refctd_dynamic_array<ICPUDescriptorSet::SDescriptorInfo> m_descriptorInfos[static_cast<uint32_t>(IDescriptor::E_TYPE::ET_COUNT)];
9292

93-
virtual void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
93+
inline void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
9494
{
9595
for (auto i = 0u; i < static_cast<uint32_t>(IDescriptor::E_TYPE::ET_COUNT); i++)
9696
{

‎include/nbl/asset/ICPUDescriptorSetLayout.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class ICPUDescriptorSetLayout : public IDescriptorSetLayout<ICPUSampler>, public
5656

5757
constexpr static inline auto AssetType = ET_DESCRIPTOR_SET_LAYOUT;
5858
inline E_TYPE getAssetType() const override { return AssetType; }
59-
inline virtual bool valid() const override
59+
inline bool valid() const override
6060
{
6161
return true; // no modification is possible after creation
6262
}
@@ -67,7 +67,7 @@ class ICPUDescriptorSetLayout : public IDescriptorSetLayout<ICPUSampler>, public
6767

6868
private:
6969

70-
inline virtual void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
70+
inline void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
7171
{
7272
if (!m_immutableSamplers) return;
7373
for (const auto& sampler : *m_immutableSamplers)

‎include/nbl/asset/ICPUGraphicsPipeline.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ICPUGraphicsPipeline final : public ICPUPipeline<IGraphicsPipeline<ICPUPip
4040
return m_params;
4141
}
4242

43-
inline virtual std::span<const SShaderSpecInfo> getSpecInfos(hlsl::ShaderStage stage) const override final
43+
inline std::span<const SShaderSpecInfo> getSpecInfos(hlsl::ShaderStage stage) const override final
4444
{
4545
const auto stageIndex = stageToIndex(stage);
4646
if (stageIndex != -1)
@@ -70,7 +70,7 @@ class ICPUGraphicsPipeline final : public ICPUPipeline<IGraphicsPipeline<ICPUPip
7070
return nullptr;
7171
}
7272

73-
inline virtual bool valid() const override final
73+
inline bool valid() const override final
7474
{
7575
if (!m_layout) return false;
7676
if (!m_layout->valid())return false;
@@ -127,7 +127,7 @@ class ICPUGraphicsPipeline final : public ICPUPipeline<IGraphicsPipeline<ICPUPip
127127
return core::smart_refctd_ptr<base_t>(newPipeline, core::dont_grab);
128128
}
129129

130-
inline virtual void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
130+
inline void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
131131
{
132132
if (!visit(m_layout.get())) return;
133133
if (!visit(m_renderpass.get())) return;

‎include/nbl/asset/ICPUImage.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ class NBL_API2 ICPUImage final : public IImage, public IPreHashed
195195
return true;
196196
}
197197

198-
inline virtual bool valid() const override
198+
inline bool valid() const override
199199
{
200200
if (!validateCreationParameters(m_creationParams)) return false;
201201
if (info != m_creationParams.format) return false;
@@ -228,7 +228,7 @@ class NBL_API2 ICPUImage final : public IImage, public IPreHashed
228228
}
229229
};
230230

231-
inline virtual void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
231+
inline void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
232232
{
233233
}
234234
};

‎include/nbl/asset/ICPUImageView.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class ICPUImageView final : public IImageView<ICPUImage>, public IAsset
6262
params.subresourceRange.aspectMask = aspect.value;
6363
}
6464

65-
inline virtual bool valid() const override
65+
inline bool valid() const override
6666
{
6767
if (!validateCreationParameters(params)) return false;
6868

@@ -78,7 +78,7 @@ class ICPUImageView final : public IImageView<ICPUImage>, public IAsset
7878

7979
private:
8080

81-
inline virtual void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
81+
inline void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
8282
{
8383
if (!visit(params.image.get())) return;
8484
}

0 commit comments

Comments
 (0)