ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set max texture size to 256 for Raspberry Pi

Browse Source
This commit is contained in:
Deve 2017-10-18 21:13:23 +02:00
parent 9ec06f122c
commit 1a9cf6a46f
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/graphical_restrictions.xml
View File

@ -38,4 +38,5 @@
<card contains="Adreno" os="android" version="<=19" disable="VertexIdWorking"/>
<card contains="Android Emulator" os="android" disable="ForceLegacyDevice"/>
<card os="android" disable="UniformBufferObject"/>
<card vendor="Broadcom" os="linux" disable="HighDefinitionTextures256"/>
</graphical-restrictions>

25
src/graphics/central_settings.cpp
View File

@ -211,13 +211,6 @@ void CentralVideoSettings::init()
hasSRGBFramebuffer = true;
Log::info("GLDriver", "ARB framebuffer sRGB Present");
}
// Only unset the high def textures if they are set as default. If the
// user has enabled them (bit 1 set), then leave them enabled.
if (GraphicsRestrictions::isDisabled(GraphicsRestrictions::GR_HIGHDEFINITION_TEXTURES) &&
(UserConfigParams::m_high_definition_textures & 0x02) == 0)
{
UserConfigParams::m_high_definition_textures = 0x00;
}
if (GraphicsRestrictions::isDisabled(GraphicsRestrictions::GR_GI))
{
@ -294,6 +287,24 @@ void CentralVideoSettings::init()
m_need_vertex_id_workaround = true;
}
#endif
// Only unset the high def textures if they are set as default. If the
// user has enabled them (bit 1 set), then leave them enabled.
if (GraphicsRestrictions::isDisabled(GraphicsRestrictions::GR_HIGHDEFINITION_TEXTURES) &&
(UserConfigParams::m_high_definition_textures & 0x02) == 0)
{
UserConfigParams::m_high_definition_textures = 0x00;
}
if (GraphicsRestrictions::isDisabled(GraphicsRestrictions::GR_HIGHDEFINITION_TEXTURES_256))
{
UserConfigParams::m_high_definition_textures = 0;
if (UserConfigParams::m_max_texture_size > 256)
{
UserConfigParams::m_max_texture_size = 256;
}
}
}
}

3
src/graphics/graphics_restrictions.cpp
View File

@ -44,7 +44,7 @@ namespace GraphicsRestrictions
/** The list of names used in the XML file for the graphics
* restriction types. They must be in the same order as the types. */
std::array<std::string, 29> m_names_of_restrictions = {
std::array<std::string, 30> m_names_of_restrictions = {
"UniformBufferObject",
"GeometryShader",
"DrawIndirect",
@ -67,6 +67,7 @@ namespace GraphicsRestrictions
"ColorBufferFloat",
"DriverRecentEnough",
"HighDefinitionTextures",
"HighDefinitionTextures256",
"AdvancedPipeline",
"FramebufferSRGB",
"FramebufferSRGBWorkaround1",

1
src/graphics/graphics_restrictions.hpp
View File

@ -56,6 +56,7 @@ namespace GraphicsRestrictions
GR_COLOR_BUFFER_FLOAT,
GR_DRIVER_RECENT_ENOUGH,
GR_HIGHDEFINITION_TEXTURES,
GR_HIGHDEFINITION_TEXTURES_256,
GR_ADVANCED_PIPELINE,
GR_FRAMEBUFFER_SRGB,
GR_FRAMEBUFFER_SRGB_WORKAROUND1,