Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MaterialInstance public API friendly to std::string_view

Browse Source 
Internally we use std::string_view and the public API is augmented
with APIs that take a length for strings, which makes them useable
with string_view parameters.

Also fix exception specification for all setParameter methods, which
can throw if exceptions are enabled (or exit the program otherwise).
This commit is contained in:
Mathias Agopian
2022-08-01 14:17:29 -07:00
committed by Mathias Agopian
parent f79e703861
commit 841ea86cea
10 changed files with 199 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/filabridge/src/SamplerInterfaceBlock.cpp
+5 -6
View File
@@ -83,17 +83,16 @@ SamplerInterfaceBlock::SamplerInterfaceBlock(Builder const& builder) noexcept
assert_invariant(i == e.offset);
SamplerInfo& info = samplersInfoList[i++];
info = e;
infoMap[info.name.c_str()] = info.offset; // info.name.c_str() guaranteed constant
infoMap[{ info.name.data(), info.name.size() }] = info.offset; // info.name.c_str() guaranteed constant
}
assert_invariant(i == samplersInfoList.size());
}
const SamplerInterfaceBlock::SamplerInfo* SamplerInterfaceBlock::getSamplerInfo(
const char* name) const {
auto const& pos = mInfoMap.find(name);
if (!ASSERT_PRECONDITION_NON_FATAL(pos != mInfoMap.end(), "sampler named \"%s\" not found", name)) {
return nullptr;
}
std::string_view name) const {
auto pos = mInfoMap.find(name);
ASSERT_PRECONDITION(pos != mInfoMap.end(), "sampler named \"%.*s\" not found",
name.size(), name.data());
return &mSamplersInfoList[pos->second];
}