File tree 6 files changed +23
-9
lines changed
cmake/adjust/template/vendor
builtin/hlsl/cpp_compat/impl
6 files changed +23
-9
lines changed Original file line number Diff line number Diff line change @@ -15,14 +15,21 @@ set(NBL_CXX_RELWITHDEBINFO_COMPILE_OPTIONS "")
15
15
16
16
# Global
17
17
list (APPEND NBL_CXX_COMPILE_OPTIONS
18
+ -Wno-everything # TMP
18
19
-Wextra
19
20
-fno-strict-aliasing
20
21
-msse4.2
22
+ -maes
21
23
-mfpmath=sse
22
24
-Wextra
23
25
-Wno-sequence-point
24
26
-Wno-unused-parameter
25
27
-Wno-unused-but-set-parameter
28
+ -Wno-c++98-compat
29
+ -Wno-c++98-compat-pedantic
30
+ -Wno-padded
31
+ -Wno-unsafe-buffer-usage
32
+ -Wno-switch-enum
26
33
-Wno-error=ignored-attributes
27
34
-Wno-error=unused-function
28
35
-Wno-error=unused-variable
Original file line number Diff line number Diff line change @@ -15,15 +15,21 @@ set(NBL_C_RELWITHDEBINFO_COMPILE_OPTIONS "")
15
15
16
16
# Global
17
17
list (APPEND NBL_C_COMPILE_OPTIONS
18
+ -Wno-everything # TMP
18
19
-Wextra
19
20
-fno-strict-aliasing
20
21
-msse4.2
21
- -mfpmath=sse
22
- -maes
22
+ -maes
23
+ -mfpmath=sse
23
24
-Wextra
24
25
-Wno-sequence-point
25
26
-Wno-unused-parameter
26
27
-Wno-unused-but-set-parameter
28
+ -Wno-c++98-compat
29
+ -Wno-c++98-compat-pedantic
30
+ -Wno-padded
31
+ -Wno-unsafe-buffer-usage
32
+ -Wno-switch-enum
27
33
-Wno-error=ignored-attributes
28
34
-Wno-error=unused-function
29
35
-Wno-error=unused-variable
Original file line number Diff line number Diff line change @@ -330,7 +330,7 @@ class IDescriptorSetLayout : public IDescriptorSetLayoutBase
330
330
bindings[i].binding = i;
331
331
bindings[i].type = type;
332
332
bindings[i].createFlags = SBinding::E_CREATE_FLAGS::ECF_NONE;
333
- bindings[i].stageFlags = stageAccessFlags ? stageAccessFlags[i]:asset::IShader::ESS_ALL_OR_LIBRARY;
333
+ bindings[i].stageFlags = stageAccessFlags ? stageAccessFlags[i]:asset::IShader::E_SHADER_STAGE:: ESS_ALL_OR_LIBRARY;
334
334
bindings[i].count = counts ? counts[i]:1u ;
335
335
bindings[i].samplers = nullptr ;
336
336
}
@@ -354,7 +354,7 @@ class IDescriptorSetLayout : public IDescriptorSetLayoutBase
354
354
for (uint32_t b = 0u ; b < bindingCnt; ++b)
355
355
{
356
356
auto bindingNumber = m_descriptorRedirects[t].m_bindingNumbers [b];
357
- CBindingRedirect::template binding_number_t otherBindingNumber (CBindingRedirect::Invalid);
357
+ CBindingRedirect::binding_number_t otherBindingNumber (CBindingRedirect::Invalid);
358
358
// TODO: std::find instead?
359
359
for (uint32_t ob = 0u ; ob < otherBindingCnt; ++ob)
360
360
{
Original file line number Diff line number Diff line change @@ -81,6 +81,7 @@ class NBL_API2 IRenderpass
81
81
{
82
82
bool valid () const ;
83
83
};
84
+
84
85
// The arrays pointed to by this array must be terminated by `DepthStencilAttachmentsEnd` value, which implicitly satisfies a few VUIDs
85
86
constexpr static inline SDepthStencilAttachmentDescription DepthStencilAttachmentsEnd = {};
86
87
const SDepthStencilAttachmentDescription* depthStencilAttachments = &DepthStencilAttachmentsEnd;
Original file line number Diff line number Diff line change @@ -326,18 +326,18 @@ class NBL_API2 CSPIRVIntrospector : public core::Uncopyable
326
326
template <bool C=!Mutable>
327
327
inline std::enable_if_t <C,bool > isLastMemberRuntimeSized () const
328
328
{
329
- if (type->memberCount )
330
- return type->memberTypes ()[type->memberCount -1 ].count .front ().isRuntimeSized ();
329
+ if (this -> type ->memberCount )
330
+ return this -> type ->memberTypes ()[this -> type ->memberCount -1 ].count .front ().isRuntimeSized ();
331
331
return false ;
332
332
}
333
333
template <bool C=!Mutable>
334
334
inline std::enable_if_t <C,size_t > getRuntimeSize (const size_t lastMemberElementCount) const
335
335
{
336
336
if (isLastMemberRuntimeSized ())
337
337
{
338
- const auto & lastMember = type->memberTypes ()[type->memberCount -1 ];
338
+ const auto & lastMember = this -> type ->memberTypes ()[this -> type ->memberCount -1 ];
339
339
assert (!lastMember.count .front ().isSpecConstantID );
340
- return sizeWithoutLastMember+lastMemberElementCount*type->memberStrides ()[type->memberCount -1 ];
340
+ return sizeWithoutLastMember+lastMemberElementCount* this -> type ->memberStrides ()[this -> type ->memberCount -1 ];
341
341
}
342
342
return sizeWithoutLastMember;
343
343
}
Original file line number Diff line number Diff line change @@ -598,7 +598,7 @@ struct nClamp_helper<T>
598
598
using return_t = T;
599
599
static inline return_t __call (const T x, const T _min, const T _max)
600
600
{
601
- return nMin_helper::_call (nMax_helper ::_call (x, _min), _max);
601
+ return nMin_helper<T> ::_call (nMin_helper<T> ::_call (x, _min), _max);
602
602
}
603
603
};
604
604
You can’t perform that action at this time.
0 commit comments