Add a GR for GI in central_settings
This commit is contained in:
parent
5f9e4086af
commit
1a861c742c
@ -27,6 +27,7 @@ void CentralVideoSettings::init()
|
|||||||
hasTextureCompression = false;
|
hasTextureCompression = false;
|
||||||
hasUBO = false;
|
hasUBO = false;
|
||||||
hasGS = false;
|
hasGS = false;
|
||||||
|
m_GI_has_artifact = false;
|
||||||
|
|
||||||
m_need_rh_workaround = false;
|
m_need_rh_workaround = false;
|
||||||
m_need_srgb_workaround = false;
|
m_need_srgb_workaround = false;
|
||||||
@ -140,6 +141,11 @@ void CentralVideoSettings::init()
|
|||||||
UserConfigParams::m_high_definition_textures = 0x00;
|
UserConfigParams::m_high_definition_textures = 0x00;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!GraphicsRestrictions::isDisabled(GraphicsRestrictions::GR_GI))
|
||||||
|
{
|
||||||
|
m_GI_has_artifact = true;
|
||||||
|
}
|
||||||
|
|
||||||
// Specific disablement
|
// Specific disablement
|
||||||
if (strstr((const char *)glGetString(GL_VENDOR), "NVIDIA") != NULL)
|
if (strstr((const char *)glGetString(GL_VENDOR), "NVIDIA") != NULL)
|
||||||
{
|
{
|
||||||
@ -263,7 +269,7 @@ bool CentralVideoSettings::supportsShadows() const
|
|||||||
|
|
||||||
bool CentralVideoSettings::supportsGlobalIllumination() const
|
bool CentralVideoSettings::supportsGlobalIllumination() const
|
||||||
{
|
{
|
||||||
return isARBGeometryShader4Usable() && isARBUniformBufferObjectUsable();
|
return isARBGeometryShader4Usable() && isARBUniformBufferObjectUsable() && !m_GI_has_artifact;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CentralVideoSettings::supportsIndirectInstancingRendering() const
|
bool CentralVideoSettings::supportsIndirectInstancingRendering() const
|
||||||
|
@ -26,6 +26,7 @@ private:
|
|||||||
|
|
||||||
bool m_need_rh_workaround;
|
bool m_need_rh_workaround;
|
||||||
bool m_need_srgb_workaround;
|
bool m_need_srgb_workaround;
|
||||||
|
bool m_GI_has_artifact;
|
||||||
public:
|
public:
|
||||||
void init();
|
void init();
|
||||||
bool isGLSL() const;
|
bool isGLSL() const;
|
||||||
|
@ -59,6 +59,7 @@ namespace GraphicsRestrictions
|
|||||||
"HighDefinitionTextures",
|
"HighDefinitionTextures",
|
||||||
"AdvancedPipeline",
|
"AdvancedPipeline",
|
||||||
"FramebufferSRGBWorking",
|
"FramebufferSRGBWorking",
|
||||||
|
"GI",
|
||||||
};
|
};
|
||||||
} // namespace Private
|
} // namespace Private
|
||||||
using namespace Private;
|
using namespace Private;
|
||||||
|
@ -53,6 +53,7 @@ namespace GraphicsRestrictions
|
|||||||
GR_HIGHDEFINITION_TEXTURES,
|
GR_HIGHDEFINITION_TEXTURES,
|
||||||
GR_ADVANCED_PIPELINE,
|
GR_ADVANCED_PIPELINE,
|
||||||
GR_FRAMEBUFFER_SRGB_WORKING,
|
GR_FRAMEBUFFER_SRGB_WORKING,
|
||||||
|
GR_GI,
|
||||||
GR_COUNT /** MUST be last entry. */
|
GR_COUNT /** MUST be last entry. */
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user