Allow shaders with disabled post processing pipeline (#14338)

- Allow disabling of the post processing pipeline while leaving shaders enabled
- Also disable post processing on Android by default
This commit is contained in:
lhofhansl
2024-02-15 08:25:33 -08:00
committed by grorp
parent 35a83c3514
commit ab2419db24
3 changed files with 19 additions and 11 deletions

View File

@@ -106,7 +106,7 @@ void UpscaleStep::run(PipelineContext &context)
std::unique_ptr<RenderStep> create3DStage(Client *client, v2f scale)
{
RenderStep *step = new Draw3D();
if (g_settings->getBool("enable_shaders")) {
if (g_settings->getBool("enable_shaders") && g_settings->getBool("enable_post_processing")) {
RenderPipeline *pipeline = new RenderPipeline();
pipeline->addStep(pipeline->own(std::unique_ptr<RenderStep>(step)));
@@ -131,7 +131,7 @@ RenderStep* addUpscaling(RenderPipeline *pipeline, RenderStep *previousStep, v2f
return previousStep;
// When shaders are enabled, post-processing pipeline takes care of rescaling
if (g_settings->getBool("enable_shaders"))
if (g_settings->getBool("enable_shaders") && g_settings->getBool("enable_post_processing"))
return previousStep;

View File

@@ -248,6 +248,7 @@ void set_default_settings()
settings->setDefault("minimap_double_scan_height", "true");
// Effects
settings->setDefault("enable_post_processing", "true");
settings->setDefault("directional_colored_fog", "true");
settings->setDefault("inventory_items_animations", "false");
settings->setDefault("mip_map", "false");
@@ -497,6 +498,7 @@ void set_default_settings()
settings->setDefault("active_block_range", "2");
settings->setDefault("viewing_range", "50");
settings->setDefault("leaves_style", "simple");
settings->setDefault("enable_post_processing", "false");
settings->setDefault("curl_verify_cert", "false");
// Apply settings according to screen size