mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-03 23:56:43 +00:00
Code Issues Releases Wiki Activity

Merge branch '5904-hack' into 'master'

Browse source 
Fix #5904

Closes #5904

See merge request OpenMW/openmw!698
This commit is contained in:
psi29a 2021-03-30 06:10:25 +00:00
commit a6123fee0e
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
components/sceneutil/util.cpp
View file

@ -8,6 +8,7 @@
#include <osg/NodeVisitor> #include <osg/NodeVisitor>
#include <osg/TexGen> #include <osg/TexGen>
#include <osg/TexEnvCombine> #include <osg/TexEnvCombine>
#include <osg/Version>
#include <components/resource/imagemanager.hpp> #include <components/resource/imagemanager.hpp>
#include <components/resource/scenemanager.hpp> #include <components/resource/scenemanager.hpp>
@ -263,6 +264,10 @@ osg::ref_ptr<GlowUpdater> addEnchantedGlow(osg::ref_ptr<osg::Node> node, Resourc
bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::Camera::BufferComponent buffer, osg::Texture * texture, unsigned int level, unsigned int face, bool mipMapGeneration) bool attachAlphaToCoverageFriendlyFramebufferToCamera(osg::Camera* camera, osg::Camera::BufferComponent buffer, osg::Texture * texture, unsigned int level, unsigned int face, bool mipMapGeneration)
{ {
#if OSG_VERSION_LESS_THAN(3, 6, 6)
// hack fix for https://github.com/openscenegraph/OpenSceneGraph/issues/1028
osg::GLExtensions::Get(0, false)->glRenderbufferStorageMultisampleCoverageNV = nullptr;
#endif
unsigned int samples = 0; unsigned int samples = 0;
unsigned int colourSamples = 0; unsigned int colourSamples = 0;
bool addMSAAIntermediateTarget = Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1; bool addMSAAIntermediateTarget = Settings::Manager::getBool("antialias alpha test", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1;