Skip to content

Commit 85552b9

Browse files
committed
merge master
2 parents 97ba323 + 66267ab commit 85552b9

File tree

86 files changed

+2573
-2312
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+2573
-2312
lines changed

include/nbl/asset/ECommonEnums.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ enum E_DEPENDENCY_FLAGS
107107
EDF_DEVICE_GROUP_BIT = 0x04
108108
};
109109

110-
enum E_SHARING_MODE : uint32_t
110+
enum E_SHARING_MODE : uint8_t
111111
{
112112
ESM_EXCLUSIVE = 0,
113113
ESM_CONCURRENT = 1

include/nbl/asset/ICommandBuffer.h

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,9 @@ class ICommandBuffer
113113
public:
114114
_NBL_STATIC_INLINE_CONSTEXPR size_t MAX_PUSH_CONSTANT_BYTESIZE = 128u;
115115

116-
enum E_RESET_FLAGS : uint32_t
116+
enum E_RESET_FLAGS : uint8_t
117117
{
118+
ERF_NONE = 0x00,
118119
ERF_RELEASE_RESOURCES_BIT = 0x01
119120
};
120121

@@ -135,7 +136,7 @@ class ICommandBuffer
135136
- ES_INVALID
136137
-> After submission for resettable command buffers.
137138
*/
138-
enum E_STATE : uint32_t
139+
enum E_STATE : uint8_t
139140
{
140141
ES_INITIAL,
141142
ES_RECORDING,
@@ -144,14 +145,15 @@ class ICommandBuffer
144145
ES_INVALID
145146
};
146147

147-
enum E_USAGE : uint32_t
148+
enum E_USAGE : uint8_t
148149
{
150+
EU_NONE = 0x00,
149151
EU_ONE_TIME_SUBMIT_BIT = 0x01,
150152
EU_RENDER_PASS_CONTINUE_BIT = 0x02,
151153
EU_SIMULTANEOUS_USE_BIT = 0x04
152154
};
153155

154-
enum E_LEVEL : uint32_t
156+
enum E_LEVEL : uint8_t
155157
{
156158
EL_PRIMARY = 0u,
157159
EL_SECONDARY
@@ -205,12 +207,13 @@ class ICommandBuffer
205207

206208
E_STATE getState() const { return m_state; }
207209

210+
core::bitflag<E_USAGE> getRecordingFlags() const { return m_recordingFlags; } // TODO(Erfan): maybe store m_recordingFlags as
211+
208212
E_LEVEL getLevel() const { return m_level; }
209213

210214
// hm now i think having begin(), reset() and end() as command buffer API is a little weird
211215

212-
//! `_flags` takes bits from E_USAGE
213-
virtual bool begin(uint32_t _flags)
216+
virtual bool begin(core::bitflag<E_USAGE> _flags)
214217
{
215218
if(m_state == ES_RECORDING)
216219
{
@@ -222,8 +225,7 @@ class ICommandBuffer
222225
return true;
223226
}
224227

225-
//! `_flags` takes bits from E_RESET_FLAGS
226-
virtual bool reset(uint32_t _flags)
228+
virtual bool reset(core::bitflag<E_RESET_FLAGS> _flags)
227229
{
228230
m_state = ES_INITIAL;
229231
return true;
@@ -365,7 +367,7 @@ class ICommandBuffer
365367

366368
E_LEVEL m_level;
367369
// Flags from E_USAGE
368-
uint32_t m_recordingFlags = 0u;
370+
core::bitflag<E_USAGE> m_recordingFlags = E_USAGE::EU_NONE;
369371
E_STATE m_state = ES_INITIAL;
370372
//future
371373
uint32_t m_deviceMask = ~0u;

include/nbl/core/alloc/HeterogenousMemoryAddressAllocatorAdaptor.h

Lines changed: 0 additions & 160 deletions
This file was deleted.

0 commit comments

Comments
 (0)