Skip to content

Commit 65a3ad3

Browse files
committed
Move S{Write/Copy}DescriptorSet from IDescriptorSet to IGPUDescriptorSet.
1 parent 57c75c5 commit 65a3ad3

File tree

2 files changed

+23
-25
lines changed

2 files changed

+23
-25
lines changed

include/nbl/asset/IDescriptorSet.h

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ class IAccelerationStructure;
3535
template<typename LayoutType>
3636
class IDescriptorSet : public virtual core::IReferenceCounted
3737
{
38-
using this_type = IDescriptorSet<LayoutType>;
39-
4038
public:
4139
using layout_t = LayoutType;
4240
struct SDescriptorInfo
@@ -137,29 +135,6 @@ class IDescriptorSet : public virtual core::IReferenceCounted
137135
}
138136
};
139137

140-
struct SWriteDescriptorSet
141-
{
142-
//smart pointer not needed here
143-
this_type* dstSet;
144-
uint32_t binding;
145-
uint32_t arrayElement;
146-
uint32_t count;
147-
IDescriptor::E_TYPE descriptorType;
148-
SDescriptorInfo* info;
149-
};
150-
151-
struct SCopyDescriptorSet
152-
{
153-
//smart pointer not needed here
154-
this_type* dstSet;
155-
const this_type* srcSet;
156-
uint32_t srcBinding;
157-
uint32_t srcArrayElement;
158-
uint32_t dstBinding;
159-
uint32_t dstArrayElement;
160-
uint32_t count;
161-
};
162-
163138
const layout_t* getLayout() const { return m_layout.get(); }
164139

165140
protected:

include/nbl/video/IGPUDescriptorSet.h

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,29 @@ class IGPUDescriptorSet : public asset::IDescriptorSet<const IGPUDescriptorSetLa
2929
using base_t = asset::IDescriptorSet<const IGPUDescriptorSetLayout>;
3030

3131
public:
32+
struct SWriteDescriptorSet
33+
{
34+
//smart pointer not needed here
35+
IGPUDescriptorSet* dstSet;
36+
uint32_t binding;
37+
uint32_t arrayElement;
38+
uint32_t count;
39+
asset::IDescriptor::E_TYPE descriptorType;
40+
SDescriptorInfo* info;
41+
};
42+
43+
struct SCopyDescriptorSet
44+
{
45+
//smart pointer not needed here
46+
IGPUDescriptorSet* dstSet;
47+
const IGPUDescriptorSet* srcSet;
48+
uint32_t srcBinding;
49+
uint32_t srcArrayElement;
50+
uint32_t dstBinding;
51+
uint32_t dstArrayElement;
52+
uint32_t count;
53+
};
54+
3255
IGPUDescriptorSet(core::smart_refctd_ptr<const IGPUDescriptorSetLayout>&& _layout, core::smart_refctd_ptr<IDescriptorPool>&& pool, IDescriptorPool::SDescriptorOffsets&& offsets);
3356

3457
inline uint64_t getVersion() const { return m_version.load(); }

0 commit comments

Comments
 (0)