mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-04 11:06:41 +00:00
Code Issues Releases Wiki Activity

Merge branch 'no_resize' into 'master'

Browse source 
[Postprocessing] Don't resize user defined samplers to power of 2

See merge request OpenMW/openmw!1918
This commit is contained in:
psi29a 2022-05-24 07:50:27 +00:00
commit 14b9abbcbf
4 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwrender/pingpongcanvas.cpp
View file

@ -103,7 +103,15 @@ namespace MWRender
if (filtered.empty() || !bufferData.postprocessing) if (filtered.empty() || !bufferData.postprocessing)
{ {
if (bufferData.postprocessing) if (bufferData.postprocessing)
Log(Debug::Error) << "Critical error, postprocess shaders failed to compile. Using default shader."; {
if (!mLoggedLastError)
{
Log(Debug::Error) << "Critical error, postprocess shaders failed to compile. Using default shader.";
mLoggedLastError = true;
}
}
else
mLoggedLastError = false;
mFallbackStateSet->setTextureAttributeAndModes(0, bufferData.sceneTex); mFallbackStateSet->setTextureAttributeAndModes(0, bufferData.sceneTex);

2
apps/openmw/mwrender/pingpongcanvas.hpp
View file

@ -82,6 +82,8 @@ namespace MWRender
mutable std::optional<fx::DispatchArray> mQueuedDispatchArray; mutable std::optional<fx::DispatchArray> mQueuedDispatchArray;
mutable size_t mQueuedDispatchFrameId; mutable size_t mQueuedDispatchFrameId;
mutable bool mLoggedLastError = false;
}; };
} }

5
apps/openmw/mwrender/postprocessor.cpp
View file

@ -378,7 +378,7 @@ namespace MWRender
const auto lastWriteTime = std::filesystem::last_write_time(mTechniqueFileMap[technique->getName()]); const auto lastWriteTime = std::filesystem::last_write_time(mTechniqueFileMap[technique->getName()]);
const bool isDirty = technique->setLastModificationTime(lastWriteTime); const bool isDirty = technique->setLastModificationTime(lastWriteTime);
if (technique->isValid() && !isDirty) if (!isDirty)
continue; continue;
if (technique->compile()) if (technique->compile())
@ -671,6 +671,9 @@ namespace MWRender
bool PostProcessor::disableTechnique(std::shared_ptr<fx::Technique> technique, bool dirty) bool PostProcessor::disableTechnique(std::shared_ptr<fx::Technique> technique, bool dirty)
{ {
if (Misc::StringUtils::ciEqual(technique->getName(), "main"))
return false;
auto it = std::find(mTechniques.begin(), mTechniques.end(), technique); auto it = std::find(mTechniques.begin(), mTechniques.end(), technique);
if (it == std::end(mTechniques)) if (it == std::end(mTechniques))
return false; return false;

1
components/fx/technique.cpp
View file

@ -510,6 +510,7 @@ namespace fx
if (proxy.internal_format.has_value()) if (proxy.internal_format.has_value())
sampler->setSourceFormat(proxy.internal_format.value()); sampler->setSourceFormat(proxy.internal_format.value());
sampler->setName(std::string{mBlockName}); sampler->setName(std::string{mBlockName});
sampler->setResizeNonPowerOfTwoHint(false);
mTextures.emplace_back(sampler); mTextures.emplace_back(sampler);