Skip to content

Commit cc9084b

Browse files
committed
Got rid of some warnings
1 parent 615c810 commit cc9084b

File tree

3 files changed

+11
-26
lines changed

3 files changed

+11
-26
lines changed

src/nbl/asset/CGLILoader.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,8 @@ namespace nbl
291291
else
292292
os::Printer::log("LOAD GLI: Invalid (non-KTX) file!", ELL_ERROR);
293293
}
294-
else
295-
return false;
294+
295+
return false;
296296
}
297297

298298
inline std::pair<E_FORMAT, ICPUImageView::SComponentMapping> getTranslatedGLIFormat(const gli::texture& texture, const gli::gl& glVersion)
@@ -550,7 +550,9 @@ namespace nbl
550550
case gl::INTERNAL_RGB16_SSCALED_GTC: return getTranslatedFinalFormat(EF_UNKNOWN, vulcanVertexFormatsError);
551551
case gl::INTERNAL_RGBA16_USCALED_GTC: return getTranslatedFinalFormat(EF_UNKNOWN, vulcanVertexFormatsError);
552552
case gl::INTERNAL_RGBA16_SSCALED_GTC: return getTranslatedFinalFormat(EF_UNKNOWN, vulcanVertexFormatsError);
553-
default: assert(0);
553+
default:
554+
assert(0);
555+
return std::make_pair(EF_UNKNOWN, ICPUImageView::SComponentMapping{});
554556
}
555557
}
556558

src/nbl/asset/CImageWriterOpenEXR.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ namespace asset
127127

128128
for (auto channelPixelsPtr : pixelsArrayIlm)
129129
_NBL_DELETE_ARRAY(channelPixelsPtr, width * height);
130+
131+
return true;
130132
}
131133

132134
bool CImageWriterOpenEXR::writeAsset(io::IWriteFile* _file, const SAssetWriteParams& _params, IAssetWriterOverride* _override)

src/nbl/video/COpenGLRenderpassIndependentPipeline.h

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -106,30 +106,11 @@ class COpenGLRenderpassIndependentPipeline final : public IGPURenderpassIndepend
106106

107107
inline std::atomic_uint32_t& getStamp(IGPUSpecializedShader::E_SHADER_STAGE _stage)
108108
{
109-
switch (_stage)
110-
{
111-
case IGPUSpecializedShader::ESS_VERTEX:
112-
return *(stageUpdateStamps+0u);
113-
break;
114-
case IGPUSpecializedShader::ESS_TESSELATION_CONTROL:
115-
return *(stageUpdateStamps+1u);
116-
break;
117-
case IGPUSpecializedShader::ESS_TESSELATION_EVALUATION:
118-
return *(stageUpdateStamps+2u);
119-
break;
120-
case IGPUSpecializedShader::ESS_GEOMETRY:
121-
return *(stageUpdateStamps+3u);
122-
break;
123-
case IGPUSpecializedShader::ESS_FRAGMENT:
124-
return *(stageUpdateStamps+4u);
125-
break;
126-
default:
127-
break;
128-
}
129-
assert(false);
130-
return *(stageUpdateStamps+IGPURenderpassIndependentPipeline::SHADER_STAGE_COUNT);
109+
return const_cast<std::atomic_uint32_t&>(
110+
const_cast<const PushConstantsState*>(this)->getStamp(_stage)
111+
);
131112
}
132-
inline const uint32_t& getStamp(IGPUSpecializedShader::E_SHADER_STAGE _stage) const
113+
inline const std::atomic_uint32_t& getStamp(IGPUSpecializedShader::E_SHADER_STAGE _stage) const
133114
{
134115
// this creates warnings
135116
//return const_cast<typename std::decay<decltype(*this)>::type*>(this)->getStamp(_stage);

0 commit comments

Comments
 (0)