mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-05 15:40:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_warnings' into 'master'

Browse Source 
Fix warnings

See merge request OpenMW/openmw!3957
This commit is contained in:
jvoisin 2024-03-18 00:34:57 +00:00
commit 3b485d824e
2 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apps/benchmarks/settings/access.cpp
View File

@ -38,7 +38,7 @@ namespace
{ {
for (auto _ : state) for (auto _ : state)
{ {
static const float v = Settings::Manager::getFloat("sky blending start", "Fog"); static float v = Settings::Manager::getFloat("sky blending start", "Fog");
benchmark::DoNotOptimize(v); benchmark::DoNotOptimize(v);
} }
} }
@ -47,8 +47,8 @@ namespace
{ {
for (auto _ : state) for (auto _ : state)
{ {
static const float v1 = Settings::Manager::getFloat("near clip", "Camera"); static float v1 = Settings::Manager::getFloat("near clip", "Camera");
static const bool v2 = Settings::Manager::getBool("transparent postpass", "Post Processing"); static bool v2 = Settings::Manager::getBool("transparent postpass", "Post Processing");
benchmark::DoNotOptimize(v1); benchmark::DoNotOptimize(v1);
benchmark::DoNotOptimize(v2); benchmark::DoNotOptimize(v2);
} }
@ -58,9 +58,9 @@ namespace
{ {
for (auto _ : state) for (auto _ : state)
{ {
static const float v1 = Settings::Manager::getFloat("near clip", "Camera"); static float v1 = Settings::Manager::getFloat("near clip", "Camera");
static const bool v2 = Settings::Manager::getBool("transparent postpass", "Post Processing"); static bool v2 = Settings::Manager::getBool("transparent postpass", "Post Processing");
static const int v3 = Settings::Manager::getInt("reflection detail", "Water"); static int v3 = Settings::Manager::getInt("reflection detail", "Water");
benchmark::DoNotOptimize(v1); benchmark::DoNotOptimize(v1);
benchmark::DoNotOptimize(v2); benchmark::DoNotOptimize(v2);
benchmark::DoNotOptimize(v3); benchmark::DoNotOptimize(v3);
@ -71,7 +71,8 @@ namespace
{ {
for (auto _ : state) for (auto _ : state)
{ {
benchmark::DoNotOptimize(Settings::fog().mSkyBlendingStart.get()); float v = Settings::fog().mSkyBlendingStart.get();
benchmark::DoNotOptimize(v);
} }
} }
@ -79,8 +80,10 @@ namespace
{ {
for (auto _ : state) for (auto _ : state)
{ {
benchmark::DoNotOptimize(Settings::postProcessing().mTransparentPostpass.get()); bool v1 = Settings::postProcessing().mTransparentPostpass.get();
benchmark::DoNotOptimize(Settings::camera().mNearClip.get()); float v2 = Settings::camera().mNearClip.get();
benchmark::DoNotOptimize(v1);
benchmark::DoNotOptimize(v2);
} }
} }
@ -88,9 +91,12 @@ namespace
{ {
for (auto _ : state) for (auto _ : state)
{ {
benchmark::DoNotOptimize(Settings::postProcessing().mTransparentPostpass.get()); bool v1 = Settings::postProcessing().mTransparentPostpass.get();
benchmark::DoNotOptimize(Settings::camera().mNearClip.get()); float v2 = Settings::camera().mNearClip.get();
benchmark::DoNotOptimize(Settings::water().mReflectionDetail.get()); int v3 = Settings::water().mReflectionDetail.get();
benchmark::DoNotOptimize(v1);
benchmark::DoNotOptimize(v2);
benchmark::DoNotOptimize(v3);
} }
} }

18
apps/opencs/model/world/record.hpp
View File

@ -19,6 +19,11 @@ namespace CSMWorld
State mState; State mState;
explicit RecordBase(State state)
: mState(state)
{
}
virtual ~RecordBase() = default; virtual ~RecordBase() = default;
virtual std::unique_ptr<RecordBase> clone() const = 0; virtual std::unique_ptr<RecordBase> clone() const = 0;
@ -69,21 +74,18 @@ namespace CSMWorld
template <typename ESXRecordT> template <typename ESXRecordT>
Record<ESXRecordT>::Record() Record<ESXRecordT>::Record()
: mBase() : RecordBase(State_BaseOnly)
, mBase()
, mModified() , mModified()
{ {
} }
template <typename ESXRecordT> template <typename ESXRecordT>
Record<ESXRecordT>::Record(State state, const ESXRecordT* base, const ESXRecordT* modified) Record<ESXRecordT>::Record(State state, const ESXRecordT* base, const ESXRecordT* modified)
: RecordBase(state)
, mBase(base == nullptr ? ESXRecordT{} : *base)
, mModified(modified == nullptr ? ESXRecordT{} : *modified)
{ {
if (base)
mBase = *base;
if (modified)
mModified = *modified;
this->mState = state;
} }
template <typename ESXRecordT> template <typename ESXRecordT>