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

Remove the ability to disable pixel shaders

Browse Source 
It doesn't work with GL 3.1 and mesa drivers (which requires a core
context)
This commit is contained in:
vlj 2014-04-14 22:11:20 +02:00
parent b7f6084fba
commit 4c85f6255b
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/config/user_config.hpp
View File

@ -604,10 +604,6 @@ namespace UserConfigParams
PARAM_DEFAULT( BoolUserConfigParam(false, "vsync", PARAM_DEFAULT( BoolUserConfigParam(false, "vsync",
&m_graphics_quality, &m_graphics_quality,
"Whether vertical sync is enabled") ); "Whether vertical sync is enabled") );
PARAM_PREFIX BoolUserConfigParam m_pixel_shaders
PARAM_DEFAULT( BoolUserConfigParam(false, "pixel_shaders",
&m_graphics_quality,
"Whether to enable pixel shaders (splatting, normal maps, ...)") );
PARAM_PREFIX BoolUserConfigParam m_motionblur PARAM_PREFIX BoolUserConfigParam m_motionblur
PARAM_DEFAULT( BoolUserConfigParam(false, PARAM_DEFAULT( BoolUserConfigParam(false,
"motionblur_enabled", &m_graphics_quality, "motionblur_enabled", &m_graphics_quality,

2
src/graphics/irr_driver.cpp
View File

@ -427,7 +427,7 @@ void IrrDriver::initDevice()
glGetIntegerv(GL_MAJOR_VERSION, &GLMajorVersion); glGetIntegerv(GL_MAJOR_VERSION, &GLMajorVersion);
glGetIntegerv(GL_MINOR_VERSION, &GLMinorVersion); glGetIntegerv(GL_MINOR_VERSION, &GLMinorVersion);
Log::info("IrrDriver", "OPENGL VERSION IS %d.%d", GLMajorVersion, GLMinorVersion); Log::info("IrrDriver", "OPENGL VERSION IS %d.%d", GLMajorVersion, GLMinorVersion);
m_glsl = (GLMajorVersion > 3 || (GLMajorVersion == 3 && GLMinorVersion >= 1)) && UserConfigParams::m_pixel_shaders; m_glsl = (GLMajorVersion > 3 || (GLMajorVersion == 3 && GLMinorVersion >= 1));
// This remaps the window, so it has to be done before the clear to avoid flicker // This remaps the window, so it has to be done before the clear to avoid flicker
m_device->setResizable(false); m_device->setResizable(false);

6
src/states_screens/dialogs/custom_video_settings.cpp
View File

@ -99,7 +99,7 @@ void CustomVideoSettingsialog::beforeAddingWidgets()
getWidget<CheckBoxWidget>("motionblur")->setState( UserConfigParams::m_motionblur ); getWidget<CheckBoxWidget>("motionblur")->setState( UserConfigParams::m_motionblur );
getWidget<CheckBoxWidget>("mlaa")->setState( UserConfigParams::m_mlaa ); getWidget<CheckBoxWidget>("mlaa")->setState( UserConfigParams::m_mlaa );
getWidget<CheckBoxWidget>("pixelshaders")->setState(UserConfigParams::m_pixel_shaders); // getWidget<CheckBoxWidget>("pixelshaders")->setState(UserConfigParams::m_pixel_shaders);
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -118,8 +118,8 @@ GUIEngine::EventPropagation CustomVideoSettingsialog::processEvent(const std::st
getWidget<CheckBoxWidget>("motionblur")->getState(); getWidget<CheckBoxWidget>("motionblur")->getState();
UserConfigParams::m_show_steering_animations = UserConfigParams::m_show_steering_animations =
getWidget<SpinnerWidget>("steering_animations")->getValue(); getWidget<SpinnerWidget>("steering_animations")->getValue();
UserConfigParams::m_pixel_shaders = // UserConfigParams::m_pixel_shaders =
getWidget<CheckBoxWidget>("pixelshaders")->getState(); // getWidget<CheckBoxWidget>("pixelshaders")->getState();
UserConfigParams::m_mlaa = UserConfigParams::m_mlaa =
getWidget<CheckBoxWidget>("mlaa")->getState(); getWidget<CheckBoxWidget>("mlaa")->getState();
UserConfigParams::m_ssao = UserConfigParams::m_ssao =

9
src/states_screens/options_screen_video.cpp
View File

@ -318,7 +318,8 @@ void OptionsScreenVideo::updateGfxSlider()
UserConfigParams::m_mlaa == GFX_MLAA[l] && UserConfigParams::m_mlaa == GFX_MLAA[l] &&
UserConfigParams::m_ssao == GFX_SSAO[l] && UserConfigParams::m_ssao == GFX_SSAO[l] &&
UserConfigParams::m_shadows == GFX_SHADOWS[l] && UserConfigParams::m_shadows == GFX_SHADOWS[l] &&
UserConfigParams::m_pixel_shaders == GFX_PIXEL_SHADERS[l]) // UserConfigParams::m_pixel_shaders == GFX_PIXEL_SHADERS[l])
true)
{ {
gfx->setValue(l+1); gfx->setValue(l+1);
found = true; found = true;
@ -374,8 +375,8 @@ void OptionsScreenVideo::updateTooltip()
*/ */
//I18N: in graphical options //I18N: in graphical options
tooltip = tooltip + L"\n" + _("Pixel shaders : %s", // tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
UserConfigParams::m_pixel_shaders ? enabled : disabled); // UserConfigParams::m_pixel_shaders ? enabled : disabled);
//I18N: in graphical options //I18N: in graphical options
tooltip = _("Animated Scenery : %s", tooltip = _("Animated Scenery : %s",
UserConfigParams::m_graphical_effects ? enabled : disabled); UserConfigParams::m_graphical_effects ? enabled : disabled);
@ -480,7 +481,7 @@ void OptionsScreenVideo::eventCallback(Widget* widget, const std::string& name,
UserConfigParams::m_weather_effects = GFX_WEATHER[level-1]; UserConfigParams::m_weather_effects = GFX_WEATHER[level-1];
//UserConfigParams::m_antialiasing = GFX_ANTIALIAS[level-1]; //UserConfigParams::m_antialiasing = GFX_ANTIALIAS[level-1];
UserConfigParams::m_motionblur = GFX_MOTIONBLUR[level-1]; UserConfigParams::m_motionblur = GFX_MOTIONBLUR[level-1];
UserConfigParams::m_pixel_shaders = GFX_PIXEL_SHADERS[level-1]; // UserConfigParams::m_pixel_shaders = GFX_PIXEL_SHADERS[level-1];
UserConfigParams::m_mlaa = GFX_MLAA[level-1]; UserConfigParams::m_mlaa = GFX_MLAA[level-1];
UserConfigParams::m_ssao = GFX_SSAO[level-1]; UserConfigParams::m_ssao = GFX_SSAO[level-1];
UserConfigParams::m_shadows = GFX_SHADOWS[level-1]; UserConfigParams::m_shadows = GFX_SHADOWS[level-1];