Skip to content

Commit 64107fe

Browse files
silence a few warnings
1 parent 07cefd0 commit 64107fe

5 files changed

Lines changed: 14 additions & 5 deletions

File tree

include/nbl/builtin/hlsl/math/linalg/basic.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ MatT identity()
4242
}
4343

4444
template <uint16_t NOut, uint16_t MOut, uint16_t NIn, uint16_t MIn, typename T NBL_FUNC_REQUIRES(NOut <= NIn && MOut <= MIn && NOut != 0 && MOut != 0)
45-
inline matrix<T, NOut, MOut> truncate(const NBL_CONST_REF_ARG(matrix<T, NIn, MIn>) inMatrix)
45+
inline matrix<T, NOut, MOut> truncate(NBL_CONST_REF_ARG(matrix<T, NIn, MIn>) inMatrix)
4646
{
4747
matrix<T, NOut, MOut> retval;
4848

src/nbl/ext/MitsubaLoader/CElementBSDF.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
#include <functional>
1313

1414

15+
#pragma warning( push )
16+
#pragma warning( disable : 5103 )
1517
namespace nbl::ext::MitsubaLoader
1618
{
1719
namespace impl
@@ -422,4 +424,5 @@ bool CElementBSDF::onEndTag(CMitsubaMetadata* globalMetadata, system::logger_opt
422424
return true;
423425
}
424426

425-
}
427+
}
428+
#pragma warning( pop )

src/nbl/ext/MitsubaLoader/CElementEmitter.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ auto CElementEmitter::compAddPropertyMap() -> AddPropertyMap<CElementEmitter>
2121
using this_t = CElementEmitter;
2222
AddPropertyMap<CElementEmitter> retval;
2323

24+
#pragma warning( push )
25+
#pragma warning( disable : 5103 )
2426
// funky transform setting
2527
NBL_EXT_MITSUBA_LOADER_REGISTER_ADD_PROPERTY("position",POINT)
2628
{
@@ -116,6 +118,7 @@ auto CElementEmitter::compAddPropertyMap() -> AddPropertyMap<CElementEmitter>
116118
NBL_EXT_MITSUBA_LOADER_REGISTER_SIMPLE_ADD_VARIANT_PROPERTY_CONSTRAINED(gamma,FLOAT,std::is_same,EnvMap);
117119

118120
#undef ADD_SPECTRUM
121+
#pragma warning( pop )
119122
return retval;
120123
}
121124

src/nbl/ext/MitsubaLoader/CElementIntegrator.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ auto CElementIntegrator::compAddPropertyMap() -> AddPropertyMap<CElementIntegrat
4141
using this_t = CElementIntegrator;
4242
AddPropertyMap<CElementIntegrator> retval;
4343

44+
#pragma warning( push )
45+
#pragma warning( disable : 5103 )
4446
// common
4547
// this one has really funny legacy behaviour which Mitsuba allowed contrary to its PDF docs
4648
NBL_EXT_MITSUBA_LOADER_REGISTER_ADD_PROPERTY_CONSTRAINED("shadingSamples",INTEGER,is_any_of,AmbientOcclusion,DirectIllumination)
@@ -200,7 +202,7 @@ auto CElementIntegrator::compAddPropertyMap() -> AddPropertyMap<CElementIntegrat
200202

201203
// multi channel no extra members
202204

203-
205+
#pragma warning( pop )
204206
return retval;
205207
}
206208

src/nbl/ext/MitsubaLoader/CElementSensor.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ auto CElementSensor::compAddPropertyMap() -> AddPropertyMap<CElementSensor>
1515
{
1616
using this_t = CElementSensor;
1717
AddPropertyMap<CElementSensor> retval;
18-
18+
#pragma warning( push )
19+
#pragma warning( disable : 5103 )
1920
NBL_EXT_MITSUBA_LOADER_REGISTER_SIMPLE_ADD_VARIANT_PROPERTY_CONSTRAINED(up,VECTOR,derived_from,ShutterSensor);
2021
NBL_EXT_MITSUBA_LOADER_REGISTER_SIMPLE_ADD_VARIANT_PROPERTY_CONSTRAINED(shiftX,FLOAT,derived_from,PerspectivePinhole);
2122
NBL_EXT_MITSUBA_LOADER_REGISTER_SIMPLE_ADD_VARIANT_PROPERTY_CONSTRAINED(shiftY,FLOAT,derived_from,PerspectivePinhole);
@@ -50,7 +51,7 @@ auto CElementSensor::compAddPropertyMap() -> AddPropertyMap<CElementSensor>
5051
NBL_EXT_MITSUBA_LOADER_REGISTER_SIMPLE_ADD_VARIANT_PROPERTY_CONSTRAINED(farClip,FLOAT,derived_from,CameraBase);
5152
NBL_EXT_MITSUBA_LOADER_REGISTER_SIMPLE_ADD_VARIANT_PROPERTY_CONSTRAINED(focusDistance,FLOAT,derived_from,DepthOfFieldBase);
5253
NBL_EXT_MITSUBA_LOADER_REGISTER_SIMPLE_ADD_VARIANT_PROPERTY_CONSTRAINED(apertureRadius,FLOAT,derived_from,DepthOfFieldBase);
53-
54+
#pragma warning( pop )
5455
// special
5556
auto setClipPlane = [](this_t* _this, SNamedPropertyElement&& _property, const system::logger_opt_ptr logger)->bool
5657
{

0 commit comments

Comments
 (0)