Skip to content

Commit 4a2da73

Browse files
Update SPIR-V Cross to latest
1 parent 44fee81 commit 4a2da73

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

3rdparty/nbl_spirv_cross

Submodule nbl_spirv_cross updated 1128 files

include/nbl/asset/utils/CSPIRVIntrospector.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ class NBL_API2 CSPIRVIntrospector : public core::Uncopyable
9191

9292
struct {
9393
bool present;
94+
core::string name;
9495
SShaderPushConstant info;
9596
} pushConstant;
9697

include/nbl/asset/utils/ShaderRes.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,6 @@ struct SShaderMemoryBlock
137137

138138
SMember::SMembers members;
139139

140-
//! Note: for SSBOs and UBOs it's the block name, but for push_constant it's the instance name.
141-
std::string name;
142-
143140
//! size!=rtSizedArrayOneElementSize implies that last member is rutime-sized array (e.g. buffer SSBO { float buf[]; }).
144141
//! Use getRuntimeSize for size of the struct with assumption of passed number of elements.
145142
size_t size;
@@ -174,6 +171,8 @@ struct SShaderPushConstant : public impl::SShaderMemoryBlock
174171

175172
struct SShaderResourceVariant
176173
{
174+
//! Note: for SSBOs and UBOs it's the block name, but for push_constant it's the instance name.
175+
std::string name;
177176
//! binding
178177
uint32_t binding;
179178
E_SHADER_RESOURCE_TYPE type;
@@ -186,6 +185,7 @@ struct SShaderResourceVariant
186185
//! Then user can look up default value of this specialization constant in SIntrospectionData::specConstants.
187186
bool descCountIsSpecConstant;
188187

188+
189189
template<E_SHADER_RESOURCE_TYPE restype>
190190
SShaderResource<restype>& get() { return reinterpret_cast<SShaderResource<restype>&>(variant); }
191191
template<E_SHADER_RESOURCE_TYPE restype>

include/nbl/video/ILogicalDevice.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class NBL_API2 ILogicalDevice : public core::IReferenceCounted, public IDeviceMe
5656
constexpr static inline uint8_t MaxQueueFamilies = 16;
5757

5858
uint32_t queueParamsCount;
59-
std::array<SQueueCreationParams, MaxQueueFamilies> queueParams = {};
59+
std::array<SQueueCreationParams,MaxQueueFamilies> queueParams = {};
6060
SPhysicalDeviceFeatures featuresToEnable = {};
6161
core::smart_refctd_ptr<asset::CCompilerSet> compilerSet = nullptr;
6262
};

0 commit comments

Comments
 (0)