mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 09:45:33 +00:00
Code Issues Releases Wiki Activity

Don't use A2C when MSAA is off

Browse source
This commit is contained in:
AnyOldName3 2021-01-02 18:27:46 +00:00
parent 69386df036
commit f2eed5594a
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwrender/localmap.cpp
View file

@ -235,7 +235,7 @@ void LocalMap::setupRenderToTexture(osg::ref_ptr<osg::Camera> camera, int x, int
unsigned int samples = 0; unsigned int samples = 0;
unsigned int colourSamples = 0; unsigned int colourSamples = 0;
if (Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders")) if (Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1)
{ {
// Alpha-to-coverage requires a multisampled framebuffer. // Alpha-to-coverage requires a multisampled framebuffer.
// OSG will set that up automatically and resolve it to the specified single-sample texture for us. // OSG will set that up automatically and resolve it to the specified single-sample texture for us.

2
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -219,7 +219,7 @@ namespace MWRender
resourceSystem->getSceneManager()->setAutoUseSpecularMaps(Settings::Manager::getBool("auto use object specular maps", "Shaders")); resourceSystem->getSceneManager()->setAutoUseSpecularMaps(Settings::Manager::getBool("auto use object specular maps", "Shaders"));
resourceSystem->getSceneManager()->setSpecularMapPattern(Settings::Manager::getString("specular map pattern", "Shaders")); resourceSystem->getSceneManager()->setSpecularMapPattern(Settings::Manager::getString("specular map pattern", "Shaders"));
resourceSystem->getSceneManager()->setApplyLightingToEnvMaps(Settings::Manager::getBool("apply lighting to environment maps", "Shaders")); resourceSystem->getSceneManager()->setApplyLightingToEnvMaps(Settings::Manager::getBool("apply lighting to environment maps", "Shaders"));
resourceSystem->getSceneManager()->setConvertAlphaTestToAlphaToCoverage(Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders")); resourceSystem->getSceneManager()->setConvertAlphaTestToAlphaToCoverage(Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1);
osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager; osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager;
sceneRoot->setLightingMask(Mask_Lighting); sceneRoot->setLightingMask(Mask_Lighting);

4
apps/openmw/mwrender/water.cpp
View file

@ -273,7 +273,7 @@ public:
unsigned int samples = 0; unsigned int samples = 0;
unsigned int colourSamples = 0; unsigned int colourSamples = 0;
if (Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders")) if (Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1)
{ {
// Alpha-to-coverage requires a multisampled framebuffer. // Alpha-to-coverage requires a multisampled framebuffer.
// OSG will set that up automatically and resolve it to the specified single-sample texture for us. // OSG will set that up automatically and resolve it to the specified single-sample texture for us.
@ -368,7 +368,7 @@ public:
unsigned int samples = 0; unsigned int samples = 0;
unsigned int colourSamples = 0; unsigned int colourSamples = 0;
if (Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders")) if (Settings::Manager::getBool("convert alpha test to alpha-to-coverage", "Shaders") && Settings::Manager::getInt("antialiasing", "Video") > 1)
{ {
// Alpha-to-coverage requires a multisampled framebuffer. // Alpha-to-coverage requires a multisampled framebuffer.
// OSG will set that up automatically and resolve it to the specified single-sample texture for us. // OSG will set that up automatically and resolve it to the specified single-sample texture for us.